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

fix: clean up some responders and commands

Browse source
This commit is contained in:
sam 2024-09-02 15:06:10 +02:00
parent 9e0e53a428
commit 6e45b0f5b5
Signed by: sam
GPG key ID: 5F3C3C1B3166639D
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,9 +39,7 @@ public class ChannelCommands(
[DiscordDefaultMemberPermissions(DiscordPermission.ManageGuild)]
public async Task<IResult> ConfigureChannelsAsync()
{
if (contextInjection.Context is not IInteractionCommandContext ctx) throw new CataloggerError("No context");
if (!ctx.TryGetUserID(out var userId)) throw new CataloggerError("No user ID in context");
if (!ctx.TryGetGuildID(out var guildId)) throw new CataloggerError("No guild ID in context");
var (userId, guildId) = contextInjection.GetUserAndGuild();
if (!guildCache.TryGet(guildId, out var guild)) throw new CataloggerError("Guild not in cache");
var guildChannels = channelCache.GuildChannels(guildId).ToList();
var guildConfig = await db.GetGuildAsync(guildId);

3
Catalogger.Backend/Bot/Responders/Messages/MessageDeleteResponder.cs
View file

@ -66,9 +66,8 @@ public class MessageDeleteResponder(
// Check if the message is an edit trigger message.
// If it is, the API will return a valid message for its ID, but the ID won't match either `Id` or `Original`.
// (We also won't have any system/member information stored for it)
if (msg is { System: null, Member: null } && MaybePkProxyTrigger(ev.ID) && false)
if (msg is { System: null, Member: null } && MaybePkProxyTrigger(ev.ID))
{
// TODO: remove the "false" if/when the API is updated to actually return this :neofox_woozy:
var pkMsg = await pluralkitApi.GetPluralKitMessageAsync(ev.ID.Value, ct);
if (pkMsg != null && pkMsg.Id != ev.ID.Value && pkMsg.Original != ev.ID.Value)
{

6
Catalogger.Backend/Bot/Responders/ReadyResponder.cs
View file

@ -6,7 +6,7 @@ using Remora.Results;
namespace Catalogger.Backend.Bot.Responders;
public class ReadyResponder(ILogger logger, WebhookExecutorService webhookExecutorService, Config config)
public class ReadyResponder(ILogger logger, WebhookExecutorService webhookExecutorService)
: IResponder<IReady>
{
private readonly ILogger _logger = logger.ForContext<ReadyResponder>();
@ -17,10 +17,6 @@ public class ReadyResponder(ILogger logger, WebhookExecutorService webhookExecut
_logger.Information("Ready as {User} on shard {ShardId} / {ShardCount}", gatewayEvent.User.Tag(), shardId.Item1,
shardId.Item2);
if (shardId.Item1 == 0) webhookExecutorService.SetSelfUser(gatewayEvent.User);
// Sanity check
var appId = gatewayEvent.Application.ID.ToUlong();
_logger.Debug("Application ID is {ApplicationId}, is same as config? {SameAsConfig}", appId,
appId == config.Discord.ApplicationId);
return Task.FromResult(Result.Success);
}