feat: shard status update, delete old messages when they expire
This commit is contained in:
parent
8e030acaf3
commit
32732d74d0
9 changed files with 302 additions and 17 deletions
|
|
@ -93,6 +93,8 @@ public class GuildCreateResponder(
|
|||
return Task.FromResult(Result.Success);
|
||||
}
|
||||
|
||||
guildCache.Remove(evt.ID, out _);
|
||||
|
||||
if (!guildCache.TryGet(evt.ID, out var guild))
|
||||
{
|
||||
_logger.Information("Left uncached guild {GuildId}", evt.ID);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,142 @@
|
|||
using System.Text;
|
||||
using Catalogger.Backend.Cache.InMemoryCache;
|
||||
using Catalogger.Backend.Database;
|
||||
using Catalogger.Backend.Database.Queries;
|
||||
using Catalogger.Backend.Extensions;
|
||||
using Catalogger.Backend.Services;
|
||||
using NodaTime.Extensions;
|
||||
using Remora.Discord.API.Abstractions.Gateway.Events;
|
||||
using Remora.Discord.API.Abstractions.Objects;
|
||||
using Remora.Discord.API.Abstractions.Rest;
|
||||
using Remora.Discord.Extensions.Embeds;
|
||||
using Remora.Discord.Gateway.Responders;
|
||||
using Remora.Rest.Core;
|
||||
using Remora.Results;
|
||||
|
||||
namespace Catalogger.Backend.Bot.Responders.Messages;
|
||||
|
||||
public class MessageDeleteBulkResponder(
|
||||
ILogger logger,
|
||||
DatabaseContext db,
|
||||
MessageRepository messageRepository,
|
||||
WebhookExecutorService webhookExecutor,
|
||||
ChannelCache channelCache
|
||||
) : IResponder<IMessageDeleteBulk>
|
||||
{
|
||||
private readonly ILogger _logger = logger.ForContext<MessageDeleteBulkResponder>();
|
||||
|
||||
public async Task<Result> RespondAsync(IMessageDeleteBulk evt, CancellationToken ct = default)
|
||||
{
|
||||
var guild = await db.GetGuildAsync(evt.GuildID, ct);
|
||||
if (guild.IsMessageIgnored(evt.ChannelID, null))
|
||||
return Result.Success;
|
||||
|
||||
var logChannel = webhookExecutor.GetLogChannel(
|
||||
guild,
|
||||
LogChannelType.MessageDeleteBulk,
|
||||
evt.ChannelID
|
||||
);
|
||||
if (logChannel == null)
|
||||
{
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
IChannel? rootChannel = null;
|
||||
channelCache.TryGet(evt.ChannelID, out var channel);
|
||||
if (
|
||||
channel is
|
||||
{
|
||||
Type: ChannelType.AnnouncementThread
|
||||
or ChannelType.PrivateThread
|
||||
or ChannelType.PublicThread
|
||||
}
|
||||
)
|
||||
{
|
||||
if (channel.ParentID.TryGet(out var parentId) && parentId != null)
|
||||
channelCache.TryGet(parentId.Value, out rootChannel);
|
||||
}
|
||||
|
||||
List<string> renderedMessages = [];
|
||||
var notFoundMessages = 0;
|
||||
var ignoredMessages = 0;
|
||||
|
||||
foreach (var msgId in evt.IDs.Order())
|
||||
{
|
||||
if (await messageRepository.IsMessageIgnoredAsync(msgId.Value, ct))
|
||||
{
|
||||
ignoredMessages++;
|
||||
continue;
|
||||
}
|
||||
|
||||
var msg = await messageRepository.GetMessageAsync(msgId.Value, ct);
|
||||
renderedMessages.Add(RenderMessage(msgId, msg));
|
||||
|
||||
if (msg == null)
|
||||
notFoundMessages++;
|
||||
}
|
||||
|
||||
var output = "Bulk message delete in";
|
||||
if (channel != null)
|
||||
{
|
||||
output += $" #{channel.Name} ({channel.ID})";
|
||||
if (rootChannel != null)
|
||||
output += $" (thread in #{rootChannel.Name} ({rootChannel.ID})";
|
||||
}
|
||||
else
|
||||
{
|
||||
output += $" unknown channel {evt.ChannelID}";
|
||||
}
|
||||
|
||||
output += $"\nwith {renderedMessages.Count} messages\n\n";
|
||||
output += string.Join("\n", renderedMessages);
|
||||
|
||||
var embed = new EmbedBuilder()
|
||||
.WithTitle("Bulk message delete")
|
||||
.WithDescription(
|
||||
$"""
|
||||
{evt.IDs.Count} messages were deleted in <#{evt.ChannelID}>
|
||||
({notFoundMessages} messages not found, {ignoredMessages} messages ignored)
|
||||
"""
|
||||
)
|
||||
.WithColour(DiscordUtils.Red)
|
||||
.WithCurrentTimestamp();
|
||||
|
||||
await webhookExecutor.SendLogAsync(
|
||||
logChannel.Value,
|
||||
[embed.Build().GetOrThrow()],
|
||||
[
|
||||
new FileData(
|
||||
$"bulk-delete-{evt.ChannelID}.txt",
|
||||
new MemoryStream(Encoding.UTF8.GetBytes(output))
|
||||
),
|
||||
]
|
||||
);
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
private string RenderMessage(Snowflake messageId, MessageRepository.Message? message)
|
||||
{
|
||||
var timestamp = messageId.Timestamp.ToOffsetDateTime().ToString();
|
||||
|
||||
if (message == null)
|
||||
{
|
||||
return $"""
|
||||
[{timestamp}] Unknown message {messageId}
|
||||
--------------------------------------------
|
||||
""";
|
||||
}
|
||||
|
||||
var builder = new StringBuilder();
|
||||
builder.Append($"[{timestamp}] {message.Username} ({message.UserId})\n");
|
||||
if (message is { System: not null, Member: not null })
|
||||
{
|
||||
builder.Append($"PK system: {message.System} | PK member: {message.Member}\n");
|
||||
}
|
||||
|
||||
builder.Append("--------------------------------------------\n");
|
||||
builder.Append(message.Content);
|
||||
builder.Append("\n--------------------------------------------\n");
|
||||
|
||||
return builder.ToString();
|
||||
}
|
||||
}
|
||||
|
|
@ -19,7 +19,8 @@ public class ShardedGatewayClient(
|
|||
Config config
|
||||
) : IDisposable
|
||||
{
|
||||
private int _shardCount = config.Discord.ShardCount ?? 0;
|
||||
public int TotalShards { get; private set; } = config.Discord.ShardCount ?? 0;
|
||||
|
||||
private readonly ILogger _logger = logger.ForContext<ShardedGatewayClient>();
|
||||
private readonly ConcurrentDictionary<int, DiscordGatewayClient> _gatewayClients = new();
|
||||
|
||||
|
|
@ -33,6 +34,9 @@ public class ShardedGatewayClient(
|
|||
GatewayConnectionStatus
|
||||
> GetConnectionStatus = client => (GatewayConnectionStatus)Field.GetValue(client)!;
|
||||
|
||||
public static bool IsConnected(DiscordGatewayClient client) =>
|
||||
GetConnectionStatus(client) == GatewayConnectionStatus.Connected;
|
||||
|
||||
public IReadOnlyDictionary<int, DiscordGatewayClient> Shards => _gatewayClients;
|
||||
|
||||
public async Task<Result> RunAsync(CancellationToken ct = default)
|
||||
|
|
@ -46,19 +50,19 @@ public class ShardedGatewayClient(
|
|||
|
||||
if (gatewayResult.Entity.Shards.IsDefined(out var discordShardCount))
|
||||
{
|
||||
if (_shardCount < discordShardCount && _shardCount != 0)
|
||||
if (TotalShards < discordShardCount && TotalShards != 0)
|
||||
_logger.Warning(
|
||||
"Discord recommends {DiscordShardCount} for this bot, but only {ConfigShardCount} shards are requested. This may cause issues later",
|
||||
discordShardCount,
|
||||
_shardCount
|
||||
TotalShards
|
||||
);
|
||||
|
||||
if (_shardCount == 0)
|
||||
_shardCount = discordShardCount;
|
||||
if (TotalShards == 0)
|
||||
TotalShards = discordShardCount;
|
||||
}
|
||||
|
||||
var clients = Enumerable
|
||||
.Range(0, _shardCount)
|
||||
.Range(0, TotalShards)
|
||||
.Select(s =>
|
||||
{
|
||||
var client = ActivatorUtilities.CreateInstance<DiscordGatewayClient>(
|
||||
|
|
@ -74,7 +78,7 @@ public class ShardedGatewayClient(
|
|||
|
||||
for (var shardIndex = 0; shardIndex < clients.Length; shardIndex++)
|
||||
{
|
||||
_logger.Debug("Starting shard {ShardId}/{ShardCount}", shardIndex, _shardCount);
|
||||
_logger.Debug("Starting shard {ShardId}/{ShardCount}", shardIndex, TotalShards);
|
||||
|
||||
var client = clients[shardIndex];
|
||||
var res = client.RunAsync(ct);
|
||||
|
|
@ -93,13 +97,13 @@ public class ShardedGatewayClient(
|
|||
return res.Result;
|
||||
}
|
||||
|
||||
_logger.Information("Started shard {ShardId}/{ShardCount}", shardIndex, _shardCount);
|
||||
_logger.Information("Started shard {ShardId}/{ShardCount}", shardIndex, TotalShards);
|
||||
}
|
||||
|
||||
return await await Task.WhenAny(tasks);
|
||||
}
|
||||
|
||||
public int ShardIdFor(ulong guildId) => (int)((guildId >> 22) % (ulong)_shardCount);
|
||||
public int ShardIdFor(ulong guildId) => (int)((guildId >> 22) % (ulong)TotalShards);
|
||||
|
||||
public DiscordGatewayClient ClientFor(Snowflake guildId) => ClientFor(guildId.Value);
|
||||
|
||||
|
|
@ -112,6 +116,7 @@ public class ShardedGatewayClient(
|
|||
|
||||
public void Dispose()
|
||||
{
|
||||
GC.SuppressFinalize(this);
|
||||
foreach (var client in _gatewayClients.Values)
|
||||
client.Dispose();
|
||||
}
|
||||
|
|
@ -123,7 +128,7 @@ public class ShardedGatewayClient(
|
|||
{
|
||||
var ret = new DiscordGatewayClientOptions
|
||||
{
|
||||
ShardIdentification = new ShardIdentification(shardId, _shardCount),
|
||||
ShardIdentification = new ShardIdentification(shardId, TotalShards),
|
||||
Intents = options.Intents,
|
||||
Presence = options.Presence,
|
||||
ConnectionProperties = options.ConnectionProperties,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue