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

Ignore Callback queries with original image attached to message, no SentData event

Browse Source
This commit is contained in:
FlorianDahn 2021-12-19 14:55:23 +01:00
parent fc33da0496
commit 1cc0a2bdf7
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
TelegramBotBase/Factories/MessageLoops/FormBaseMessageLoop.cs
View File

@ -29,8 +29,8 @@ namespace TelegramBotBase.Factories.MessageLoops
var update = ur.RawData; var update = ur.RawData;
if (update.Type != Telegram.Bot.Types.Enums.UpdateType.Message if (update.Type != Telegram.Bot.Types.Enums.UpdateType.Message
&& update.Type != Telegram.Bot.Types.Enums.UpdateType.EditedMessage && update.Type != Telegram.Bot.Types.Enums.UpdateType.EditedMessage
&& update.Type != Telegram.Bot.Types.Enums.UpdateType.CallbackQuery) && update.Type != Telegram.Bot.Types.Enums.UpdateType.CallbackQuery)
{ {
return; return;
@ -45,14 +45,9 @@ namespace TelegramBotBase.Factories.MessageLoops
if (sce.Handled) if (sce.Handled)
return; return;
} }
//var mr = new MessageResult(update);
mr.Device = session;
//var message = update.Message ?? update.EditedMessage; mr.Device = session;
var activeForm = session.ActiveForm; var activeForm = session.ActiveForm;
//Pre Loading Event //Pre Loading Event
@ -64,11 +59,19 @@ namespace TelegramBotBase.Factories.MessageLoops
//Loading Event //Loading Event
await activeForm.Load(mr); await activeForm.Load(mr);
//Is Attachment ? (Photo, Audio, Video, Contact, Location, Document)
if (mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Contact | mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Document | mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Location | //Is Attachment ? (Photo, Audio, Video, Contact, Location, Document) (Ignore Callback Queries)
mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Photo | mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Video | mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Audio) if (update.Type == Telegram.Bot.Types.Enums.UpdateType.Message)
{ {
await activeForm.SentData(new DataResult(ur)); if (mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Contact
| mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Document
| mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Location
| mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Photo
| mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Video
| mr.MessageType == Telegram.Bot.Types.Enums.MessageType.Audio)
{
await activeForm.SentData(new DataResult(ur));
}
} }
//Action Event //Action Event