diff --git a/LibMatrix b/LibMatrix
-Subproject 1db452c75de1e25a9a2a8fd4fe2a04a2e1047f2
+Subproject 90654751d32d75c76979d09fa30a3f749986d91
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<Task<bool>>();
- 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<Moderation
private GenericRoom? _logRoom;
private GenericRoom? _controlRoom;
+ private ExpiringSemaphoreCache<string[]> _roomServerListCache = new();
+
/// <summary>Triggered when the application host is ready to start the service.</summary>
/// <param name="cancellationToken">Indicates that the start process has been aborted.</param>
public async Task StartAsync(CancellationToken cancellationToken) {
@@ -61,9 +65,11 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger<Moderation
await _logRoom?.SendMessageEventAsync(MessageFormatter.FormatWarning($"Control room has no m.room.power_levels?"));
continue;
}
+
pls.SetUserPowerLevel(configurationAdmin, pls.GetUserPowerLevel(hs.UserId));
await _controlRoom.SendStateEventAsync(RoomPowerLevelEventContent.EventId, pls);
}
+
var syncHelper = new SyncHelper(hs);
List<string> admins = new();
@@ -89,7 +95,8 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger<Moderation
x.Type == "m.room.member" && x.StateKey == hs.UserId);
logger.LogInformation("Got invite to {RoomId} by {Sender} with reason: {Reason}", args.Key, inviteEvent!.Sender,
(inviteEvent.TypedContent as RoomMemberEventContent)!.Reason);
- await _logRoom.SendMessageEventAsync(MessageFormatter.FormatSuccess($"Bot invited to {MessageFormatter.HtmlFormatMention(args.Key)} by {MessageFormatter.HtmlFormatMention(inviteEvent.Sender)}"));
+ await _logRoom.SendMessageEventAsync(
+ MessageFormatter.FormatSuccess($"Bot invited to {MessageFormatter.HtmlFormatMention(args.Key)} by {MessageFormatter.HtmlFormatMention(inviteEvent.Sender)}"));
if (admins.Contains(inviteEvent.Sender)) {
try {
await _logRoom.SendMessageEventAsync(MessageFormatter.FormatSuccess($"Joining {MessageFormatter.HtmlFormatMention(args.Key)}..."));
@@ -118,10 +125,34 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger<Moderation
await engine.ReloadActivePolicyListById(@event.RoomId);
}
+ string[] roomServerList = await _roomServerListCache.GetOrAdd(@event.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));
+
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<Moderation
private async Task LogPolicyChange(StateEventResponse changeEvent) {
var room = hs.GetRoom(changeEvent.RoomId!);
- var message = MessageFormatter.FormatWarning($"Policy change detected in {MessageFormatter.HtmlFormatMessageLink(changeEvent.RoomId, changeEvent.EventId, [hs.ServerName], await room.GetNameOrFallbackAsync())}!");
+ var message = MessageFormatter.FormatWarning(
+ $"Policy change detected in {MessageFormatter.HtmlFormatMessageLink(changeEvent.RoomId, changeEvent.EventId, [hs.ServerName], await room.GetNameOrFallbackAsync())}!");
message = message.ConcatLine(new RoomMessageEventContent(body: $"Policy type: {changeEvent.Type} -> {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<Moderation
// else {
// message = message.ConcatLine(MessageFormatter.FormatSuccess("New rule added!"));
// }
- message = message.ConcatLine(MessageFormatter.FormatSuccessJson($"{(isUpdated ? "Updated" : isRemoved ? "Removed" : "New")} rule: {changeEvent.StateKey}", changeEvent.RawContent!));
+ message = message.ConcatLine(MessageFormatter.FormatSuccessJson($"{(isUpdated ? "Updated" : isRemoved ? "Removed" : "New")} rule: {changeEvent.StateKey}",
+ changeEvent.RawContent!));
if (isRemoved || isUpdated) {
- message = message.ConcatLine(MessageFormatter.FormatSuccessJson("Old content: ", changeEvent.Unsigned.PrevContent!));
+ message = message.ConcatLine(MessageFormatter.FormatSuccessJson("Old content: ", changeEvent.Unsigned?["prev_content"] ?? ""));
}
-
+
await _logRoom.SendMessageEventAsync(message);
}
@@ -298,5 +331,4 @@ public class ModerationBot(AuthenticatedHomeserverGeneric hs, ILogger<Moderation
public async Task StopAsync(CancellationToken cancellationToken) {
logger.LogInformation("Shutting down bot!");
}
-
-}
+}
\ No newline at end of file
diff --git a/ModerationBot/PolicyEngine.cs b/ModerationBot/PolicyEngine.cs
index 7556fc5..a19f1f7 100644
--- a/ModerationBot/PolicyEngine.cs
+++ b/ModerationBot/PolicyEngine.cs
@@ -61,7 +61,7 @@ public class PolicyEngine(AuthenticatedHomeserverGeneric hs, ILogger<ModerationB
loadTasks.Add(LoadPolicyListAsync(room, policyList));
}
- await foreach (var policyList in loadTasks.ToAsyncEnumerable()) {
+ await foreach (var policyList in loadTasks.ToAsyncResultEnumerable()) {
policyLists.Add(policyList);
if (true || policyList.Policies.Count >= 256 || policyLists.Count == PolicyListAccountData.Count) {
@@ -195,7 +195,7 @@ public class PolicyEngine(AuthenticatedHomeserverGeneric hs, ILogger<ModerationB
}
}
- var resolvedUri = await hsResolver.ResolveMediaUri(mxcUri.Split('/')[2], mxcUri);
+ var resolvedUri = await hs.GetMediaUrlAsync(mxcUri);
var uriHash = hashAlgo.ComputeHash(mxcUri.AsBytes().ToArray());
byte[]? fileHash = null;
@@ -204,16 +204,9 @@ public class PolicyEngine(AuthenticatedHomeserverGeneric hs, ILogger<ModerationB
}
catch (Exception ex) {
await _logRoom.SendMessageEventAsync(
- MessageFormatter.FormatException($"Error calculating file hash for {mxcUri} via {mxcUri.Split('/')[2]} ({resolvedUri}), retrying via {hs.BaseUrl}...",
+ MessageFormatter.FormatException($"Error calculating file hash for {mxcUri} ({resolvedUri})!",
ex));
- try {
- resolvedUri = await hsResolver.ResolveMediaUri(hs.BaseUrl, mxcUri);
- fileHash = await hashAlgo.ComputeHashAsync(await hs.ClientHttpClient.GetStreamAsync(resolvedUri));
- }
- catch (Exception ex2) {
- await _logRoom.SendMessageEventAsync(
- MessageFormatter.FormatException($"Error calculating file hash via {hs.BaseUrl} ({resolvedUri})!", ex2));
- }
+ return [];
}
logger.LogInformation("Checking media {url} with hash {hash}", resolvedUri, fileHash);
|
