From bbcdfff2b9e7cea0d4745ad28a80cb85dec9b895 Mon Sep 17 00:00:00 2001
From: Andriy <30056636+West14@users.noreply.github.com>
Date: Mon, 23 Jan 2023 13:12:38 +0200
Subject: [PATCH] [core] move message auto-delete service from code-watcher to
 core

---
 .../CodeWatcher => Core/AutoDelete}/DeleteRequest.cs   |  5 +++--
 .../CodeWatcher => Core/AutoDelete}/DeleteService.cs   |  7 +++++--
 Core/Startup.cs                                        |  6 ++++++
 modules/CodeWatcher/CodeWatcher.cs                     | 10 +---------
 modules/CodeWatcher/Handler.cs                         |  1 +
 5 files changed, 16 insertions(+), 13 deletions(-)
 rename {modules/CodeWatcher => Core/AutoDelete}/DeleteRequest.cs (63%)
 rename {modules/CodeWatcher => Core/AutoDelete}/DeleteService.cs (91%)

diff --git a/modules/CodeWatcher/DeleteRequest.cs b/Core/AutoDelete/DeleteRequest.cs
similarity index 63%
rename from modules/CodeWatcher/DeleteRequest.cs
rename to Core/AutoDelete/DeleteRequest.cs
index 6f6c82b..5fec51d 100644
--- a/modules/CodeWatcher/DeleteRequest.cs
+++ b/Core/AutoDelete/DeleteRequest.cs
@@ -1,6 +1,7 @@
-using Telegram.Bot.Types;
+using System;
+using Telegram.Bot.Types;
 
-namespace West.TelegramBot.CodeWatcher;
+namespace Kruzya.TelegramBot.Core.AutoDelete;
 
 public class DeleteRequest
 {
diff --git a/modules/CodeWatcher/DeleteService.cs b/Core/AutoDelete/DeleteService.cs
similarity index 91%
rename from modules/CodeWatcher/DeleteService.cs
rename to Core/AutoDelete/DeleteService.cs
index 42a0a4c..bc15fbe 100644
--- a/modules/CodeWatcher/DeleteService.cs
+++ b/Core/AutoDelete/DeleteService.cs
@@ -1,11 +1,14 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using BotFramework.Abstractions;
 using Kruzya.TelegramBot.Core.Service;
 using Microsoft.Extensions.Logging;
 using Telegram.Bot;
 using Telegram.Bot.Exceptions;
 
-namespace West.TelegramBot.CodeWatcher;
+namespace Kruzya.TelegramBot.Core.AutoDelete;
 
 public class DeleteService : AbstractTimedHostedService
 {
diff --git a/Core/Startup.cs b/Core/Startup.cs
index f0507c0..b5e18f4 100644
--- a/Core/Startup.cs
+++ b/Core/Startup.cs
@@ -1,4 +1,5 @@
 using BotFramework;
+using Kruzya.TelegramBot.Core.AutoDelete;
 using Kruzya.TelegramBot.Core.Cache;
 using Kruzya.TelegramBot.Core.Data;
 using Kruzya.TelegramBot.Core.Extensions;
@@ -9,6 +10,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using System.Collections.Concurrent;
 using Telegram.Bot.Types;
 
 namespace Kruzya.TelegramBot.Core
@@ -47,6 +49,10 @@ namespace Kruzya.TelegramBot.Core
 
             services.AddSingleton<ThreadSafeRandom>();
 
+
+            services.AddSingleton<ConcurrentBag<DeleteRequest>>();
+            services.AddHostedService<DeleteService>();
+
             // Trigger module handlers.
             _core.Modules.ConfigureServices(services);
         }
diff --git a/modules/CodeWatcher/CodeWatcher.cs b/modules/CodeWatcher/CodeWatcher.cs
index d759347..0dfe046 100644
--- a/modules/CodeWatcher/CodeWatcher.cs
+++ b/modules/CodeWatcher/CodeWatcher.cs
@@ -1,17 +1,9 @@
-using System.Collections.Concurrent;
-using Kruzya.TelegramBot.Core;
-using Microsoft.Extensions.DependencyInjection;
+using Kruzya.TelegramBot.Core;
 
 namespace West.TelegramBot.CodeWatcher
 {
     public class CodeWatcher : Module
     {
         public CodeWatcher(Core core) : base(core) {}
-
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services.AddSingleton<ConcurrentBag<DeleteRequest>>();
-            services.AddHostedService<DeleteService>();
-        }
     }
 }
\ No newline at end of file
diff --git a/modules/CodeWatcher/Handler.cs b/modules/CodeWatcher/Handler.cs
index c73bff3..b4ea6f2 100644
--- a/modules/CodeWatcher/Handler.cs
+++ b/modules/CodeWatcher/Handler.cs
@@ -2,6 +2,7 @@
 using BotFramework;
 using BotFramework.Attributes;
 using BotFramework.Enums;
+using Kruzya.TelegramBot.Core.AutoDelete;
 using Kruzya.TelegramBot.Core.Extensions;
 using Telegram.Bot;
 using Telegram.Bot.Types;