From 952e0cb9790bb762797921dbcdb832129d575f13 Mon Sep 17 00:00:00 2001 From: Florian Zevedei Date: Wed, 24 Jan 2024 22:10:43 +0100 Subject: [PATCH] Simplifications --- .../DemoBot/ActionManager/Actions/EndsWithAction.cs | 2 +- .../DemoBot/ActionManager/Actions/GuidAction.cs | 4 ++-- .../DemoBot/ActionManager/Actions/StartWithAction.cs | 2 +- .../DemoBot/ActionManager/IExternalAction.cs | 2 +- .../ActionManager/Navigation/EndsWithNavigation.cs | 12 ++++++------ .../ActionManager/Navigation/GuidNavigation.cs | 4 ++-- .../ActionManager/Navigation/StartWithNavigation.cs | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/EndsWithAction.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/EndsWithAction.cs index ffd5f6c..d466955 100644 --- a/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/EndsWithAction.cs +++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/EndsWithAction.cs @@ -22,7 +22,7 @@ namespace DemoBot.ActionManager.Actions public bool DoesFit(string raw_data) => raw_data.EndsWith(SearchForString); - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) => await Action(raw_data, ur, mr); + public async Task DoAction(UpdateResult ur, MessageResult mr) => await Action(mr.RawData, ur, mr); } diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/GuidAction.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/GuidAction.cs index 54c7a7f..28519c2 100644 --- a/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/GuidAction.cs +++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/GuidAction.cs @@ -36,7 +36,7 @@ namespace DemoBot.ActionManager.Actions } - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) => await Action(_lastValue.Value, ur, mr); + public async Task DoAction(UpdateResult ur, MessageResult mr) => await Action(_lastValue.Value, ur, mr); public static CallbackData GetCallback(string method, Guid guid) => new CallbackData(method, guid.ToString()); @@ -76,7 +76,7 @@ namespace DemoBot.ActionManager.Actions } - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) => await Action(_lastValue.Value, ur, mr); + public async Task DoAction(UpdateResult ur, MessageResult mr) => await Action(_lastValue.Value, ur, mr); public static CallbackData GetCallback(string method, Guid guid) => new CallbackData(method, guid.ToString()); diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/StartWithAction.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/StartWithAction.cs index 1af6e44..7f482c8 100644 --- a/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/StartWithAction.cs +++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/Actions/StartWithAction.cs @@ -22,7 +22,7 @@ namespace DemoBot.ActionManager.Actions public bool DoesFit(string raw_data) => raw_data.StartsWith(SearchForString); - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) => await Action(raw_data, ur, mr); + public async Task DoAction(UpdateResult ur, MessageResult mr) => await Action(mr.RawData, ur, mr); } diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs index eb670dc..389f82a 100644 --- a/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs +++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/IExternalAction.cs @@ -7,7 +7,7 @@ namespace DemoBot.ActionManager { bool DoesFit(string raw_data); - Task DoAction(String raw_data, UpdateResult ur, MessageResult mr); + Task DoAction(UpdateResult ur, MessageResult mr); } } diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/EndsWithNavigation.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/EndsWithNavigation.cs index a68aa2b..bb0d2ec 100644 --- a/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/EndsWithNavigation.cs +++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/EndsWithNavigation.cs @@ -23,15 +23,15 @@ namespace DemoBot.ActionManager.Navigation public bool DoesFit(string raw_data) => raw_data.EndsWith(Value); - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) + public async Task DoAction(UpdateResult ur, MessageResult mr) { await mr.ConfirmAction(); var new_form = FormType.GetConstructor(new Type[] { })?.Invoke(new object[] { }) as FormBase; - if (raw_data != null) + if (mr.RawData != null) { - SetProperty(new_form, raw_data); + SetProperty(new_form, mr.RawData); } await ur.Device.ActiveForm.NavigateTo(new_form); @@ -55,7 +55,7 @@ namespace DemoBot.ActionManager.Navigation public bool DoesFit(string raw_data) => raw_data.EndsWith(Value); - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) + public async Task DoAction(UpdateResult ur, MessageResult mr) { await mr.ConfirmAction(); @@ -63,9 +63,9 @@ namespace DemoBot.ActionManager.Navigation TForm new_form = type.GetConstructor(new Type[] { })?.Invoke(new object[] { }) as TForm; - if (raw_data != null) + if (mr.RawData != null) { - SetProperty(new_form, raw_data); + SetProperty(new_form, mr.RawData); } await ur.Device.ActiveForm.NavigateTo(new_form); diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/GuidNavigation.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/GuidNavigation.cs index 26e47c9..7eca919 100644 --- a/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/GuidNavigation.cs +++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/GuidNavigation.cs @@ -40,7 +40,7 @@ namespace DemoBot.ActionManager.Navigation } - public async Task DoAction(String data, UpdateResult ur, MessageResult mr) + public async Task DoAction(UpdateResult ur, MessageResult mr) { await mr.ConfirmAction(); @@ -90,7 +90,7 @@ namespace DemoBot.ActionManager.Navigation } - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) + public async Task DoAction(UpdateResult ur, MessageResult mr) { await mr.ConfirmAction(); diff --git a/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/StartWithNavigation.cs b/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/StartWithNavigation.cs index 7f45597..6576ad3 100644 --- a/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/StartWithNavigation.cs +++ b/Experiments/ExternalActionManager/DemoBot/ActionManager/Navigation/StartWithNavigation.cs @@ -22,15 +22,15 @@ namespace DemoBot.ActionManager.Navigation public bool DoesFit(string raw_data) => raw_data.StartsWith(Value); - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) + public async Task DoAction(UpdateResult ur, MessageResult mr) { await mr.ConfirmAction(); var new_form = FormType.GetConstructor(new Type[] { })?.Invoke(new object[] { }) as FormBase; - if (raw_data != null) + if (mr.RawData != null) { - SetProperty(new_form, raw_data); + SetProperty(new_form, mr.RawData); } await ur.Device.ActiveForm.NavigateTo(new_form); @@ -54,7 +54,7 @@ namespace DemoBot.ActionManager.Navigation public bool DoesFit(string raw_data) => raw_data.StartsWith(Value); - public async Task DoAction(String raw_data, UpdateResult ur, MessageResult mr) + public async Task DoAction(UpdateResult ur, MessageResult mr) { await mr.ConfirmAction(); @@ -62,9 +62,9 @@ namespace DemoBot.ActionManager.Navigation TForm new_form = type.GetConstructor(new Type[] { })?.Invoke(new object[] { }) as TForm; - if (raw_data != null) + if (mr.RawData != null) { - SetProperty(new_form, raw_data); + SetProperty(new_form, mr.RawData); } await ur.Device.ActiveForm.NavigateTo(new_form);