Fix ending support session

Author: pietrodicaprio

Unifiedban.Terminal/Bot/Functions.cs

@@ -529,40 +529,45 @@ public static void CacheUsername(Message message)
 
         public static void UserLeftAction(Message message)
         {
-            if (Utils.BotTools.IsUserOperator(message.LeftChatMember.Id))
+            if (message.LeftChatMember == null) return;
+            ChatTools.RemoveChatAdmin(message.Chat.Id, message.LeftChatMember.Id);
+            if (!BotTools.IsUserOperator(message.LeftChatMember.Id)) return;
+            if (CacheData.ActiveSupport
+                .Contains(message.Chat.Id)) return;
+            
+            if (CacheData.CurrentChatOperators.ContainsKey(message.Chat.Id))
             {
-                if (!CacheData.ActiveSupport
-                    .Contains(message.Chat.Id))
-                {
-                    CacheData.ActiveSupport.Remove(message.Chat.Id);
-                    CacheData.CurrentChatOperators.Remove(message.Chat.Id);
-
-                    Manager.BotClient.SendTextMessageAsync(
-                        chatId: message.Chat.Id,
-                        parseMode: ParseMode.Markdown,
-                        text: String.Format(
-                            "Support session *{0}* ended since operator left the chat.",
-                            message.LeftChatMember.Username)
-                    );
-                    MessageQueueManager.EnqueueLog(new ChatMessage()
-                    {
-                        ParseMode = ParseMode.Markdown,
-                        Text = String.Format(
-                            "*[Log]*" +
-                            "Support session ended since operator *{0}* left the chat." +
-                            "\nChatId: `{1}`" +
-                            "\nChat: `{2}`" +
-                            "\nUserId: `{3}`" +
-                            "\n\n*hash_code:* #UB{4}-{5}",
-                            message.LeftChatMember.Username,
-                            message.Chat.Id,
-                            message.Chat.Title,
-                            message.LeftChatMember.Id,
-                            message.Chat.Id.ToString().Replace("-", ""),
-                            Guid.NewGuid())
-                    });
-                }
+                CacheData.CurrentChatOperators[message.Chat.Id].Remove(message.LeftChatMember.Id);
             }
+
+            if (CacheData.CurrentChatOperators[message.Chat.Id].Count > 0) return;
+                    
+            CacheData.CurrentChatOperators.Remove(message.Chat.Id);
+            CacheData.ActiveSupport.Remove(message.Chat.Id);
+
+            Manager.BotClient.SendTextMessageAsync(
+                chatId: message.Chat.Id,
+                parseMode: ParseMode.Markdown,
+                text: $"Support session ended since " +
+                      $"operator *{message.LeftChatMember.Username}* left the chat."
+            );
+            MessageQueueManager.EnqueueLog(new ChatMessage()
+            {
+                ParseMode = ParseMode.Markdown,
+                Text = string.Format(
+                    "*[Log]*" +
+                    "Support session ended since operator *{0}* left the chat." +
+                    "\nChatId: `{1}`" +
+                    "\nChat: `{2}`" +
+                    "\nUserId: `{3}`" +
+                    "\n\n*hash_code:* #UB{4}-{5}",
+                    message.LeftChatMember.Username,
+                    message.Chat.Id,
+                    message.Chat.Title,
+                    message.LeftChatMember.Id,
+                    message.Chat.Id.ToString().Replace("-", ""),
+                    Guid.NewGuid())
+            });
         }
 
         private static void EnableDashboardForOwnerAndAdder(Chat chat)

Unifiedban.Terminal/Unifiedban.Terminal.csproj

@@ -3,14 +3,14 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>3.13.10</Version>
+    <Version>3.13.11</Version>
     <Authors>fabricators</Authors>
     <Product>Unifiedban Terminal</Product>
     <Copyright>Fabricators 2022</Copyright>
     <RepositoryUrl>https://github.com/unified-ban/Terminal</RepositoryUrl>
     <RepositoryType>GIT</RepositoryType>
-    <AssemblyVersion>3.13.10</AssemblyVersion>
-    <FileVersion>3.13.10.1</FileVersion>
+    <AssemblyVersion>3.13.11</AssemblyVersion>
+    <FileVersion>3.13.11.1</FileVersion>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>