From 0eab45bdbb06d687ad7721cadbe6a91d7fb06490 Mon Sep 17 00:00:00 2001 From: FlorianDahn Date: Thu, 21 Nov 2019 21:38:20 +0100 Subject: [PATCH] - making Events property of FormBase public, for use in sub classes - making ResultBase derive from Eventargs - adding messagetype to messageresult --- TelegramBotBase/Base/FormBase.cs | 3 ++- TelegramBotBase/Base/MessageResult.cs | 8 ++++++++ TelegramBotBase/Base/ResultBase.cs | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/TelegramBotBase/Base/FormBase.cs b/TelegramBotBase/Base/FormBase.cs index 014ab72..c8d82f8 100644 --- a/TelegramBotBase/Base/FormBase.cs +++ b/TelegramBotBase/Base/FormBase.cs @@ -28,7 +28,7 @@ namespace TelegramBotBase.Form public List Controls { get; set; } - private EventHandlerList Events = new EventHandlerList(); + public EventHandlerList Events = new EventHandlerList(); private static object __evInit = new object(); @@ -118,6 +118,7 @@ namespace TelegramBotBase.Form } } + /// /// Form has been closed (left) /// diff --git a/TelegramBotBase/Base/MessageResult.cs b/TelegramBotBase/Base/MessageResult.cs index 0a97433..020e6fb 100644 --- a/TelegramBotBase/Base/MessageResult.cs +++ b/TelegramBotBase/Base/MessageResult.cs @@ -54,6 +54,14 @@ namespace TelegramBotBase.Base } } + public Telegram.Bot.Types.Enums.MessageType MessageType + { + get + { + return this.RawMessageData?.Message?.Type ?? Telegram.Bot.Types.Enums.MessageType.Unknown; + } + } + /// /// Is this an action ? (i.e. button click) /// diff --git a/TelegramBotBase/Base/ResultBase.cs b/TelegramBotBase/Base/ResultBase.cs index c2d7e8e..e351860 100644 --- a/TelegramBotBase/Base/ResultBase.cs +++ b/TelegramBotBase/Base/ResultBase.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace TelegramBotBase.Base { - public class ResultBase + public class ResultBase : EventArgs { public MessageClient Client { get; set; }