fix embed queue
This commit is contained in:
parent
ded4f4db26
commit
8d4a7b1729
GPG key ID:
5F3C3C1B3166639D
13 changed files with 188 additions and 32 deletions
|
|
@ -1,10 +1,16 @@
|
|||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using Catalogger.Backend.Cache;
|
||||
using Catalogger.Backend.Database;
|
||||
using Catalogger.Backend.Extensions;
|
||||
using Humanizer;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using NodaTime;
|
||||
using Remora.Commands.Attributes;
|
||||
using Remora.Commands.Groups;
|
||||
using Remora.Discord.API.Abstractions.Rest;
|
||||
using Remora.Discord.Commands.Feedback.Services;
|
||||
using Remora.Discord.Extensions.Embeds;
|
||||
using Remora.Discord.Gateway;
|
||||
using Remora.Results;
|
||||
using IResult = Remora.Results.IResult;
|
||||
|
|
@ -14,7 +20,10 @@ namespace Catalogger.Backend.Bot.Commands;
|
|||
[Group("catalogger")]
|
||||
public class MetaCommands(
|
||||
IClock clock,
|
||||
DatabaseContext db,
|
||||
DiscordGatewayClient client,
|
||||
GuildCacheService guildCache,
|
||||
ChannelCacheService channelCache,
|
||||
IFeedbackService feedbackService,
|
||||
IDiscordRestChannelAPI channelApi) : CommandGroup
|
||||
{
|
||||
|
|
@ -26,6 +35,24 @@ public class MetaCommands(
|
|||
var msg = await feedbackService.SendContextualAsync("...").GetOrThrow();
|
||||
var elapsed = clock.GetCurrentInstant() - t1;
|
||||
|
||||
var messageCount = await db.Messages.CountAsync();
|
||||
var process = Process.GetCurrentProcess();
|
||||
var memoryUsage = process.WorkingSet64;
|
||||
var virtualMemory = process.VirtualMemorySize64;
|
||||
|
||||
var embed = new EmbedBuilder()
|
||||
.WithColour(DiscordUtils.Purple)
|
||||
.WithFooter("")
|
||||
.WithCurrentTimestamp();
|
||||
embed.AddField("Ping", $"Gateway: {client.Latency.Humanize()}\nAPI: {elapsed.ToTimeSpan().Humanize()}",
|
||||
inline: true);
|
||||
embed.AddField("Memory usage", $"{memoryUsage.Bytes().Humanize()} / {virtualMemory.Bytes().Humanize()}",
|
||||
inline: true);
|
||||
|
||||
embed.AddField("Numbers",
|
||||
$"{messageCount:N0} messages from {guildCache.Size:N0} servers\nCached {channelCache.Size:N0} channels",
|
||||
inline: false);
|
||||
|
||||
return (Result)await channelApi.EditMessageAsync(msg.ChannelID, msg.ID,
|
||||
content: $"Pong! API: {elapsed.TotalMilliseconds:N0}ms | Gateway: {client.Latency.TotalMilliseconds:N0}ms");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@ namespace Catalogger.Backend.Bot;
|
|||
public static class DiscordUtils
|
||||
{
|
||||
public static readonly Color Red = Color.FromArgb(231, 76, 60);
|
||||
public static readonly Color Blue = Color.FromArgb(155, 89, 182);
|
||||
public static readonly Color Purple = Color.FromArgb(155, 89, 182);
|
||||
}
|
||||
|
|
@ -3,14 +3,23 @@ using Catalogger.Backend.Cache;
|
|||
using Catalogger.Backend.Database;
|
||||
using Catalogger.Backend.Database.Models;
|
||||
using Catalogger.Backend.Extensions;
|
||||
using Catalogger.Backend.Services;
|
||||
using Remora.Discord.API.Abstractions.Gateway.Events;
|
||||
using Remora.Discord.API.Gateway.Events;
|
||||
using Remora.Discord.Extensions.Embeds;
|
||||
using Remora.Discord.Gateway.Responders;
|
||||
using Remora.Results;
|
||||
|
||||
namespace Catalogger.Backend.Bot.Responders;
|
||||
|
||||
public class GuildCreateResponder(ILogger logger, DatabaseContext db, ChannelCacheService channelCache)
|
||||
: IResponder<IGuildCreate>
|
||||
public class GuildCreateResponder(
|
||||
Config config,
|
||||
ILogger logger,
|
||||
DatabaseContext db,
|
||||
GuildCacheService guildCache,
|
||||
ChannelCacheService channelCache,
|
||||
WebhookExecutorService webhookExecutor)
|
||||
: IResponder<IGuildCreate>, IResponder<GuildDelete>
|
||||
{
|
||||
private readonly ILogger _logger = logger.ForContext<GuildCreateResponder>();
|
||||
|
||||
|
|
@ -20,11 +29,12 @@ public class GuildCreateResponder(ILogger logger, DatabaseContext db, ChannelCac
|
|||
string? guildName = null;
|
||||
if (evt.Guild.TryPickT0(out var guild, out _))
|
||||
{
|
||||
_logger.Verbose("Received guild create for available guild {GuildId} ({Name})", guild.ID, guild.Name);
|
||||
_logger.Verbose("Received guild create for available guild {GuildName} / {GuildId})", guild.Name, guild.ID);
|
||||
guildId = guild.ID.ToUlong();
|
||||
guildName = guild.Name;
|
||||
|
||||
foreach (var c in guild.Channels) channelCache.AddChannel(c, guild.ID);
|
||||
guildCache.Set(guild);
|
||||
foreach (var c in guild.Channels) channelCache.Set(c, guild.ID);
|
||||
}
|
||||
else if (evt.Guild.TryPickT1(out var unavailableGuild, out _))
|
||||
{
|
||||
|
|
@ -43,7 +53,51 @@ public class GuildCreateResponder(ILogger logger, DatabaseContext db, ChannelCac
|
|||
await db.SaveChangesAsync(ct);
|
||||
await tx.CommitAsync(ct);
|
||||
|
||||
_logger.Information("Joined new guild {GuildId} ({Name})", guildId, guildName);
|
||||
_logger.Information("Joined new guild {GuildName} / {GuildId}", guildName, guildId);
|
||||
|
||||
if (config.Discord.GuildLogId != null && evt.Guild.IsT0)
|
||||
await webhookExecutor.QueueLogAsync(config.Discord.GuildLogId.Value, new EmbedBuilder()
|
||||
.WithTitle("Joined new guild")
|
||||
.WithDescription($"Joined new guild **{guild.Name}**")
|
||||
.WithFooter($"ID: {guild.ID}")
|
||||
.WithCurrentTimestamp()
|
||||
#pragma warning disable CS8604 // Possible null reference argument.
|
||||
.WithThumbnailUrl(guild.IconUrl())
|
||||
#pragma warning restore CS8604 // Possible null reference argument.
|
||||
.Build()
|
||||
.GetOrThrow());
|
||||
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
public async Task<Result> RespondAsync(GuildDelete evt, CancellationToken ct = default)
|
||||
{
|
||||
if (evt.IsUnavailable.OrDefault(false))
|
||||
{
|
||||
_logger.Debug("Guild {GuildId} became unavailable", evt.ID);
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
if (!guildCache.TryGet(evt.ID, out var guild))
|
||||
{
|
||||
_logger.Information("Left uncached guild {GuildId}", evt.ID);
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
_logger.Information("Left guild {GuildName} / {GuildId}", guild.Name, guild.ID);
|
||||
|
||||
if (config.Discord.GuildLogId != null)
|
||||
await webhookExecutor.QueueLogAsync(config.Discord.GuildLogId.Value, new EmbedBuilder()
|
||||
.WithTitle("Left guild")
|
||||
.WithDescription($"Left guild **{guild.Name}**")
|
||||
.WithFooter($"ID: {guild.ID}")
|
||||
.WithCurrentTimestamp()
|
||||
#pragma warning disable CS8604 // Possible null reference argument.
|
||||
.WithThumbnailUrl(guild.IconUrl())
|
||||
#pragma warning restore CS8604 // Possible null reference argument.
|
||||
.Build()
|
||||
.GetOrThrow());
|
||||
|
||||
return Result.Success;
|
||||
}
|
||||
}
|
||||
|
|
@ -16,6 +16,7 @@ namespace Catalogger.Backend.Bot.Responders;
|
|||
|
||||
public class MessageCreateResponder(
|
||||
ILogger logger,
|
||||
Config config,
|
||||
DatabaseContext db,
|
||||
MessageRepository messageRepository,
|
||||
UserCacheService userCache,
|
||||
|
|
@ -50,6 +51,12 @@ public class MessageCreateResponder(
|
|||
_ = pkMessageHandler.HandlePkMessageAsync(msg);
|
||||
if (msg.ApplicationID.IsDefined(out var appId) && appId == PkUserId)
|
||||
_ = pkMessageHandler.HandleProxiedMessageAsync(msg.ID.Value);
|
||||
else if (msg.ApplicationID.HasValue && appId == config.Discord.ApplicationId)
|
||||
{
|
||||
db.IgnoredMessages.Add(new IgnoredMessage(msg.ID.Value));
|
||||
await db.SaveChangesAsync(ct);
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
await messageRepository.SaveMessageAsync(msg, ct);
|
||||
return Result.Success;
|
||||
|
|
@ -59,20 +66,20 @@ public class MessageCreateResponder(
|
|||
public partial class PkMessageHandler(ILogger logger, IServiceProvider services)
|
||||
{
|
||||
private readonly ILogger _logger = logger.ForContext<PkMessageHandler>();
|
||||
|
||||
|
||||
[GeneratedRegex(
|
||||
@"^System ID: (\w{5,6}) \| Member ID: (\w{5,6}) \| Sender: .+ \((\d+)\) \| Message ID: (\d+) \| Original Message ID: (\d+)$")]
|
||||
private static partial Regex FooterRegex();
|
||||
|
||||
[GeneratedRegex(@"^https:\/\/discord.com\/channels\/\d+\/(\d+)\/\d+$")]
|
||||
private static partial Regex LinkRegex();
|
||||
|
||||
|
||||
public async Task HandlePkMessageAsync(IMessageCreate msg)
|
||||
{
|
||||
_logger.Debug("Received PluralKit message");
|
||||
|
||||
await Task.Delay(500.Milliseconds());
|
||||
|
||||
|
||||
_logger.Debug("Starting handling PluralKit message");
|
||||
|
||||
// Check if the content matches a Discord link--if not, it's not a log message (we already check if this is a PluralKit message earlier)
|
||||
|
|
@ -122,11 +129,11 @@ public partial class PkMessageHandler(ILogger logger, IServiceProvider services)
|
|||
db.IgnoredMessages.Add(new IgnoredMessage(originalId));
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
|
||||
public async Task HandleProxiedMessageAsync(ulong msgId)
|
||||
{
|
||||
await Task.Delay(3.Seconds());
|
||||
|
||||
|
||||
await using var scope = services.CreateAsyncScope();
|
||||
await using var db = scope.ServiceProvider.GetRequiredService<DatabaseContext>();
|
||||
var messageRepository = scope.ServiceProvider.GetRequiredService<MessageRepository>();
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public class MessageDeleteResponder(
|
|||
if (msg.Member != null) builder.WithTitle($"Message by {msg.Username} deleted");
|
||||
|
||||
string channelMention;
|
||||
if (!channelCache.GetChannel(ev.ChannelID, out var channel))
|
||||
if (!channelCache.TryGet(ev.ChannelID, out var channel))
|
||||
channelMention = $"<#{msg.ChannelId}>";
|
||||
else if (channel.Type is ChannelType.AnnouncementThread or ChannelType.PrivateThread
|
||||
or ChannelType.PublicThread)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue