From be9ecd3f2a695cc504ec69254b3d2f54a7ae2db3 Mon Sep 17 00:00:00 2001
From: Arthur Likhner <60031799+likhner@users.noreply.github.com>
Date: Fri, 15 Jul 2022 23:23:23 +0300
Subject: [PATCH] 1.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Теперь при запросах ответ возвращается мгновенно
---
 Controllers/EditorController.cs                  |  8 ++++----
 Controllers/EditorControllerAdminRegion.cs       | 12 +++---------
 Controllers/EditorControllerPayloadProcessors.cs |  8 ++++----
 nng-bot.csproj                                   |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Controllers/EditorController.cs b/Controllers/EditorController.cs
index 923b9e6..acf3885 100644
--- a/Controllers/EditorController.cs
+++ b/Controllers/EditorController.cs
@@ -57,7 +57,7 @@ private string GetStartMenuKeyboard(long id)
         return IfUserIsAdmin(id) ? AdminStartButtons : StartButtons;
     }
 
-    private async Task DialogProcessor(long? peer, long? userId, Message message)
+    private void DialogProcessor(long? peer, long? userId, Message message)
     {
         if (peer == null || userId == null)
         {
@@ -152,7 +152,7 @@ private async Task DialogProcessor(long? peer, long? userId, Message message)
                 break;
 
             case PayloadTemplates.IveJoined:
-                await ProcessIveJoined(user);
+                ProcessIveJoined(user);
                 break;
 
             case PayloadTemplates.IveJoinedInFiftySubs:
@@ -227,7 +227,7 @@ private async Task DialogProcessor(long? peer, long? userId, Message message)
     }
 
     [HttpPost]
-    public async Task<IActionResult> Dialog([FromBody] VkEvent vkEvent)
+    public IActionResult Dialog([FromBody] VkEvent vkEvent)
     {
         if (!IsAllowed(vkEvent.GroupId, vkEvent.Secret)) return Ok("ok");
 
@@ -238,7 +238,7 @@ public async Task<IActionResult> Dialog([FromBody] VkEvent vkEvent)
             var message = Message.FromJson(new VkResponse(vkEvent.Object));
             Logger.LogInformation("message_new\n\tUser: {User}\n\tContent: «{Content}»",
                 message.FromId, message.Text);
-            await DialogProcessor(message.PeerId, message.FromId, message);
+            new Thread(() => DialogProcessor(message.PeerId, message.FromId, message)).Start();
         }
 
         return Ok("ok");
diff --git a/Controllers/EditorControllerAdminRegion.cs b/Controllers/EditorControllerAdminRegion.cs
index 52681dd..6203fd8 100644
--- a/Controllers/EditorControllerAdminRegion.cs
+++ b/Controllers/EditorControllerAdminRegion.cs
@@ -275,21 +275,15 @@ private void ProcessAdminUnbanRequestAccept(long user)
     private void ProcessUnbanUserInAllGroups(long admin, UnbanRequest request)
     {
         var data = CacheFramework.LoadCache().Data;
-        var userObject = new User
-        {
-            Id = request.UserId
-        };
+        var id = request.UserId;
         foreach (var cacheGroup in data)
         {
             var banned = VkFramework.GetBanned(cacheGroup.Id);
             if (banned.All(x => x.Id != request.UserId)) continue;
-            var group = new Group
-            {
-                Id = cacheGroup.Id
-            };
+            var group = cacheGroup.Id;
             try
             {
-                VkFramework.UnBlock(group, userObject);
+                VkFramework.UnBlock(group, id);
             }
             catch (VkApiException e)
             {
diff --git a/Controllers/EditorControllerPayloadProcessors.cs b/Controllers/EditorControllerPayloadProcessors.cs
index 5b5422d..8615d45 100644
--- a/Controllers/EditorControllerPayloadProcessors.cs
+++ b/Controllers/EditorControllerPayloadProcessors.cs
@@ -163,7 +163,7 @@ private void ProcessGiveEditor(long user)
         VkController.SendMessage(PhraseFramework.PleaseJoinGroup(group), IveJoinedButtons, user);
     }
 
-    private async Task ProcessIveJoined(long user)
+    private void ProcessIveJoined(long user)
     {
         var cachedGroups = CacheFramework.LoadCache();
         var priority = IfUserPrioritized(user);
@@ -237,14 +237,14 @@ private async Task ProcessIveJoined(long user)
             return;
         }
 
-        await Task.Delay(TimeSpan.FromSeconds(2));
+        Thread.Sleep(TimeSpan.FromSeconds(2));
 
         var data = VkController.GetGroupInfo(request.Group);
         if (!data.Members.Contains(request.User))
         {
             VkController.SendMessage(PhraseFramework.YouHaveNotJoinedClub,
                 IveJoinedButtons, user);
-            await Task.Delay(500);
+            Thread.Sleep(TimeSpan.FromMilliseconds(500));
             ReplaceLongToGroup(ref cachedGroups, request);
             CacheFramework.SaveCache(cachedGroups);
             return;
@@ -280,7 +280,7 @@ private async Task ProcessIveJoined(long user)
             return;
         }
 
-        await Task.Delay(1000);
+        Thread.Sleep(TimeSpan.FromSeconds(1));
         ReplaceLongToGroup(ref cachedGroups, request);
         if (priority) Status.AddLimitlessUserCoolDown(user);
         else Status.CoolDownUsers.Add(user);
diff --git a/nng-bot.csproj b/nng-bot.csproj
index d88c93d..f3ecc54 100644
--- a/nng-bot.csproj
+++ b/nng-bot.csproj
@@ -15,7 +15,7 @@
 
     <PropertyGroup>
         <PackageId>nng-bot</PackageId>
-        <PackageVersion>1.2.0</PackageVersion>
+        <PackageVersion>1.2.1</PackageVersion>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <Authors>likhner;RomanKochetov</Authors>
         <RepositoryUrl>https://github.com/MrAlonas/nng-bot.git</RepositoryUrl>