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/ModerationBot.cs | 50 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) (limited to 'ModerationBot/ModerationBot.cs') 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