From a3a60fda1492c600383e166a20dd5e6f52120616 Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 19 Jun 2024 23:32:59 +0200 Subject: Some cleanup, update libs --- MatrixUtils.Web/Pages/Dev/DevOptions.razor | 4 +- MatrixUtils.Web/Pages/Dev/DevUtilities.razor | 3 +- MatrixUtils.Web/Pages/HSEInit.razor | 3 +- MatrixUtils.Web/Pages/Index.razor | 3 + .../Client/ClientComponents/MatrixClient.razor | 1 - MatrixUtils.Web/Pages/Labs/Client/Index.razor | 1 - .../Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor | 2 - .../Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor | 6 -- .../Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor | 4 -- MatrixUtils.Web/Pages/LoginPage.razor | 3 +- MatrixUtils.Web/Pages/Rooms/Create.razor | 1 + MatrixUtils.Web/Pages/Rooms/StateEditor.razor | 2 - MatrixUtils.Web/Pages/Rooms/StateViewer.razor | 2 +- MatrixUtils.Web/Pages/ServerInfo.razor | 2 +- MatrixUtils.Web/Pages/Tools/Index.razor | 4 ++ .../Pages/Tools/Info/PolicyListActivity.razor | 2 +- MatrixUtils.Web/Pages/Tools/InviteCounter.razor | 73 +++++++++++++++++++++ MatrixUtils.Web/Pages/Tools/MassCMEBan.razor | 75 ++++++++++++++++++++++ .../Pages/Tools/Room/SpaceRestrictedJoins.razor | 75 ++++++++++++++++++++++ MatrixUtils.Web/Pages/User/Profile.razor | 1 + 20 files changed, 242 insertions(+), 25 deletions(-) create mode 100644 MatrixUtils.Web/Pages/Tools/InviteCounter.razor create mode 100644 MatrixUtils.Web/Pages/Tools/MassCMEBan.razor create mode 100644 MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor (limited to 'MatrixUtils.Web/Pages') diff --git a/MatrixUtils.Web/Pages/Dev/DevOptions.razor b/MatrixUtils.Web/Pages/Dev/DevOptions.razor index fa0cdff..7b646d1 100644 --- a/MatrixUtils.Web/Pages/Dev/DevOptions.razor +++ b/MatrixUtils.Web/Pages/Dev/DevOptions.razor @@ -2,8 +2,10 @@ @using ArcaneLibs.Extensions @using System.Text @using System.Text.Json +@using Microsoft.JSInterop @inject NavigationManager NavigationManager -@inject ILocalStorageService LocalStorage +@inject IJSRuntime JSRuntime +@inject TieredStorageService TieredStorage Developer options diff --git a/MatrixUtils.Web/Pages/Dev/DevUtilities.razor b/MatrixUtils.Web/Pages/Dev/DevUtilities.razor index 87416a2..bf5a396 100644 --- a/MatrixUtils.Web/Pages/Dev/DevUtilities.razor +++ b/MatrixUtils.Web/Pages/Dev/DevUtilities.razor @@ -1,8 +1,7 @@ @page "/Dev/Utilities" @using ArcaneLibs.Extensions @using MatrixUtils.Abstractions -@inject ILocalStorageService LocalStorage -@inject NavigationManager NavigationManager +

Debug Tools

@if (Rooms.Count == 0) { diff --git a/MatrixUtils.Web/Pages/HSEInit.razor b/MatrixUtils.Web/Pages/HSEInit.razor index b76dfe6..cabc671 100644 --- a/MatrixUtils.Web/Pages/HSEInit.razor +++ b/MatrixUtils.Web/Pages/HSEInit.razor @@ -1,6 +1,7 @@ @page "/HSEInit" +@using Blazored.LocalStorage @inject ILocalStorageService LocalStorage -@inject IJSRuntime JsRuntime +

HSE Initialising...

diff --git a/MatrixUtils.Web/Pages/Index.razor b/MatrixUtils.Web/Pages/Index.razor index 8dfd1be..a7619ae 100644 --- a/MatrixUtils.Web/Pages/Index.razor +++ b/MatrixUtils.Web/Pages/Index.razor @@ -107,6 +107,9 @@ Small collection of tools to do not-so-everyday things. }

+ + Re-login + Remove diff --git a/MatrixUtils.Web/Pages/Labs/Client/ClientComponents/MatrixClient.razor b/MatrixUtils.Web/Pages/Labs/Client/ClientComponents/MatrixClient.razor index 7d3e52a..67dcae5 100644 --- a/MatrixUtils.Web/Pages/Labs/Client/ClientComponents/MatrixClient.razor +++ b/MatrixUtils.Web/Pages/Labs/Client/ClientComponents/MatrixClient.razor @@ -1,5 +1,4 @@ @using Index = MatrixUtils.Web.Pages.Labs.Client.Index -@using MatrixUtils.Web.Pages.Client.ClientComponents
diff --git a/MatrixUtils.Web/Pages/Labs/Client/Index.razor b/MatrixUtils.Web/Pages/Labs/Client/Index.razor index 5b489b0..ef4a0b9 100644 --- a/MatrixUtils.Web/Pages/Labs/Client/Index.razor +++ b/MatrixUtils.Web/Pages/Labs/Client/Index.razor @@ -1,5 +1,4 @@ @page "/Labs/Client" -@using LibMatrix @using MatrixUtils.Abstractions @using MatrixUtils.Web.Pages.Client.ClientComponents @using System.Collections.ObjectModel diff --git a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor index 2176467..55e17d6 100644 --- a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor +++ b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage1.razor @@ -1,10 +1,8 @@ -@using LibMatrix.Homeservers @using LibMatrix.RoomTypes @using LibMatrix @using LibMatrix.Responses @using MatrixUtils.LibDMSpace @using MatrixUtils.LibDMSpace.StateEvents -@using Microsoft.Extensions.Primitives @using ArcaneLibs.Extensions @using LibMatrix.EventTypes.Spec.State @using MatrixUtils.Abstractions diff --git a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor index a70e9c5..be6027a 100644 --- a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor +++ b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage2.razor @@ -1,12 +1,6 @@ -@using LibMatrix.Homeservers @using LibMatrix.RoomTypes -@using LibMatrix @using LibMatrix.EventTypes.Spec.State -@using LibMatrix.Responses -@using MatrixUtils.LibDMSpace -@using MatrixUtils.LibDMSpace.StateEvents @using ArcaneLibs.Extensions -@using System.Text.Json.Serialization @using MatrixUtils.Abstractions DM Space setup tool - stage 2: Fix DM room attribution diff --git a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor index 865e956..09de5d3 100644 --- a/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor +++ b/MatrixUtils.Web/Pages/Labs/DMSpace/DMSpaceStages/DMSpaceStage3.razor @@ -1,11 +1,7 @@ -@using LibMatrix.Homeservers @using LibMatrix.RoomTypes -@using LibMatrix @using LibMatrix.EventTypes.Spec.State @using LibMatrix.Responses @using MatrixUtils.LibDMSpace -@using MatrixUtils.LibDMSpace.StateEvents -@using ArcaneLibs.Extensions @using System.Text.Json.Serialization @using MatrixUtils.Abstractions diff --git a/MatrixUtils.Web/Pages/LoginPage.razor b/MatrixUtils.Web/Pages/LoginPage.razor index ec4f57d..6c869ac 100644 --- a/MatrixUtils.Web/Pages/LoginPage.razor +++ b/MatrixUtils.Web/Pages/LoginPage.razor @@ -2,8 +2,7 @@ @using System.Text.Json @using System.Text.Json.Serialization @using LibMatrix -@inject ILocalStorageService LocalStorage -@inject IJSRuntime JsRuntime +

Login

diff --git a/MatrixUtils.Web/Pages/Rooms/Create.razor b/MatrixUtils.Web/Pages/Rooms/Create.razor index 368211a..f2dfb01 100644 --- a/MatrixUtils.Web/Pages/Rooms/Create.razor +++ b/MatrixUtils.Web/Pages/Rooms/Create.razor @@ -7,6 +7,7 @@ @using LibMatrix.EventTypes.Spec.State.RoomInfo @using LibMatrix.Responses @using MatrixUtils.Web.Classes.RoomCreationTemplates +@using Microsoft.AspNetCore.Components.Forms @* @* ReSharper disable once RedundantUsingDirective - Must not remove this, Rider marks this as "unused" when it's not */ *@

Room Manager - Create Room

diff --git a/MatrixUtils.Web/Pages/Rooms/StateEditor.razor b/MatrixUtils.Web/Pages/Rooms/StateEditor.razor index fc3a310..6110b83 100644 --- a/MatrixUtils.Web/Pages/Rooms/StateEditor.razor +++ b/MatrixUtils.Web/Pages/Rooms/StateEditor.razor @@ -1,8 +1,6 @@ @page "/Rooms/{RoomId}/State/Edit" @using ArcaneLibs.Extensions @using LibMatrix -@inject ILocalStorageService LocalStorage -@inject NavigationManager NavigationManager

Room state editor - Editing @RoomId

diff --git a/MatrixUtils.Web/Pages/Rooms/StateViewer.razor b/MatrixUtils.Web/Pages/Rooms/StateViewer.razor index fabc33c..7c31136 100644 --- a/MatrixUtils.Web/Pages/Rooms/StateViewer.razor +++ b/MatrixUtils.Web/Pages/Rooms/StateViewer.razor @@ -1,7 +1,7 @@ @page "/Rooms/{RoomId}/State/View" @using ArcaneLibs.Extensions @using LibMatrix -@inject ILocalStorageService LocalStorage + @inject NavigationManager NavigationManager

Room state viewer - Viewing @RoomId

diff --git a/MatrixUtils.Web/Pages/ServerInfo.razor b/MatrixUtils.Web/Pages/ServerInfo.razor index aa6ad51..e6f1f16 100644 --- a/MatrixUtils.Web/Pages/ServerInfo.razor +++ b/MatrixUtils.Web/Pages/ServerInfo.razor @@ -1,7 +1,7 @@ @page "/ServerInfo/{Homeserver}" @using LibMatrix.Responses @using ArcaneLibs.Extensions -

ServerInfo

+

Server info for @Homeserver

@if (ServerVersionResponse is not null) {

Server version: @ServerVersionResponse.Server.Name @ServerVersionResponse.Server.Version

diff --git a/MatrixUtils.Web/Pages/Tools/Index.razor b/MatrixUtils.Web/Pages/Tools/Index.razor index 3aec2e3..e68bb9a 100644 --- a/MatrixUtils.Web/Pages/Tools/Index.razor +++ b/MatrixUtils.Web/Pages/Tools/Index.razor @@ -13,6 +13,10 @@ Copy highest powerlevel across all session
View account data
+

Room tools

+
+Change space children join access rules
+

Moderation tools

Count invites by inviter
diff --git a/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor b/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor index c94d0b0..de0bfe7 100644 --- a/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor +++ b/MatrixUtils.Web/Pages/Tools/Info/PolicyListActivity.razor @@ -1,4 +1,4 @@ -@page "/Tools/PolicyListActivity" +@page "/Tools/Info/PolicyListActivity" @using LibMatrix.EventTypes.Spec.State.Policy @using System.Diagnostics @using LibMatrix.RoomTypes diff --git a/MatrixUtils.Web/Pages/Tools/InviteCounter.razor b/MatrixUtils.Web/Pages/Tools/InviteCounter.razor new file mode 100644 index 0000000..8f4b4dd --- /dev/null +++ b/MatrixUtils.Web/Pages/Tools/InviteCounter.razor @@ -0,0 +1,73 @@ +@page "/Tools/InviteCounter" +@using ArcaneLibs.Extensions +@using LibMatrix.RoomTypes +@using System.Collections.ObjectModel +@using LibMatrix +@using System.Collections.Frozen +@using LibMatrix.EventTypes.Spec.State +@using MatrixUtils.Abstractions +

User Trace

+
+ +
+Room ID: + +Execute + +
+ +
+ Results + @foreach (var (userId, events) in invites.OrderByDescending(x=>x.Value).ToList()) { +

@userId: @events

+ } +
+ +
+@foreach (var line in log.Reverse()) { + 
@line
+} + +@code { + private ObservableCollection log { get; set; } = new(); + private Dictionary invites { get; set; } = new(); + private AuthenticatedHomeserverGeneric hs { get; set; } + + [Parameter, SupplyParameterFromQuery(Name = "room")] + public string roomId { get; set; } + + + protected override async Task OnInitializedAsync() { + log.CollectionChanged += (sender, args) => StateHasChanged(); + hs = await RMUStorage.GetCurrentSessionOrNavigate(); + if (hs is null) return; + + StateHasChanged(); + Console.WriteLine("Rerendered!"); + await base.OnInitializedAsync(); + } + + private async Task Execute() { + var room = hs.GetRoom(roomId); + var events = room.GetManyMessagesAsync(limit: int.MaxValue); + await foreach (var resp in events) { + var all = resp.State.Concat(resp.Chunk); + foreach (var evt in all) { + if(evt.Type != RoomMemberEventContent.EventId) continue; + var content = evt.TypedContent as RoomMemberEventContent; + if(content.Membership != "invite") continue; + if(!invites.ContainsKey(evt.Sender)) invites[evt.Sender] = 0; + invites[evt.Sender]++; + } + + log.Add($"{resp.State.Count} state, {resp.Chunk.Count} timeline"); + } + + + + StateHasChanged(); + + return ""; + } + +} \ No newline at end of file diff --git a/MatrixUtils.Web/Pages/Tools/MassCMEBan.razor b/MatrixUtils.Web/Pages/Tools/MassCMEBan.razor new file mode 100644 index 0000000..cbbca9e --- /dev/null +++ b/MatrixUtils.Web/Pages/Tools/MassCMEBan.razor @@ -0,0 +1,75 @@ +@page "/Tools/MassCMEBan" +@using ArcaneLibs.Extensions +@using LibMatrix.RoomTypes +@using System.Collections.ObjectModel +@using LibMatrix +@using System.Collections.Frozen +@using LibMatrix.EventTypes.Spec.State +@using LibMatrix.EventTypes.Spec.State.Policy +@using MatrixUtils.Abstractions +

User Trace

+
+ +
+Users: + +Execute + +
+ +
+@foreach (var line in log.Reverse()) { + 
@line
+} + +@code { + // TODO: Properly implement page to be more useful + private ObservableCollection log { get; set; } = new(); + private AuthenticatedHomeserverGeneric hs { get; set; } + + [Parameter, SupplyParameterFromQuery(Name = "room")] + public string roomId { get; set; } + + + protected override async Task OnInitializedAsync() { + log.CollectionChanged += (sender, args) => StateHasChanged(); + hs = await RMUStorage.GetCurrentSessionOrNavigate(); + if (hs is null) return; + + StateHasChanged(); + Console.WriteLine("Rerendered!"); + await base.OnInitializedAsync(); + } + + private async Task Execute() { + var room = hs.GetRoom("!fTjMjIzNKEsFlUIiru:neko.dev"); + // var room = hs.GetRoom("!yf7OpOiRDXx6zUGpT6:conduit.rory.gay"); + var users = roomId.Split("\n").Select(x => x.Trim()).Where(x=>x.StartsWith('@')).ToList(); + foreach (var user in users) { + var exists = false; + try { + exists = !string.IsNullOrWhiteSpace((await room.GetStateAsync(UserPolicyRuleEventContent.EventId, user.Replace('@', '_'))).Entity); + } catch (Exception e) { + log.Add($"Failed to get {user}"); + } + + if (!exists) { + var evt = await room.SendStateEventAsync(UserPolicyRuleEventContent.EventId, user.Replace('@', '_'), new UserPolicyRuleEventContent() { + Entity = user, + Reason = "spam (invite)", + Recommendation = "m.ban" + }); + log.Add($"Sent {evt.EventId} to ban {user}"); + } + else { + log.Add($"User {user} already exists"); + } + } + + + StateHasChanged(); + + return ""; + } + +} \ No newline at end of file diff --git a/MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor b/MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor new file mode 100644 index 0000000..80a03f2 --- /dev/null +++ b/MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor @@ -0,0 +1,75 @@ +@page "/Tools/Room/SpaceRestrictedJoins" +@using System.Collections.ObjectModel +@using LibMatrix.EventTypes.Spec.State +

Allow space to restricted join children

+
+ +

Room ID:

+ +

Change guest access:

+

Change knock access:

+ +
+Execute +
+ +
+@foreach (var line in log.Reverse()) { + 
@line
+} + +@code { + private ObservableCollection log { get; set; } = new(); + + private string RoomId { get; set; } + private AuthenticatedHomeserverGeneric hs { get; set; } + + private bool ChangeGuestAccess { get; set; } + private bool GuestAccess { get; set; } + private bool ChangeKnocking { get; set; } + private bool Knocking { get; set; } + + protected override async Task OnInitializedAsync() { + log.CollectionChanged += (sender, args) => StateHasChanged(); + hs = await RMUStorage.GetCurrentSessionOrNavigate(); + if (hs is null) return; + + StateHasChanged(); + Console.WriteLine("Rerendered!"); + await base.OnInitializedAsync(); + } + + private async Task Execute() { + var space = hs.GetRoom(RoomId).AsSpace; + await foreach (var room in space.GetChildrenAsync()) { + log.Add($"Got room {room.RoomId}"); + if (ChangeGuestAccess) { + var targetGuestAccess = GuestAccess ? "can_join" : "forbidden"; + var currentGuestAccess = (await room.GetStateAsync(RoomGuestAccessEventContent.EventId))?.GuestAccess; + if (currentGuestAccess != targetGuestAccess) { + log.Add($"Changing guest access from {currentGuestAccess} to {targetGuestAccess}"); + await room.SendStateEventAsync(RoomGuestAccessEventContent.EventId, new RoomGuestAccessEventContent { GuestAccess = targetGuestAccess }); + } + } + + var currentJoinRules = (await room.GetStateOrNullAsync(RoomJoinRulesEventContent.EventId)) ?? new(); + if (ChangeKnocking) { + var targetJoinRule = Knocking ? "knock_restricted" : "restricted"; + if (currentJoinRules.JoinRuleValue != targetJoinRule) { + log.Add($"Changing knocking from {currentJoinRules.JoinRuleValue} to {targetJoinRule}"); + currentJoinRules.JoinRuleValue = targetJoinRule; + await room.SendStateEventAsync(RoomJoinRulesEventContent.EventId, currentJoinRules); + } + } + + if (currentJoinRules.Allow == null || !currentJoinRules.Allow.Any(x => x.Type == "m.room_membership" && x.RoomId == RoomId)) { + log.Add($"Adding {RoomId} to allowed rooms"); + currentJoinRules.Allow ??= new(); + currentJoinRules.Allow.Add(new RoomJoinRulesEventContent.AllowEntry() { Type = "m.room_membership", RoomId = RoomId }); + await room.SendStateEventAsync(RoomJoinRulesEventContent.EventId, currentJoinRules); + } + } + log.Add("Done!"); + } + +} \ No newline at end of file diff --git a/MatrixUtils.Web/Pages/User/Profile.razor b/MatrixUtils.Web/Pages/User/Profile.razor index 129f706..49af22f 100644 --- a/MatrixUtils.Web/Pages/User/Profile.razor +++ b/MatrixUtils.Web/Pages/User/Profile.razor @@ -4,6 +4,7 @@ @using LibMatrix @using LibMatrix.Responses @using MatrixUtils.Abstractions +@using Microsoft.AspNetCore.Components.Forms

Manage Profile - @Homeserver?.WhoAmI?.UserId

-- cgit 1.5.1