Update deps; Add message edit and reaction add to the activity tracker

Author: OoLunar

libs/DSharpPlus

@@ -6,7 +6,6 @@
 using DSharpPlus.Commands;
 using DSharpPlus.Commands.ContextChecks;
 using DSharpPlus.Commands.Trees;
-using DSharpPlus.Commands.Trees.Attributes;
 using DSharpPlus.Entities;
 
 namespace NotifierRedirecter.Commands;

src/Commands/BlockCommand.cs

@@ -6,9 +6,8 @@
 using System.Threading.Tasks;
 using DSharpPlus;
 using DSharpPlus.Commands;
-using DSharpPlus.Commands.Processors.TextCommands.Attributes;
+using DSharpPlus.Commands.ArgumentModifiers;
 using DSharpPlus.Commands.Trees;
-using DSharpPlus.Commands.Trees.Attributes;
 using DSharpPlus.Entities;
 
 namespace NotifierRedirecter.Commands;

src/Commands/HelpCommand.cs

@@ -6,7 +6,6 @@
 using DSharpPlus.Commands;
 using DSharpPlus.Commands.ContextChecks;
 using DSharpPlus.Commands.Trees;
-using DSharpPlus.Commands.Trees.Attributes;
 using DSharpPlus.Entities;
 
 namespace NotifierRedirecter.Commands;

src/Commands/IgnoreCommand.cs

@@ -2,11 +2,9 @@
 using System.ComponentModel;
 using System.Text;
 using System.Threading.Tasks;
-using DSharpPlus;
 using DSharpPlus.Commands;
 using DSharpPlus.Commands.ContextChecks;
 using DSharpPlus.Commands.Trees;
-using DSharpPlus.Commands.Trees.Attributes;
 using DSharpPlus.Entities;
 
 namespace NotifierRedirecter.Commands;
@@ -18,7 +16,7 @@ public sealed class RedirectCommand
     public RedirectCommand(Database database) => this._database = database;
 
     [Command("add"), Description("Start redirecting pings from this channel into user's DMs.")]
-    [RequirePermissions(Permissions.None, Permissions.ManageMessages)]
+    [RequirePermissions(DiscordPermissions.None, DiscordPermissions.ManageMessages)]
     public ValueTask AddAsync(CommandContext context, [Description("Which channel to start listening for pings.")] DiscordChannel channel)
     {
         if (this._database.IsRedirect(channel.Id))
@@ -31,7 +29,7 @@ public sealed class RedirectCommand
     }
 
     [Command("remove"), Description("Stop redirecting notifications from this channel into user's DMs.")]
-    [RequirePermissions(Permissions.None, Permissions.ManageMessages)]
+    [RequirePermissions(DiscordPermissions.None, DiscordPermissions.ManageMessages)]
     public ValueTask RemoveAsync(CommandContext context, [Description("Which channel to stop listening for pings.")] DiscordChannel channel)
     {
         if (!this._database.IsRedirect(channel.Id))

src/Commands/RedirectCommand.cs

@@ -21,6 +21,6 @@ public Task ExecuteAsync(DiscordClient client, GuildDownloadCompletedEventArgs e
         }
 
         this._logger.LogInformation("{GuildCount:N0} guilds are ready to go!", eventArgs.Guilds.Count);
-        return client.UpdateStatusAsync(new DiscordActivity("Messing around with your notifications...", ActivityType.Custom));
+        return client.UpdateStatusAsync(new DiscordActivity("Messing around with your notifications...", DiscordActivityType.Custom));
     }
 }

src/Events/Handlers/GuildDownloadCompletedEventHandler.cs

@@ -11,24 +11,31 @@
 
 namespace NotifierRedirecter.Events.Handlers;
 
-public sealed partial class MessageCreatedEventHandler
+public sealed partial class MessagesEventHandler
 {
-    private readonly ILogger<MessageCreatedEventHandler> _logger;
+    private readonly ILogger<MessagesEventHandler> _logger;
     private readonly UserActivityTracker _userActivityTracker;
     private readonly Database _database;
 
-    public MessageCreatedEventHandler(UserActivityTracker userActivityTracker, Database database, ILogger<MessageCreatedEventHandler>? logger = null)
+    public MessagesEventHandler(UserActivityTracker userActivityTracker, Database database, ILogger<MessagesEventHandler>? logger = null)
     {
         this._userActivityTracker = userActivityTracker ?? throw new ArgumentNullException(nameof(userActivityTracker));
         this._database = database ?? throw new ArgumentNullException(nameof(database));
-        this._logger = logger ?? NullLogger<MessageCreatedEventHandler>.Instance;
+        this._logger = logger ?? NullLogger<MessagesEventHandler>.Instance;
+    }
+
+    [DiscordEvent(DiscordIntents.GuildMessages)]
+    public Task ExecuteAsync(DiscordClient _, MessageUpdateEventArgs eventArgs)
+    {
+        this._userActivityTracker.UpdateUser(eventArgs.Author.Id, eventArgs.Channel.Id);
+        return Task.CompletedTask;
     }
 
     [DiscordEvent(DiscordIntents.GuildMessages | DiscordIntents.MessageContents)]
     public async Task ExecuteAsync(DiscordClient _, MessageCreateEventArgs eventArgs)
     {
         this._userActivityTracker.UpdateUser(eventArgs.Author.Id, eventArgs.Channel.Id);
-        bool shouldSilence = eventArgs.Message.Flags?.HasFlag(MessageFlags.SuppressNotifications) ?? false;
+        bool shouldSilence = eventArgs.Message.Flags?.HasFlag(DiscordMessageFlags.SuppressNotifications) ?? false;
 
         // Ensure the channel is a redirect channel
         if (eventArgs.Message.Channel is null || !this._database.IsRedirect(eventArgs.Message.Channel.Id))

src/Events/Handlers/MessageCreatedEventHandler.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Threading.Tasks;
+using DSharpPlus;
+using DSharpPlus.EventArgs;
+
+namespace NotifierRedirecter.Events.Handlers;
+
+public sealed class ReactionsEventHandler
+{
+    private readonly UserActivityTracker _userActivityTracker;
+    public ReactionsEventHandler(UserActivityTracker userActivityTracker) => this._userActivityTracker = userActivityTracker ?? throw new ArgumentNullException(nameof(userActivityTracker));
+
+    [DiscordEvent(DiscordIntents.GuildMessageReactions)]
+    public Task ExecuteAsync(DiscordClient _, MessageReactionAddEventArgs eventArgs)
+    {
+        this._userActivityTracker.UpdateUser(eventArgs.User.Id, eventArgs.Channel.Id);
+        return Task.CompletedTask;
+    }
+}

src/Events/Handlers/ReactionsEventHandler.cs

@@ -16,16 +16,18 @@ public sealed class UserActivityTracker
     private readonly ConcurrentDictionary<ulong, (ulong ChannelId, DateTimeOffset LastActivity)> _tracker = new();
 
     public UserActivityTracker() => _ = this.CleanupInactiveUsersAsync();
+
     public void UpdateUser(ulong userId, ulong channelId) => this._tracker.AddOrUpdate(userId, (channelId, DateTimeOffset.UtcNow), (_, _) => (channelId, DateTimeOffset.UtcNow));
+
     public async ValueTask<bool> IsActiveAsync(ulong userId, ulong channelId)
     {
-        // Wait 5 seconds to see if the user does anything in the channnel.
+        // Wait X seconds to see if the user does anything in the channnel.
         // If they do, the _tracker will be updated and we can avoid a DM.
         await Task.Delay(_activityTimeout);
         return this._tracker.TryGetValue(userId, out (ulong ChannelId, DateTimeOffset LastActivity) value) && value.ChannelId == channelId && value.LastActivity > DateTimeOffset.UtcNow.AddSeconds(-15);
     }
 
-    public async Task CleanupInactiveUsersAsync()
+    private async Task CleanupInactiveUsersAsync()
     {
         PeriodicTimer timer = new(_cleanupInterval);
         while (await timer.WaitForNextTickAsync())