diff --git a/KfChatDotNetBot/ChatBot.cs b/KfChatDotNetBot/ChatBot.cs index 03cbedd..64c2844 100644 --- a/KfChatDotNetBot/ChatBot.cs +++ b/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 SendChatMessageAsync(string message, bool bypassSeshDetect = false, LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.TruncateNicely, int lengthLimit = 1023) + /// + /// Async method for sending a chat message + /// + /// The message you wish to send + /// Whether to bypass detecting if GambaSesh is present and send unconditionally + /// What behavior to use when encountering a message that exceeds the length limit + /// Length limit to enforce in bytes + /// Length of time until the message is auto deleted, null to disable. Starts counting from when the message is echoed by Sneedchat + /// An object you can use to check the status of the message and get its ID for editing/deleting later + public async Task 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, - LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.TruncateNicely, int lengthLimit = 1023) + private async Task SendChatMessageAsyncAutoDeleteTask(SentMessageTrackerModel message, TimeSpan deleteAfter) { - 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); + } + + /// + /// Non-async method which wraps the async method for sending a chat message + /// + /// The message you wish to send + /// Whether to bypass detecting if GambaSesh is present and send unconditionally + /// What behavior to use when encountering a message that exceeds the length limit + /// Length limit to enforce in bytes + /// Length of time until the message is auto deleted, null to disable. Starts counting from when the message is echoed by Sneedchat + /// An object you can use to check the status of the message and get its ID for editing/deleting later + 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> SendChatMessagesAsync(List messages, - bool bypassSeshDetect = false, LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.RefuseToSend) + bool bypassSeshDetect = false, LengthLimitBehavior lengthLimitBehavior = LengthLimitBehavior.RefuseToSend, TimeSpan? autoDeleteAfter = null) { List 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); } diff --git a/KfChatDotNetBot/Commands/ImageCommands.cs b/KfChatDotNetBot/Commands/ImageCommands.cs index 3070689..fd44164 100644 --- a/KfChatDotNetBot/Commands/ImageCommands.cs +++ b/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); - int timeToDeletionMsec; - + TimeSpan? timeToDeletion = null; 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() : new Random().Next(settings[BuiltIn.Keys.BotImagePigCubeSelfDestructMin].ToType(), - settings[BuiltIn.Keys.BotImagePigCubeSelfDestructMax].ToType()); + settings[BuiltIn.Keys.BotImagePigCubeSelfDestructMax].ToType())); } else if (key == "chink" && settings[BuiltIn.Keys.BotImageChinkSelfDestruct].ToBoolean()) { - timeToDeletionMsec = settings[BuiltIn.Keys.BotImageChinkSelfDestructDelay].ToType(); + timeToDeletion = TimeSpan.FromMilliseconds(settings[BuiltIn.Keys.BotImageChinkSelfDestructDelay].ToType()); } - else - { - 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); + await botInstance.SendChatMessageAsync($"[img]{image.Url}[/img]", true, autoDeleteAfter: timeToDeletion); } } \ No newline at end of file diff --git a/KfChatDotNetBot/Commands/JuiceCommand.cs b/KfChatDotNetBot/Commands/JuiceCommand.cs index 36bf7c6..af8e84e 100644 --- a/KfChatDotNetBot/Commands/JuiceCommand.cs +++ b/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()); + } + 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(); - 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; } diff --git a/KfChatDotNetBot/Commands/TestCommands.cs b/KfChatDotNetBot/Commands/TestCommands.cs index 92af1ad..28ca67b 100644 --- a/KfChatDotNetBot/Commands/TestCommands.cs +++ b/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); } } diff --git a/KfChatDotNetBot/Services/BotCommands.cs b/KfChatDotNetBot/Services/BotCommands.cs index efe5f81..aa8e310 100644 --- a/KfChatDotNetBot/Services/BotCommands.cs +++ b/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); - if (options.Flags.HasFlag(RateLimitFlags.NoAutoDeleteCooldownResponse)) + TimeSpan? autoDeleteAfter = null; + if (!options.Flags.HasFlag(RateLimitFlags.NoAutoDeleteCooldownResponse)) { - _logger.Info("Not going to cleanup cooldown response"); - return; - } - 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) - { - _logger.Error("Cooldown message was suppressed or lost"); - return; - } + autoDeleteAfter = TimeSpan.FromMilliseconds( + (await SettingsProvider.GetValueAsync(BuiltIn.Keys.BotRateLimitCooldownAutoDeleteDelay)).ToType()); } - var autoDeleteInterval = - (await SettingsProvider.GetValueAsync(BuiltIn.Keys.BotRateLimitCooldownAutoDeleteDelay)).ToType(); - await Task.Delay(autoDeleteInterval, _cancellationToken); - await _bot.KfClient.DeleteMessageAsync(message.ChatMessageId.Value); + await _bot.SendChatMessageAsync( + $"{user.FormatUsername()}, please wait {timeRemaining.Humanize(maxUnit: TimeUnit.Minute, minUnit: TimeUnit.Millisecond, precision: 2)} before attempting to run {commandName} again.", + true, autoDeleteAfter: autoDeleteAfter); } private async Task CleanupExpiredRateLimitEntriesTask()