Simplification of ActionManager and remove uncessary string storage
This commit is contained in:
parent
d6961deb8e
commit
de93598e6f
@ -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;
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user