From 89a14526658e5d061b1aef34ab569e979c9c0cf8 Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 6 Aug 2025 03:15:16 +0200 Subject: Various changes, room create/upgrade work --- MatrixUtils.Web/Pages/Tools/Debug/JoinRoom.razor | 33 ++++++++++++++-------- MatrixUtils.Web/Pages/Tools/Debug/LeaveRoom.razor | 2 +- .../Pages/Tools/Debug/MigrateRoom.razor | 2 +- .../Pages/Tools/Info/SessionCount.razor | 4 +-- MatrixUtils.Web/Pages/Tools/InviteCounter.razor | 2 +- MatrixUtils.Web/Pages/Tools/MassCMEBan.razor | 2 +- .../Draupnir/DraupnirProtectedRoomsEditor.razor | 2 +- .../Draupnir/DraupnirProtectionsEditor.razor | 2 +- .../Draupnir/DraupnirWatchedListsEditor.razor | 2 +- .../Pages/Tools/Moderation/FindUsersByRegex.razor | 6 ++-- .../Pages/Tools/Moderation/InviteCounter.razor | 2 +- .../Pages/Tools/Moderation/MassCMEBan.razor | 2 +- .../Pages/Tools/Moderation/MembershipHistory.razor | 14 ++++----- .../Pages/Tools/Moderation/RoomIntersections.razor | 6 ++-- .../Pages/Tools/Moderation/UserTrace.razor | 4 +-- .../Pages/Tools/Room/DropPowerlevel.razor | 2 +- .../Pages/Tools/Room/SpaceRestrictedJoins.razor | 2 +- .../Pages/Tools/User/CopyPowerlevel.razor | 2 +- .../Pages/Tools/User/MassJoinRoom.razor | 2 +- 19 files changed, 52 insertions(+), 41 deletions(-) (limited to 'MatrixUtils.Web/Pages/Tools') diff --git a/MatrixUtils.Web/Pages/Tools/Debug/JoinRoom.razor b/MatrixUtils.Web/Pages/Tools/Debug/JoinRoom.razor index 319c9e7..cb56a40 100644 --- a/MatrixUtils.Web/Pages/Tools/Debug/JoinRoom.razor +++ b/MatrixUtils.Web/Pages/Tools/Debug/JoinRoom.razor @@ -5,10 +5,13 @@ Room ID:
-Via server: - +Via server(s), comma separated: +
-Join +Unblock room (Synapse): + +
+Join

@foreach (var line in Log) { 
@line
@@ -21,9 +24,12 @@ [Parameter, SupplyParameterFromQuery(Name = "roomId")] public string? RoomId { get; set; } - + [Parameter, SupplyParameterFromQuery(Name = "via")] - public string? Server { get; set; } + public string? Servers { get; set; } + + [Parameter, SupplyParameterFromQuery(Name = "unblock")] + public bool Unblock { get; set; } = false; protected override async Task OnInitializedAsync() { hs = await sessionStore.GetCurrentHomeserver(navigateOnFailure: true); @@ -39,14 +45,19 @@ if (string.IsNullOrWhiteSpace(RoomId)) return; var room = hs.GetRoom(RoomId); Log.Add("Got room object..."); - - if (hs is AuthenticatedHomeserverSynapse synapse) { - await synapse.Admin.BlockRoom(RoomId, false); - Log.Add($"Synapse: unblocked room"); + + if (Unblock && hs is AuthenticatedHomeserverSynapse synapse) { + try { + await synapse.Admin.BlockRoom(RoomId, false); + Log.Add($"Synapse: unblocked room"); + } + catch (Exception e) { + Log.Add($"Synapse: failed to unblock room: {e}"); + } } - + try { - await room.JoinAsync([Server], checkIfAlreadyMember: false); + await room.JoinAsync(Servers?.Split(','), checkIfAlreadyMember: false); Log.Add("Joined room!"); } catch (Exception e) { diff --git a/MatrixUtils.Web/Pages/Tools/Debug/LeaveRoom.razor b/MatrixUtils.Web/Pages/Tools/Debug/LeaveRoom.razor index 7844331..c40fa0b 100644 --- a/MatrixUtils.Web/Pages/Tools/Debug/LeaveRoom.razor +++ b/MatrixUtils.Web/Pages/Tools/Debug/LeaveRoom.razor @@ -5,7 +5,7 @@ Room ID:
-Leave +Leave

@foreach (var line in Log) {

@line

diff --git a/MatrixUtils.Web/Pages/Tools/Debug/MigrateRoom.razor b/MatrixUtils.Web/Pages/Tools/Debug/MigrateRoom.razor index 0943216..b0f7dbf 100644 --- a/MatrixUtils.Web/Pages/Tools/Debug/MigrateRoom.razor +++ b/MatrixUtils.Web/Pages/Tools/Debug/MigrateRoom.razor @@ -17,7 +17,7 @@
-Execute +Execute
@foreach (var line in Enumerable.Reverse(log)) {

@line

diff --git a/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor b/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor index 5c238b3..fcdb3d0 100644 --- a/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor +++ b/MatrixUtils.Web/Pages/Tools/Info/SessionCount.razor @@ -11,7 +11,7 @@

Users:


-Import from room (ID) +Import from room (ID)
Rooms to be searched (@rooms.Count) @@ -21,7 +21,7 @@ }

-Execute +Execute
diff --git a/MatrixUtils.Web/Pages/Tools/InviteCounter.razor b/MatrixUtils.Web/Pages/Tools/InviteCounter.razor index 2313884..16a3853 100644 --- a/MatrixUtils.Web/Pages/Tools/InviteCounter.razor +++ b/MatrixUtils.Web/Pages/Tools/InviteCounter.razor @@ -9,7 +9,7 @@
Room ID: -Execute +Execute
diff --git a/MatrixUtils.Web/Pages/Tools/MassCMEBan.razor b/MatrixUtils.Web/Pages/Tools/MassCMEBan.razor index a252e6b..5b0f510 100644 --- a/MatrixUtils.Web/Pages/Tools/MassCMEBan.razor +++ b/MatrixUtils.Web/Pages/Tools/MassCMEBan.razor @@ -7,7 +7,7 @@
Users: -Execute +Execute
diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectedRoomsEditor.razor b/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectedRoomsEditor.razor index b0d5a65..1ff97c8 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectedRoomsEditor.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectedRoomsEditor.razor @@ -53,7 +53,7 @@ }
-Apply +Apply @code { diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectionsEditor.razor b/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectionsEditor.razor index ea39c9a..9b0266c 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectionsEditor.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirProtectionsEditor.razor @@ -49,7 +49,7 @@ }
-Apply +Apply @code { diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirWatchedListsEditor.razor b/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirWatchedListsEditor.razor index 9e70687..69a9048 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirWatchedListsEditor.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/Draupnir/DraupnirWatchedListsEditor.razor @@ -49,7 +49,7 @@ }
-Apply +Apply @code { diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/FindUsersByRegex.razor b/MatrixUtils.Web/Pages/Tools/Moderation/FindUsersByRegex.razor index b62cf57..1fd0ff6 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/FindUsersByRegex.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/FindUsersByRegex.razor @@ -14,10 +14,10 @@

Users (regex):

-Execute +Execute
-Remove kicks -Remove bans +Remove kicks +Remove bans
diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/InviteCounter.razor b/MatrixUtils.Web/Pages/Tools/Moderation/InviteCounter.razor index 5c5946f..ac68e3d 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/InviteCounter.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/InviteCounter.razor @@ -9,7 +9,7 @@
Room ID: -Execute +Execute
diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/MassCMEBan.razor b/MatrixUtils.Web/Pages/Tools/Moderation/MassCMEBan.razor index 8fdad84..605890d 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/MassCMEBan.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/MassCMEBan.razor @@ -8,7 +8,7 @@
Users: -Execute +Execute
diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/MembershipHistory.razor b/MatrixUtils.Web/Pages/Tools/Moderation/MembershipHistory.razor index 1ec3cd0..11c4a80 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/MembershipHistory.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/MembershipHistory.razor @@ -16,7 +16,7 @@
Room ID: -Execute +Execute

Chronological order Enable extended filters @@ -30,17 +30,17 @@ bans

- { ShowJoins = ShowLeaves = ShowKnocks = ShowInvites = ShowBans = false; StateHasChanged(); })">Hide all - { ShowJoins = ShowLeaves = ShowKnocks = ShowInvites = ShowBans = true; StateHasChanged(); })">Show all - { ShowJoins ^= true; ShowLeaves ^= true; ShowKnocks ^= true; @@ -129,17 +129,17 @@

- { DoDisambiguate = DisambiguateProfileUpdates = DisambiguateKicks = DisambiguateUnbans = DisambiguateInviteAccepted = DisambiguateInviteRejected = DisambiguateInviteRetracted = DisambiguateKnockAccepted = DisambiguateKnockRejected = DisambiguateKnockRetracted = DisambiguateKnockActions = DisambiguateInviteActions = false; StateHasChanged(); })">Un-disambiguate all - { DoDisambiguate = DisambiguateProfileUpdates = DisambiguateKicks = DisambiguateUnbans = DisambiguateInviteAccepted = DisambiguateInviteRejected = DisambiguateInviteRetracted = DisambiguateKnockAccepted = DisambiguateKnockRejected = DisambiguateKnockRetracted = DisambiguateKnockActions = DisambiguateInviteActions = true; StateHasChanged(); })">Disambiguate all - { DisambiguateProfileUpdates ^= true; DisambiguateKicks ^= true; DisambiguateUnbans ^= true; diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/RoomIntersections.razor b/MatrixUtils.Web/Pages/Tools/Moderation/RoomIntersections.razor index 31fde0b..ee77532 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/RoomIntersections.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/RoomIntersections.razor @@ -8,13 +8,13 @@

Set A:

-Append Set A +Append Set A

Set B:

-Append Set B +Append Set B
-Execute +Execute
diff --git a/MatrixUtils.Web/Pages/Tools/Moderation/UserTrace.razor b/MatrixUtils.Web/Pages/Tools/Moderation/UserTrace.razor index c3cc09c..f39a2eb 100644 --- a/MatrixUtils.Web/Pages/Tools/Moderation/UserTrace.razor +++ b/MatrixUtils.Web/Pages/Tools/Moderation/UserTrace.razor @@ -11,7 +11,7 @@
-Import from room (ID) +Import from room (ID)
Rooms to be searched (@rooms.Count) @@ -21,7 +21,7 @@ }

-Execute +Execute
diff --git a/MatrixUtils.Web/Pages/Tools/Room/DropPowerlevel.razor b/MatrixUtils.Web/Pages/Tools/Room/DropPowerlevel.razor index 3f9c141..208cd19 100644 --- a/MatrixUtils.Web/Pages/Tools/Room/DropPowerlevel.razor +++ b/MatrixUtils.Web/Pages/Tools/Room/DropPowerlevel.razor @@ -6,7 +6,7 @@ User ID:
Room ID:
-Execute +Execute 
@Result
diff --git a/MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor b/MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor index 5d5ca20..d6ae945 100644 --- a/MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor +++ b/MatrixUtils.Web/Pages/Tools/Room/SpaceRestrictedJoins.razor @@ -10,7 +10,7 @@

Change knock access:


-Execute +Execute

diff --git a/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor b/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor index e5ffd5b..b893970 100644 --- a/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor +++ b/MatrixUtils.Web/Pages/Tools/User/CopyPowerlevel.razor @@ -12,7 +12,7 @@ }
-Execute +Execute
@foreach (var line in Enumerable.Reverse(log)) {

@line

diff --git a/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor b/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor index c373a37..748f2fb 100644 --- a/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor +++ b/MatrixUtils.Web/Pages/Tools/User/MassJoinRoom.razor @@ -13,7 +13,7 @@ }
-Execute +Execute
@foreach (var line in Enumerable.Reverse(log)) {

@line

-- cgit 1.5.1