Added auto delete after x amount of time to the send chat message method

KfChatDotNetBot/ChatBot.cs

@@ -332,7 +332,16 @@ public class ChatBot
 
     // Reference for Sneedchat hardcoded length limit
     // https://github.com/jaw-sh/ruforo/blob/master/src/web/chat/connection.rs#L226
-    public async Task<SentMessageTrackerModel> SendChatMessageAsync(string message, bool bypassSeshDetect = false, LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.TruncateNicely, int lengthLimit = 1023)
+    /// <summary>
+    /// Async method for sending a chat message
+    /// </summary>
+    /// <param name="message">The message you wish to send</param>
+    /// <param name="bypassSeshDetect">Whether to bypass detecting if GambaSesh is present and send unconditionally</param>
+    /// <param name="lengthLimitBehavior">What behavior to use when encountering a message that exceeds the length limit</param>
+    /// <param name="lengthLimit">Length limit to enforce in bytes</param>
+    /// <param name="autoDeleteAfter">Length of time until the message is auto deleted, null to disable. Starts counting from when the message is echoed by Sneedchat</param>
+    /// <returns>An object you can use to check the status of the message and get its ID for editing/deleting later</returns>
+    public async Task<SentMessageTrackerModel> SendChatMessageAsync(string message, bool bypassSeshDetect = false, LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.TruncateNicely, int lengthLimit = 1023, TimeSpan? autoDeleteAfter = null)
     {
         var settings = await SettingsProvider
             .GetMultipleValuesAsync([
@@ -396,24 +405,53 @@ public class ChatBot
         _logger.Debug($"Message is {messageTracker.Message.Utf8LengthBytes()} bytes");
         SentMessages.Add(messageTracker);
         await KfClient.SendMessageInstantAsync(messageTracker.Message);
+        if (autoDeleteAfter != null)
+        {
+            _ = SendChatMessageAsyncAutoDeleteTask(messageTracker, autoDeleteAfter.Value);
+        }
         return messageTracker;
     }
 
-    public SentMessageTrackerModel SendChatMessage(string message, bool bypassSeshDetect = false,
+    private async Task SendChatMessageAsyncAutoDeleteTask(SentMessageTrackerModel message, TimeSpan deleteAfter)
-        LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.TruncateNicely, int lengthLimit = 1023)
     {
-        return SendChatMessageAsync(message, bypassSeshDetect, lengthLimitBehavior, lengthLimit).Result;
+        var i = 0;
+        while (message.ChatMessageId == null)
+        {
+            i++;
+            await Task.Delay(100, _cancellationToken);
+            if (message.Status is SentMessageTrackerStatus.NotSending or SentMessageTrackerStatus.Lost) return;
+            if (i <= 120) continue;
+            _logger.Error($"Gave up waiting for message with content '{message.Message}'");
+            return;
+        }
+
+        await Task.Delay(deleteAfter, _cancellationToken);
+        await KfClient.DeleteMessageAsync(message.ChatMessageId.Value);
+    }
+
+    /// <summary>
+    /// Non-async method which wraps the async method for sending a chat message
+    /// </summary>
+    /// <param name="message">The message you wish to send</param>
+    /// <param name="bypassSeshDetect">Whether to bypass detecting if GambaSesh is present and send unconditionally</param>
+    /// <param name="lengthLimitBehavior">What behavior to use when encountering a message that exceeds the length limit</param>
+    /// <param name="lengthLimit">Length limit to enforce in bytes</param>
+    /// <param name="autoDeleteAfter">Length of time until the message is auto deleted, null to disable. Starts counting from when the message is echoed by Sneedchat</param>
+    /// <returns>An object you can use to check the status of the message and get its ID for editing/deleting later</returns>
+    public SentMessageTrackerModel SendChatMessage(string message, bool bypassSeshDetect = false,
+        LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.TruncateNicely, int lengthLimit = 1023, TimeSpan? autoDeleteAfter = null)
+    {
+        return SendChatMessageAsync(message, bypassSeshDetect, lengthLimitBehavior, lengthLimit, autoDeleteAfter).Result;
     }
 
-    // If you feed this long ass messages they will be eaten, don't be retarded.
     public async Task<List<SentMessageTrackerModel>> SendChatMessagesAsync(List<string> messages,
-        bool bypassSeshDetect = false, LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.RefuseToSend)
+        bool bypassSeshDetect = false, LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.RefuseToSend, TimeSpan? autoDeleteAfter = null)
     {
         List<SentMessageTrackerModel> sentMessages = [];
 
         foreach (var message in messages)
         {
-            sentMessages.Add(await SendChatMessageAsync(message, bypassSeshDetect, lengthLimitBehavior));
+            sentMessages.Add(await SendChatMessageAsync(message, bypassSeshDetect, lengthLimitBehavior, autoDeleteAfter: autoDeleteAfter));
             // Delay sending each message, hopefully this will help the issue where messages come out of order
             await Task.Delay(TimeSpan.FromMilliseconds(100), _cancellationToken);
         }

KfChatDotNetBot/Commands/ImageCommands.cs

@@ -177,43 +177,18 @@ public class GetRandomImage : ICommand
         image.LastSeen = DateTimeOffset.UtcNow;
         db.Images.Update(image);
         await db.SaveChangesAsync(ctx);
-        var msg = await botInstance.SendChatMessageAsync($"[img]{image.Url}[/img]", true);
+        TimeSpan? timeToDeletion = null;
-        int timeToDeletionMsec;
-        
         if (key == "pigcube" && settings[BuiltIn.Keys.BotImagePigCubeSelfDestruct].ToBoolean())
         {
-            timeToDeletionMsec = image.Url == settings[BuiltIn.Keys.BotImageInvertedCubeUrl].Value
+            timeToDeletion = TimeSpan.FromMilliseconds(image.Url == settings[BuiltIn.Keys.BotImageInvertedCubeUrl].Value
                 ? settings[BuiltIn.Keys.BotImageInvertedPigCubeSelfDestructDelay].ToType<int>()
                 : new Random().Next(settings[BuiltIn.Keys.BotImagePigCubeSelfDestructMin].ToType<int>(),
-                    settings[BuiltIn.Keys.BotImagePigCubeSelfDestructMax].ToType<int>());
+                    settings[BuiltIn.Keys.BotImagePigCubeSelfDestructMax].ToType<int>()));
         }
         else if (key == "chink" && settings[BuiltIn.Keys.BotImageChinkSelfDestruct].ToBoolean())
         {
-            timeToDeletionMsec = settings[BuiltIn.Keys.BotImageChinkSelfDestructDelay].ToType<int>();
+            timeToDeletion = TimeSpan.FromMilliseconds(settings[BuiltIn.Keys.BotImageChinkSelfDestructDelay].ToType<int>());
         }
-        else
+        await botInstance.SendChatMessageAsync($"[img]{image.Url}[/img]", true, autoDeleteAfter: timeToDeletion);
-        {
-            return;
-        }
-        while (msg.Status is SentMessageTrackerStatus.WaitingForResponse or SentMessageTrackerStatus.ChatDisconnected)
-        {
-            await Task.Delay(500, ctx);
-        }
-
-        if (msg.Status is SentMessageTrackerStatus.Lost or SentMessageTrackerStatus.NotSending)
-        {
-            logger.Error("Image got lost");
-            return;
-        }
-
-        if (msg.ChatMessageId == null)
-        {
-            logger.Error($"Image chat message ID was null even though status was {msg.Status}");
-            return;
-        }
-
-        logger.Info($"Deleting image in {timeToDeletionMsec}ms");
-        await Task.Delay(timeToDeletionMsec, ctx);
-        await botInstance.KfClient.DeleteMessageAsync(msg.ChatMessageId.Value);
     }
 }

KfChatDotNetBot/Commands/JuiceCommand.cs

@@ -48,21 +48,16 @@ public class JuiceCommand : ICommand
         
         if (lastJuicer.Count == 0 || (lastJuicer[0].JuicedAt.AddSeconds(cooldown) - DateTimeOffset.UtcNow).TotalSeconds <= 0)
         {
-            var sentMsg = await botInstance.SendChatMessageAsync($"!juice {message.Author.Id} {amount}", true);
+            TimeSpan? autoDeleteAfter = null;
+            if (juicerSettings[BuiltIn.Keys.JuiceAutoDeleteMsgDelay].Value != null)
+            {
+                autoDeleteAfter =
+                    TimeSpan.FromSeconds(juicerSettings[BuiltIn.Keys.JuiceAutoDeleteMsgDelay].ToType<int>());
+            }
+            await botInstance.SendChatMessageAsync($"!juice {message.Author.Id} {amount}", true, autoDeleteAfter: autoDeleteAfter);
             await db.Juicers.AddAsync(new JuicerDbModel
                 { Amount = amount, User = user, JuicedAt = DateTimeOffset.UtcNow }, ctx);
             await db.SaveChangesAsync(ctx);
-            if (juicerSettings[BuiltIn.Keys.JuiceAutoDeleteMsgDelay].Value == null) return;
-            var delay = juicerSettings[BuiltIn.Keys.JuiceAutoDeleteMsgDelay].ToType<int>();
-            if (delay <= 0) return;
-            while (sentMsg.ChatMessageId == null)
-            {
-                if (sentMsg.Status is SentMessageTrackerStatus.Lost or SentMessageTrackerStatus.NotSending) return;
-                await Task.Delay(500, ctx);
-            }
-
-            await Task.Delay(delay, ctx);
-            await botInstance.KfClient.DeleteMessageAsync(sentMsg.ChatMessageId.Value);
             return;
         }
 

KfChatDotNetBot/Commands/TestCommands.cs

@@ -44,13 +44,13 @@ public class EditTestCommand : ICommand
         {
             i++;
             await Task.Delay(delay, ctx);
-            botInstance.KfClient.EditMessage(reference.ChatMessageId!.Value, $"{msg} {i}");
+            await botInstance.KfClient.EditMessageAsync(reference.ChatMessageId!.Value, $"{msg} {i}");
         }
 
         await Task.Delay(delay, ctx);
-        botInstance.KfClient.EditMessage(reference.ChatMessageId!.Value, "This message will self destruct in 1 second");
+        await botInstance.KfClient.EditMessageAsync(reference.ChatMessageId!.Value, "This message will self destruct in 1 second");
         await Task.Delay(delay, ctx);
-        botInstance.KfClient.DeleteMessage(reference.ChatMessageId!.Value);
+        await botInstance.KfClient.DeleteMessageAsync(reference.ChatMessageId!.Value);
     }
 }
 

KfChatDotNetBot/Services/BotCommands.cs

@@ -166,34 +166,16 @@ internal class BotCommands
         }
         _logger.Info($"Oldest entry: {oldestEntryExpires:o}");
         var timeRemaining = oldestEntryExpires - DateTimeOffset.UtcNow;
-        var message = await _bot.SendChatMessageAsync($"{user.FormatUsername()}, please wait {timeRemaining.Humanize(maxUnit: TimeUnit.Minute, minUnit: TimeUnit.Millisecond, precision: 2)} before attempting to run {commandName} again.", true);
+        TimeSpan? autoDeleteAfter = null;
-        if (options.Flags.HasFlag(RateLimitFlags.NoAutoDeleteCooldownResponse))
+        if (!options.Flags.HasFlag(RateLimitFlags.NoAutoDeleteCooldownResponse))
         {
-            _logger.Info("Not going to cleanup cooldown response");
+            autoDeleteAfter = TimeSpan.FromMilliseconds(
-            return;
+                (await SettingsProvider.GetValueAsync(BuiltIn.Keys.BotRateLimitCooldownAutoDeleteDelay)).ToType<int>());
-        }
-        var i = 0;
-        while (message.ChatMessageId == null)
-        {
-            i++;
-            await Task.Delay(250, _cancellationToken);
-            if (i > 30)
-            {
-                _logger.Error("Gave up waiting for Sneedchat to give us the message ID for removing a cooldown notification");
-                return;
         }
 
-            if (message.Status is SentMessageTrackerStatus.NotSending or SentMessageTrackerStatus.Lost)
+        await _bot.SendChatMessageAsync(
-            {
+            $"{user.FormatUsername()}, please wait {timeRemaining.Humanize(maxUnit: TimeUnit.Minute, minUnit: TimeUnit.Millisecond, precision: 2)} before attempting to run {commandName} again.",
-                _logger.Error("Cooldown message was suppressed or lost");
+            true, autoDeleteAfter: autoDeleteAfter);
-                return;
-            }
-        }
-
-        var autoDeleteInterval =
-            (await SettingsProvider.GetValueAsync(BuiltIn.Keys.BotRateLimitCooldownAutoDeleteDelay)).ToType<int>();
-        await Task.Delay(autoDeleteInterval, _cancellationToken);
-        await _bot.KfClient.DeleteMessageAsync(message.ChatMessageId.Value);
     }
 
     private async Task CleanupExpiredRateLimitEntriesTask()