From e0366831cf35b5d0f08a17fbde0b93cd977615a6 Mon Sep 17 00:00:00 2001 From: Rory& Date: Sat, 1 Nov 2025 20:10:35 +0100 Subject: Follow libmatrix changes --- ModerationBot/Commands/BanMediaCommand.cs | 14 ++---- .../Commands/DbgDumpAllStateTypesCommand.cs | 2 +- ModerationBot/Commands/JoinSpaceMembersCommand.cs | 4 +- ModerationBot/ModerationBot.cs | 50 ++++++++++++++++++---- ModerationBot/PolicyEngine.cs | 15 ++----- 5 files changed, 51 insertions(+), 34 deletions(-) (limited to 'ModerationBot') diff --git a/ModerationBot/Commands/BanMediaCommand.cs b/ModerationBot/Commands/BanMediaCommand.cs index 07c9858..a41ad75 100644 --- a/ModerationBot/Commands/BanMediaCommand.cs +++ b/ModerationBot/Commands/BanMediaCommand.cs @@ -64,7 +64,7 @@ public class BanMediaCommand(HomeserverResolverService hsResolver, PolicyEngine //hash file var mxcUri = (repliedMessage.TypedContent as RoomMessageEventContent).Url!; - var resolvedUri = await hsResolver.ResolveMediaUri(mxcUri.Split('/')[2], mxcUri); + var resolvedUri = await ctx.Homeserver.GetMediaUrlAsync(mxcUri); var hashAlgo = SHA3_256.Create(); var uriHash = hashAlgo.ComputeHash(mxcUri.AsBytes().ToArray()); byte[]? fileHash = null; @@ -74,17 +74,9 @@ public class BanMediaCommand(HomeserverResolverService hsResolver, PolicyEngine } catch (Exception ex) { await logRoom.SendMessageEventAsync( - MessageFormatter.FormatException($"Error calculating file hash for {mxcUri} via {mxcUri.Split('/')[2]}, retrying via {ctx.Homeserver.BaseUrl}...", + MessageFormatter.FormatException($"Error calculating file hash for {mxcUri}!", ex)); - try { - resolvedUri = await hsResolver.ResolveMediaUri(ctx.Homeserver.BaseUrl, mxcUri); - fileHash = await hashAlgo.ComputeHashAsync(await ctx.Homeserver.ClientHttpClient.GetStreamAsync(resolvedUri)); - } - catch (Exception ex2) { - await ctx.Room.SendMessageEventAsync(MessageFormatter.FormatException("Error calculating file hash", ex2)); - await logRoom.SendMessageEventAsync( - MessageFormatter.FormatException($"Error calculating file hash via {ctx.Homeserver.BaseUrl}!", ex2)); - } + return; } MediaPolicyFile policy; diff --git a/ModerationBot/Commands/DbgDumpAllStateTypesCommand.cs b/ModerationBot/Commands/DbgDumpAllStateTypesCommand.cs index ac2036a..8c187d1 100644 --- a/ModerationBot/Commands/DbgDumpAllStateTypesCommand.cs +++ b/ModerationBot/Commands/DbgDumpAllStateTypesCommand.cs @@ -39,7 +39,7 @@ public class DbgDumpAllStateTypesCommand(IServiceProvider services, HomeserverPr var joinedRooms = await ctx.Homeserver.GetJoinedRooms(); - var tasks = joinedRooms.Select(GetStateTypes).ToAsyncEnumerable(); + var tasks = joinedRooms.Select(GetStateTypes).ToAsyncResultEnumerable(); await foreach (var (room, (raw, html)) in tasks) { await ctx.Room.SendMessageEventAsync(new RoomMessageEventContent("m.text") { Body = $"States for {room.RoomId}:\n{raw}", diff --git a/ModerationBot/Commands/JoinSpaceMembersCommand.cs b/ModerationBot/Commands/JoinSpaceMembersCommand.cs index 86ecf7e..c7b2c7d 100644 --- a/ModerationBot/Commands/JoinSpaceMembersCommand.cs +++ b/ModerationBot/Commands/JoinSpaceMembersCommand.cs @@ -47,14 +47,14 @@ public class JoinSpaceMembersCommand(IServiceProvider services, HomeserverProvid var room = ctx.Homeserver.GetRoom(roomId); var tasks = new List>(); - await foreach (var memberRoom in room.AsSpace.GetChildrenAsync()) { + await foreach (var memberRoom in room.AsSpace().GetChildrenAsync()) { if (currentRooms.Contains(memberRoom.RoomId)) continue; servers.Add(room.RoomId.Split(':', 2)[1]); servers = servers.Distinct().ToList(); tasks.Add(JoinRoom(memberRoom, string.Join(' ', ctx.Args[1..]), servers)); } - await foreach (var b in tasks.ToAsyncEnumerable()) { + await foreach (var b in tasks.ToAsyncResultEnumerable()) { await Task.Delay(50); } } diff --git a/ModerationBot/ModerationBot.cs b/ModerationBot/ModerationBot.cs index 791d3b5..25d4d5d 100644 --- a/ModerationBot/ModerationBot.cs +++ b/ModerationBot/ModerationBot.cs @@ -1,9 +1,11 @@ +using ArcaneLibs.Collections; using ArcaneLibs.Extensions; using LibMatrix; using LibMatrix.EventTypes; using LibMatrix.EventTypes.Spec; using LibMatrix.EventTypes.Spec.State; using LibMatrix.EventTypes.Spec.State.Policy; +using LibMatrix.EventTypes.Spec.State.RoomInfo; using LibMatrix.Helpers; using LibMatrix.Homeservers; using LibMatrix.RoomTypes; @@ -22,6 +24,8 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger _roomServerListCache = new(); + /// Triggered when the application host is ready to start the service. /// Indicates that the start process has been aborted. public async Task StartAsync(CancellationToken cancellationToken) { @@ -61,9 +65,11 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger admins = new(); @@ -89,7 +95,8 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger { + logger.LogInformation("Refeshing server list for room {roomId}", room.RoomId); + var servers = (await room.GetMembersByHomeserverAsync()) + .ToDictionary(x => x.Key, x => x.Value.Count) + .OrderByDescending(x => x.Value) + .Take(5) + .Select(x => x.Key) + .ToArray(); + logger.LogInformation("Got server list for room {roomId}: {top5Servers}", room.RoomId, string.Join(", ", servers)); + return servers; + }, TimeSpan.FromHours(1)); + var rules = await engine.GetMatchingPolicies(@event); foreach (var matchedRule in rules) { + string[] matchedRuleRoomServerList = await _roomServerListCache.GetOrAdd(matchedRule.OriginalEvent.RoomId, async () => { + logger.LogInformation("Refeshing server list for room {roomId}", room.RoomId); + var servers = (await room.GetMembersByHomeserverAsync()) + .ToDictionary(x => x.Key, x => x.Value.Count) + .OrderByDescending(x => x.Value) + .Take(5) + .Select(x => x.Key) + .ToArray(); + logger.LogInformation("Got server list for room {roomId}: {top5Servers}", room.RoomId, string.Join(", ", servers)); + return servers; + }, TimeSpan.FromHours(1)); await _logRoom.SendMessageEventAsync(MessageFormatter.FormatSuccessJson( - $"{MessageFormatter.HtmlFormatMessageLink(eventId: @event.EventId, roomId: room.RoomId, displayName: "Event")} matched {MessageFormatter.HtmlFormatMessageLink(eventId: @matchedRule.OriginalEvent.EventId, roomId: matchedRule.PolicyList.Room.RoomId, displayName: "rule")}", @matchedRule.OriginalEvent.RawContent)); + $"{MessageFormatter.HtmlFormatMessageLink(eventId: @event.EventId, roomId: room.RoomId, displayName: "Event", servers: roomServerList)} matched {MessageFormatter.HtmlFormatMessageLink(eventId: @matchedRule.OriginalEvent.EventId, roomId: matchedRule.PolicyList.Room.RoomId, displayName: "rule", servers: matchedRuleRoomServerList)}", + @matchedRule.OriginalEvent.RawContent)); } if (configuration.DemoMode) { @@ -269,11 +300,12 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger {changeEvent.MappedType.Name}") { FormattedBody = $"Policy type: {changeEvent.Type} -> {changeEvent.MappedType.Name}" }); - var isUpdated = changeEvent.Unsigned.PrevContent is { Count: > 0 }; + var isUpdated = changeEvent.Unsigned?["prev_content"]?.AsObject() is { Count: > 0 }; var isRemoved = changeEvent.RawContent is not { Count: > 0 }; // if (isUpdated) { // message = message.ConcatLine(MessageFormatter.FormatSuccess("Rule updated!")); @@ -285,11 +317,12 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger= 256 || policyLists.Count == PolicyListAccountData.Count) { @@ -195,7 +195,7 @@ public class PolicyEngine(AuthenticatedHomeserverGeneric hs, ILogger