added msg cleanup

src/VahterBanBot/Bot.fs

@@ -132,7 +132,7 @@ let onUpdate
         let banUserInDb =
             message.ReplyToMessage.From
             |> DbUser.newUser
-            |> DbUser.banUser message.From.Id (Option.ofObj message.Text)
+            |> DbUser.banUser message.From.Id (Option.ofObj message.ReplyToMessage.Text)
             |> DB.upsertUser
 
         let deletedUserMessagesTask = task {

src/VahterBanBot/Cleanup.fs

@@ -0,0 +1,48 @@
+module VahterBanBot.Cleanup
+
+open System.Threading.Tasks
+open Microsoft.Extensions.Logging
+open Telegram.Bot
+open Telegram.Bot.Types
+open VahterBanBot.Types
+open VahterBanBot.Utils
+open System
+open System.Threading
+open Microsoft.Extensions.Hosting
+
+type CleanupService(
+    logger: ILogger<CleanupService>,
+    telegramClient: ITelegramBotClient,
+    botConf: BotConfiguration
+) =
+    let cleanupInterval =
+        getEnvOr "MESSAGES_CLEANUP_INTERVAL_SEC" "86400" // 1 day
+        |> int
+        |> TimeSpan.FromSeconds
+    let cleanupOldLimit =
+        getEnvOr "MESSAGES_CLEANUP_OLD_LIMIT_SEC" "259200" // 3 days
+        |> int
+        |> TimeSpan.FromSeconds
+    let mutable timer: Timer = null
+
+    let cleanup _ = task {
+        let! cleanupMsgs = DB.cleanupOldMessages cleanupOldLimit
+
+        let msg = $"Cleaned up {cleanupMsgs} messages"
+
+        let! _ = telegramClient.SendTextMessageAsync(
+            ChatId(botConf.LogsChannelId),
+            msg
+        )
+        logger.LogInformation msg
+    }
+
+    interface IHostedService with
+        member this.StartAsync(cancellationToken) =
+            timer <- new Timer(TimerCallback(cleanup >> ignore), null, TimeSpan.Zero, cleanupInterval)
+            Task.CompletedTask
+
+        member this.StopAsync(cancellationToken) =
+            match timer with
+            | null -> Task.CompletedTask
+            | timer -> timer.DisposeAsync().AsTask()

src/VahterBanBot/DB.fs

@@ -1,5 +1,6 @@
 module VahterBanBot.DB
 
+open System
 open System.Threading.Tasks
 open Npgsql
 open VahterBanBot.Types
@@ -122,3 +123,19 @@ let deleteUserMessages (userId: int64): Task<int> =
             )
         return messagesDeleted
     }
+
+let cleanupOldMessages (howOld: TimeSpan): Task<int> =
+    task {
+        use conn = new NpgsqlConnection(connString)
+
+        //language=postgresql
+        let sql = "DELETE FROM message WHERE created_at < @thatOld"
+
+        let! messagesDeleted =
+            conn.ExecuteAsync(
+                sql,
+                {| thatOld = DateTime.UtcNow.Subtract howOld |}
+            )
+
+        return messagesDeleted
+    }

src/VahterBanBot/Program.fs

@@ -8,7 +8,7 @@ open Telegram.Bot
 open Telegram.Bot.Types
 open Giraffe
 open Microsoft.Extensions.DependencyInjection
-open VahterBanBot
+open VahterBanBot.Cleanup
 open VahterBanBot.Utils
 open VahterBanBot.Bot
 open VahterBanBot.Types
@@ -38,6 +38,7 @@ let builder = WebApplication.CreateBuilder()
 %builder.Services
     .AddSingleton(botConf)
     .AddGiraffe()
+    .AddHostedService<CleanupService>()
     .AddHttpClient("telegram_bot_client")
     .AddTypedClient(fun httpClient sp ->
         let options = TelegramBotClientOptions(botConf.BotToken)

src/VahterBanBot/VahterBanBot.fsproj

@@ -10,6 +10,7 @@
     <Compile Include="Types.fs" />
     <Compile Include="DB.fs" />
     <Compile Include="Bot.fs" />
+    <Compile Include="Cleanup.fs" />
     <Compile Include="Program.fs" />
   </ItemGroup>