sam/Catalogger.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move classes around, name caches more consistently, add more caches

Browse source
This commit is contained in:
sam 2024-08-19 16:12:28 +02:00
parent e86b37ce2a
commit e17dcf90a1
Signed by: sam
GPG key ID: 5F3C3C1B3166639D
30 changed files with 443 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Catalogger.Backend/Bot/Commands/ChannelCommands.cs
View file

@ -1,5 +1,6 @@
using System.ComponentModel;
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
using Catalogger.Backend.Database;
using Catalogger.Backend.Database.Queries;
using Catalogger.Backend.Extensions;
@ -26,8 +27,8 @@ namespace Catalogger.Backend.Bot.Commands;
public class ChannelCommands(
ILogger logger,
DatabaseContext db,
GuildCacheService guildCache,
ChannelCacheService channelCache,
GuildCache guildCache,
ChannelCache channelCache,
IFeedbackService feedbackService,
ContextInjectionService contextInjection,
InMemoryDataService<Snowflake, ChannelCommandData> dataService) : CommandGroup

5
Catalogger.Backend/Bot/Commands/ChannelCommandsComponents.cs
View file

@ -1,4 +1,5 @@
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
using Catalogger.Backend.Database;
using Catalogger.Backend.Database.Queries;
using Catalogger.Backend.Extensions;
@ -22,8 +23,8 @@ namespace Catalogger.Backend.Bot.Commands;
public class ChannelCommandsComponents(
ILogger logger,
DatabaseContext db,
GuildCacheService guildCache,
ChannelCacheService channelCache,
GuildCache guildCache,
ChannelCache channelCache,
ContextInjectionService contextInjection,
IFeedbackService feedbackService,
IDiscordRestInteractionAPI interactionApi,

25
Catalogger.Backend/Bot/Commands/MetaCommands.cs
View file

@ -1,8 +1,10 @@
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Text.Json;
using App.Metrics;
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
using Catalogger.Backend.Database;
using Catalogger.Backend.Extensions;
using Humanizer;
@ -11,7 +13,11 @@ using Remora.Commands.Attributes;
using Remora.Commands.Groups;
using Remora.Discord.API.Abstractions.Objects;
using Remora.Discord.API.Abstractions.Rest;
using Remora.Discord.API.Objects;
using Remora.Discord.Commands.Contexts;
using Remora.Discord.Commands.Extensions;
using Remora.Discord.Commands.Feedback.Services;
using Remora.Discord.Commands.Services;
using Remora.Discord.Extensions.Embeds;
using Remora.Discord.Gateway;
using Remora.Results;
@ -26,8 +32,10 @@ public class MetaCommands(
IMetrics metrics,
DiscordGatewayClient client,
IFeedbackService feedbackService,
GuildCacheService guildCache,
ChannelCacheService channelCache,
ContextInjectionService contextInjection,
IInviteCache inviteCache,
GuildCache guildCache,
ChannelCache channelCache,
IDiscordRestChannelAPI channelApi) : CommandGroup
{
[Command("ping")]
@ -65,4 +73,17 @@ public class MetaCommands(
return (Result)await channelApi.EditMessageAsync(msg.ChannelID, msg.ID, content: "", embeds: embeds);
}
[Command("debug-invites")]
[Description("Show a representation of this server's invites")]
public async Task<IResult> DebugInvitesAsync()
{
if (contextInjection.Context is not IInteractionCommandContext ctx) throw new CataloggerError("No context");
if (!ctx.TryGetGuildID(out var guildId)) throw new CataloggerError("No guild ID in context");
var invites = await inviteCache.TryGetAsync(guildId);
var text = invites.Select(i => $"{i.Code} in {i.Channel?.ID.Value}");
return await feedbackService.SendContextualAsync(string.Join("\n", text));
}
}

5
Catalogger.Backend/Bot/Responders/Channels/ChannelCreateResponder.cs
View file

@ -1,4 +1,5 @@
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
using Catalogger.Backend.Database;
using Catalogger.Backend.Database.Queries;
using Catalogger.Backend.Extensions;
@ -13,8 +14,8 @@ namespace Catalogger.Backend.Bot.Responders.Channels;
public class ChannelCreateResponder(
DatabaseContext db,
RoleCacheService roleCache,
ChannelCacheService channelCache,
RoleCache roleCache,
ChannelCache channelCache,
WebhookExecutorService webhookExecutor) : IResponder<IChannelCreate>
{
public async Task<Result> RespondAsync(IChannelCreate ch, CancellationToken ct = default)

22
Catalogger.Backend/Bot/Responders/GuildCreateResponder.cs → Catalogger.Backend/Bot/Responders/Guilds/GuildCreateResponder.cs
View file

@ -1,26 +1,27 @@
using System.Diagnostics;
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
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;
namespace Catalogger.Backend.Bot.Responders.Guilds;
public class GuildCreateResponder(
Config config,
ILogger logger,
DatabaseContext db,
GuildCacheService guildCache,
RoleCacheService roleCache,
ChannelCacheService channelCache,
WebhookExecutorService webhookExecutor)
: IResponder<IGuildCreate>, IResponder<GuildDelete>
GuildCache guildCache,
RoleCache roleCache,
ChannelCache channelCache,
WebhookExecutorService webhookExecutor,
IMemberCache memberCache,
GuildFetchService guildFetchService)
: IResponder<IGuildCreate>, IResponder<IGuildDelete>
{
private readonly ILogger _logger = logger.ForContext<GuildCreateResponder>();
@ -37,6 +38,9 @@ public class GuildCreateResponder(
guildCache.Set(guild);
foreach (var c in guild.Channels) channelCache.Set(c, guild.ID);
foreach (var r in guild.Roles) roleCache.Set(r, guild.ID);
if (!await memberCache.IsGuildCachedAsync(guild.ID))
guildFetchService.EnqueueGuild(guild.ID);
}
else
{
@ -71,7 +75,7 @@ public class GuildCreateResponder(
return Result.Success;
}
public async Task<Result> RespondAsync(GuildDelete evt, CancellationToken ct = default)
public async Task<Result> RespondAsync(IGuildDelete evt, CancellationToken ct = default)
{
if (evt.IsUnavailable.OrDefault(false))
{

27
Catalogger.Backend/Bot/Responders/Guilds/GuildMembersChunkResponder.cs Normal file
View file

@ -0,0 +1,27 @@
using Catalogger.Backend.Cache;
using Remora.Discord.API.Abstractions.Gateway.Events;
using Remora.Discord.Gateway.Responders;
using Remora.Results;
namespace Catalogger.Backend.Bot.Responders.Guilds;
public class GuildMembersChunkResponder(ILogger logger, IMemberCache memberCache) : IResponder<IGuildMembersChunk>
{
private readonly ILogger _logger = logger.ForContext<GuildMembersChunkResponder>();
public async Task<Result> RespondAsync(IGuildMembersChunk evt, CancellationToken ct = default)
{
_logger.Debug("Received chunk {ChunkIndex} / {ChunkCount} for guild {GuildId}", evt.ChunkIndex + 1,
evt.ChunkCount, evt.GuildID);
await memberCache.SetManyAsync(evt.GuildID, evt.Members);
if (evt.ChunkIndex == evt.ChunkCount - 1)
{
_logger.Debug("Final chunk for guild {GuildId} received, marking as cached", evt.GuildID);
await memberCache.MarkAsCachedAsync(evt.GuildID);
}
return Result.Success;
}
}

5
Catalogger.Backend/Bot/Responders/MessageCreateResponder.cs
View file

@ -1,16 +1,15 @@
using System.Text.RegularExpressions;
using App.Metrics;
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
using Catalogger.Backend.Database;
using Catalogger.Backend.Database.Models;
using Catalogger.Backend.Database.Queries;
using Catalogger.Backend.Extensions;
using Catalogger.Backend.Services;
using Humanizer;
using Remora.Discord.API;
using Remora.Discord.API.Abstractions.Gateway.Events;
using Remora.Discord.Gateway.Responders;
using Remora.Rest.Core;
using Remora.Results;
namespace Catalogger.Backend.Bot.Responders;
@ -20,7 +19,7 @@ public class MessageCreateResponder(
Config config,
DatabaseContext db,
MessageRepository messageRepository,
UserCacheService userCache,
UserCache userCache,
PkMessageHandler pkMessageHandler,
IMetrics metrics)
: IResponder<IMessageCreate>

5
Catalogger.Backend/Bot/Responders/MessageDeleteResponder.cs
View file

@ -1,4 +1,5 @@
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
using Catalogger.Backend.Database;
using Catalogger.Backend.Database.Queries;
using Catalogger.Backend.Extensions;
@ -22,8 +23,8 @@ public class MessageDeleteResponder(
DatabaseContext db,
MessageRepository messageRepository,
WebhookExecutorService webhookExecutor,
ChannelCacheService channelCache,
UserCacheService userCache,
ChannelCache channelCache,
UserCache userCache,
IClock clock,
PluralkitApiService pluralkitApi) : IResponder<IMessageDelete>
{

8
Catalogger.Backend/Bot/Responders/MessageUpdateResponder.cs
View file

@ -1,4 +1,5 @@
using Catalogger.Backend.Cache;
using Catalogger.Backend.Cache.InMemoryCache;
using Catalogger.Backend.Database;
using Catalogger.Backend.Database.Queries;
using Catalogger.Backend.Extensions;
@ -17,8 +18,8 @@ namespace Catalogger.Backend.Bot.Responders;
public class MessageUpdateResponder(
ILogger logger,
DatabaseContext db,
ChannelCacheService channelCache,
UserCacheService userCache,
ChannelCache channelCache,
UserCache userCache,
MessageRepository messageRepository,
WebhookExecutorService webhookExecutor,
PluralkitApiService pluralkitApi) : IResponder<IMessageUpdate>
@ -60,7 +61,8 @@ public class MessageUpdateResponder(
return Result.Success;
}
if (oldMessage.Content == msg.Content) return Result.Success;
if (oldMessage.Content == msg.Content ||
(oldMessage.Content == "None" && string.IsNullOrEmpty(msg.Content))) return Result.Success;
var user = msg.Author;
if (msg.Author.ID != oldMessage.UserId)