From d45ae3f36a081b7756344107e26c0de9f3d3776b Mon Sep 17 00:00:00 2001 From: Ayrat Hudaygulov Date: Fri, 12 Jul 2024 09:18:37 +0100 Subject: [PATCH] fixed-datetime-and-delete (#26) fixed wrong datetime usage and removed delete messages on ban --- src/VahterBanBot/Bot.fs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/VahterBanBot/Bot.fs b/src/VahterBanBot/Bot.fs index 9233be8..48614dc 100644 --- a/src/VahterBanBot/Bot.fs +++ b/src/VahterBanBot/Bot.fs @@ -114,7 +114,7 @@ let softBanInChat (botClient: ITelegramBotClient) (chatId: ChatId) targetUserId CanPinMessages = false, CanManageTopics = false ) - let untilDate = DateTime.Now.AddHours duration + let untilDate = DateTime.UtcNow.AddHours duration try do! botClient.RestrictChatMemberAsync(chatId, targetUserId, permissions, Nullable(), untilDate) return Ok(chatId, targetUserId) @@ -203,7 +203,7 @@ let aggregateUnbanResultInLogMsg message targetUserId targetUsername = let softBanResultInLogMsg (message: Message) (duration: int) = let logMsgBuilder = StringBuilder() - let untilDate = (DateTime.Now.AddHours duration).ToString "u" + let untilDate = (DateTime.UtcNow.AddHours duration).ToString "u" %logMsgBuilder.Append $"Vahter {prependUsername message.From.Username}({message.From.Id}) " %logMsgBuilder.Append $"softbanned {prependUsername message.ReplyToMessage.From.Username}({message.ReplyToMessage.From.Id}) " %logMsgBuilder.Append $"in {prependUsername message.Chat.Username}({message.Chat.Id}) " @@ -286,8 +286,7 @@ let banOnReply |> Task.WhenAll |> taskIgnore - // delete recorded messages from DB - return! DB.deleteMsgs allUserMessages + return allUserMessages.Length } // try ban user in all monitored chats