kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changing messageloop behaviour and fix missing Device instance in UpdateResult

Browse Source 
- simplified for future changes
This commit is contained in:
Florian Zevedei 2024-01-24 21:47:14 +01:00
parent 07fe8e9074
commit c821a69d57
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Experiments/ExternalActionManager/DemoBot/CustomFormBaseMessageLoop.cs
View File

@ -22,7 +22,7 @@ namespace DemoBot
public ExternalActionManager ExternalActionManager { get; set; } public ExternalActionManager ExternalActionManager { get; set; }
public async Task MessageLoop(BotBase bot, DeviceSession session, UpdateResult ur, MessageResult mr) public async Task MessageLoop(BotBase bot, DeviceSession s, UpdateResult ur, MessageResult mr)
{ {
var update = ur.RawData; var update = ur.RawData;
@ -34,6 +34,9 @@ namespace DemoBot
return; return;
} }
//Remove unecessary parameter from method call in the future
var session = ur.Device;
//Is this a bot command ? //Is this a bot command ?
if (mr.IsFirstHandler && mr.IsBotCommand && bot.IsKnownBotCommand(mr.BotCommand)) if (mr.IsFirstHandler && mr.IsBotCommand && bot.IsKnownBotCommand(mr.BotCommand))
{ {

6
TelegramBotBase/BotBase.cs
View File

@ -115,12 +115,13 @@ public sealed class BotBase
if (ds == null) if (ds == null)
{ {
ds = await Sessions.StartSession(e.DeviceId); ds = await Sessions.StartSession(e.DeviceId);
e.Device = ds;
ds.LastMessage = e.RawData.Message; ds.LastMessage = e.RawData.Message;
OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds)); OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
} }
e.Device = ds;
var mr = new MessageResult(e.RawData); var mr = new MessageResult(e.RawData);
var i = 0; var i = 0;
@ -210,6 +211,7 @@ public sealed class BotBase
try try
{ {
var ds = Sessions.GetSession(deviceId); var ds = Sessions.GetSession(deviceId);
e.Device = ds; e.Device = ds;
await MessageLoopFactory.MessageLoop(this, ds, new UpdateResult(e.UpdateData, ds), e); await MessageLoopFactory.MessageLoop(this, ds, new UpdateResult(e.UpdateData, ds), e);