From de93598e6f9ab6bf2682a69837f6e674fa81ed30 Mon Sep 17 00:00:00 2001
From: Florian Zevedei <florian.dahn@fdsoftware.de>
Date: Wed, 24 Jan 2024 21:55:54 +0100
Subject: [PATCH] Simplification of ActionManager and remove uncessary string
 storage

---
 .../ActionManager/ExternalActionManager.cs       | 16 +++-------------
 .../DemoBot/ActionManager/IExternalAction.cs     |  6 ++----
 .../DemoBot/CustomFormBaseMessageLoop.cs         | 10 ++--------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/ExternalActionManager.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/ExternalActionManager.cs
index 4f3f614..e50c2ea 100644
--- a/Experiments/ExternalActionManager/DemoBot/ActionManager/ExternalActionManager.cs
+++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/ExternalActionManager.cs
@@ -1,14 +1,4 @@
-using DemoBot.ActionManager.Actions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Args;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-using TelegramBotBase.Interfaces;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Base;
 
 namespace DemoBot.ActionManager
 {
@@ -22,7 +12,7 @@ namespace DemoBot.ActionManager
             actions.Add(action);
         }
 
-        public async Task<bool> ManageCall(UpdateResult ur, MessageResult mr, DeviceSession session)
+        public async Task<bool> ManageCall(UpdateResult ur, MessageResult mr)
         {
 
             foreach (var action in actions)
@@ -30,7 +20,7 @@ namespace DemoBot.ActionManager
                 if (!action.DoesFit(mr.RawData))
                     continue;
 
-                await action.DoAction(ur, mr, session);
+                await action.DoAction(mr.RawData, ur, mr);
 
                 return true;
             }
diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs
index ea0c954..eb670dc 100644
--- a/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs
+++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs
@@ -1,15 +1,13 @@
 using TelegramBotBase.Base;
-using TelegramBotBase.Interfaces;
-using TelegramBotBase.Sessions;
 
 namespace DemoBot.ActionManager
 {
 
     public interface IExternalAction
     {
-        bool DoesFit(string raw_action);
+        bool DoesFit(string raw_data);
 
-        Task DoAction(UpdateResult ur, MessageResult mr, DeviceSession session);
+        Task DoAction(String raw_data, UpdateResult ur, MessageResult mr);
     }
 
 }
diff --git a/Experiments/ExternalActionManager/DemoBot/CustomFormBaseMessageLoop.cs b/Experiments/ExternalActionManager/DemoBot/CustomFormBaseMessageLoop.cs
index 6bcdd3d..d3f9835 100644
--- a/Experiments/ExternalActionManager/DemoBot/CustomFormBaseMessageLoop.cs
+++ b/Experiments/ExternalActionManager/DemoBot/CustomFormBaseMessageLoop.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel;
 using DemoBot.ActionManager;
 using Telegram.Bot.Types.Enums;
 using TelegramBotBase;
@@ -26,7 +21,6 @@ namespace DemoBot
         {
             var update = ur.RawData;
 
-
             if (update.Type != UpdateType.Message
                 && update.Type != UpdateType.EditedMessage
                 && update.Type != UpdateType.CallbackQuery)
@@ -96,7 +90,7 @@ namespace DemoBot
 
                 if (!mr.Handled)
                 {
-                    var handled = await ExternalActionManager?.ManageCall(ur, mr, session);
+                    var handled = await ExternalActionManager?.ManageCall(ur, mr);
 
                     if (handled)
                     {