From 8e6de4a0e154281a2f2f5a951d0ae19e79542a7c Mon Sep 17 00:00:00 2001 From: FlorianDahn Date: Mon, 23 Mar 2020 13:02:31 +0700 Subject: [PATCH] - Refactoring and moving all EventArgs structures to folder Args --- TelegramBotBase/{Base => Args}/ButtonClickedEventArgs.cs | 2 +- TelegramBotBase/{Base => Args}/GroupChangedEventArgs.cs | 3 ++- TelegramBotBase/{Base => Args}/InitEventArgs.cs | 2 +- TelegramBotBase/{Base => Args}/MemberChangeEventArgs.cs | 3 ++- TelegramBotBase/{Base => Args}/MessageReceivedEventArgs.cs | 2 +- TelegramBotBase/{Base => Args}/MessageSentEventArgs.cs | 2 +- TelegramBotBase/{Base => Args}/SystemCallEventArgs.cs | 2 +- TelegramBotBase/{Base => Args}/SystemExceptionEventArgs.cs | 2 +- TelegramBotBase/{Base => Args}/UnhandledCallEventArgs.cs | 2 +- TelegramBotBase/Base/DataResult.cs | 2 +- TelegramBotBase/Base/FormBase.cs | 1 + TelegramBotBase/BotBase.cs | 3 +++ TelegramBotBase/Controls/ButtonGrid.cs | 1 + TelegramBotBase/Form/ArrayPromptDialog.cs | 1 + TelegramBotBase/Form/AutoCleanForm.cs | 1 + TelegramBotBase/Form/ConfirmDialog.cs | 1 + TelegramBotBase/Form/GroupForm.cs | 1 + TelegramBotBase/SessionBase.cs | 1 + TelegramBotBase/Sessions/DeviceSession.cs | 1 + 19 files changed, 23 insertions(+), 10 deletions(-) rename TelegramBotBase/{Base => Args}/ButtonClickedEventArgs.cs (94%) rename TelegramBotBase/{Base => Args}/GroupChangedEventArgs.cs (88%) rename TelegramBotBase/{Base => Args}/InitEventArgs.cs (91%) rename TelegramBotBase/{Base => Args}/MemberChangeEventArgs.cs (92%) rename TelegramBotBase/{Base => Args}/MessageReceivedEventArgs.cs (94%) rename TelegramBotBase/{Base => Args}/MessageSentEventArgs.cs (94%) rename TelegramBotBase/{Base => Args}/SystemCallEventArgs.cs (97%) rename TelegramBotBase/{Base => Args}/SystemExceptionEventArgs.cs (96%) rename TelegramBotBase/{Base => Args}/UnhandledCallEventArgs.cs (97%) diff --git a/TelegramBotBase/Base/ButtonClickedEventArgs.cs b/TelegramBotBase/Args/ButtonClickedEventArgs.cs similarity index 94% rename from TelegramBotBase/Base/ButtonClickedEventArgs.cs rename to TelegramBotBase/Args/ButtonClickedEventArgs.cs index 94662a1..9d7db14 100644 --- a/TelegramBotBase/Base/ButtonClickedEventArgs.cs +++ b/TelegramBotBase/Args/ButtonClickedEventArgs.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using TelegramBotBase.Form; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { /// /// Button get clicked event diff --git a/TelegramBotBase/Base/GroupChangedEventArgs.cs b/TelegramBotBase/Args/GroupChangedEventArgs.cs similarity index 88% rename from TelegramBotBase/Base/GroupChangedEventArgs.cs rename to TelegramBotBase/Args/GroupChangedEventArgs.cs index 5136182..c1668a0 100644 --- a/TelegramBotBase/Base/GroupChangedEventArgs.cs +++ b/TelegramBotBase/Args/GroupChangedEventArgs.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; using System.Text; using Telegram.Bot.Types.Enums; +using TelegramBotBase.Base; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { public class GroupChangedEventArgs : EventArgs { diff --git a/TelegramBotBase/Base/InitEventArgs.cs b/TelegramBotBase/Args/InitEventArgs.cs similarity index 91% rename from TelegramBotBase/Base/InitEventArgs.cs rename to TelegramBotBase/Args/InitEventArgs.cs index f724695..ec30db8 100644 --- a/TelegramBotBase/Base/InitEventArgs.cs +++ b/TelegramBotBase/Args/InitEventArgs.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { public class InitEventArgs : EventArgs { diff --git a/TelegramBotBase/Base/MemberChangeEventArgs.cs b/TelegramBotBase/Args/MemberChangeEventArgs.cs similarity index 92% rename from TelegramBotBase/Base/MemberChangeEventArgs.cs rename to TelegramBotBase/Args/MemberChangeEventArgs.cs index d292d73..bc07add 100644 --- a/TelegramBotBase/Base/MemberChangeEventArgs.cs +++ b/TelegramBotBase/Args/MemberChangeEventArgs.cs @@ -4,8 +4,9 @@ using System.Linq; using System.Text; using Telegram.Bot.Types; using Telegram.Bot.Types.Enums; +using TelegramBotBase.Base; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { public class MemberChangeEventArgs : EventArgs { diff --git a/TelegramBotBase/Base/MessageReceivedEventArgs.cs b/TelegramBotBase/Args/MessageReceivedEventArgs.cs similarity index 94% rename from TelegramBotBase/Base/MessageReceivedEventArgs.cs rename to TelegramBotBase/Args/MessageReceivedEventArgs.cs index 824e46a..397c6af 100644 --- a/TelegramBotBase/Base/MessageReceivedEventArgs.cs +++ b/TelegramBotBase/Args/MessageReceivedEventArgs.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Telegram.Bot.Types; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { public class MessageReceivedEventArgs { diff --git a/TelegramBotBase/Base/MessageSentEventArgs.cs b/TelegramBotBase/Args/MessageSentEventArgs.cs similarity index 94% rename from TelegramBotBase/Base/MessageSentEventArgs.cs rename to TelegramBotBase/Args/MessageSentEventArgs.cs index 902f462..a57ea30 100644 --- a/TelegramBotBase/Base/MessageSentEventArgs.cs +++ b/TelegramBotBase/Args/MessageSentEventArgs.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Telegram.Bot.Types; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { public class MessageSentEventArgs { diff --git a/TelegramBotBase/Base/SystemCallEventArgs.cs b/TelegramBotBase/Args/SystemCallEventArgs.cs similarity index 97% rename from TelegramBotBase/Base/SystemCallEventArgs.cs rename to TelegramBotBase/Args/SystemCallEventArgs.cs index 85c3cc5..354bd90 100644 --- a/TelegramBotBase/Base/SystemCallEventArgs.cs +++ b/TelegramBotBase/Args/SystemCallEventArgs.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Telegram.Bot.Types; using TelegramBotBase.Sessions; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { /// /// Base class for given system call results diff --git a/TelegramBotBase/Base/SystemExceptionEventArgs.cs b/TelegramBotBase/Args/SystemExceptionEventArgs.cs similarity index 96% rename from TelegramBotBase/Base/SystemExceptionEventArgs.cs rename to TelegramBotBase/Args/SystemExceptionEventArgs.cs index af2bba6..229fa91 100644 --- a/TelegramBotBase/Base/SystemExceptionEventArgs.cs +++ b/TelegramBotBase/Args/SystemExceptionEventArgs.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using TelegramBotBase.Sessions; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { public class SystemExceptionEventArgs : EventArgs { diff --git a/TelegramBotBase/Base/UnhandledCallEventArgs.cs b/TelegramBotBase/Args/UnhandledCallEventArgs.cs similarity index 97% rename from TelegramBotBase/Base/UnhandledCallEventArgs.cs rename to TelegramBotBase/Args/UnhandledCallEventArgs.cs index 0d2209a..e839e2d 100644 --- a/TelegramBotBase/Base/UnhandledCallEventArgs.cs +++ b/TelegramBotBase/Args/UnhandledCallEventArgs.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Telegram.Bot.Types; using TelegramBotBase.Sessions; -namespace TelegramBotBase.Base +namespace TelegramBotBase.Args { public class UnhandledCallEventArgs : EventArgs { diff --git a/TelegramBotBase/Base/DataResult.cs b/TelegramBotBase/Base/DataResult.cs index 9e210eb..e1a37e7 100644 --- a/TelegramBotBase/Base/DataResult.cs +++ b/TelegramBotBase/Base/DataResult.cs @@ -97,7 +97,7 @@ namespace TelegramBotBase.Base this.RawMessageData = message.RawMessageData; this.Message = message.Message; - + this.Client = message.Client; } public async Task DownloadDocument() diff --git a/TelegramBotBase/Base/FormBase.cs b/TelegramBotBase/Base/FormBase.cs index 9e87176..94a8f18 100644 --- a/TelegramBotBase/Base/FormBase.cs +++ b/TelegramBotBase/Base/FormBase.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using TelegramBotBase.Args; using TelegramBotBase.Base; using TelegramBotBase.Sessions; using static TelegramBotBase.Base.Async; diff --git a/TelegramBotBase/BotBase.cs b/TelegramBotBase/BotBase.cs index cc7afa5..b79a9e8 100644 --- a/TelegramBotBase/BotBase.cs +++ b/TelegramBotBase/BotBase.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Telegram.Bot; +using TelegramBotBase.Args; using TelegramBotBase.Base; using TelegramBotBase.Form; using TelegramBotBase.Sessions; @@ -60,6 +61,7 @@ namespace TelegramBotBase /// public bool LogAllMessages { get; set; } = false; + /// /// How often could a form navigate to another (within one user action/call/message) /// @@ -74,6 +76,7 @@ namespace TelegramBotBase this.APIKey = apiKey; this.Client = new Base.MessageClient(this.APIKey); + this.Client.TelegramClient.Timeout = new TimeSpan(0, 1, 0); this.SystemCalls = new List(); diff --git a/TelegramBotBase/Controls/ButtonGrid.cs b/TelegramBotBase/Controls/ButtonGrid.cs index 3026ff2..cbb5b29 100644 --- a/TelegramBotBase/Controls/ButtonGrid.cs +++ b/TelegramBotBase/Controls/ButtonGrid.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using Telegram.Bot.Types; using Telegram.Bot.Types.ReplyMarkups; +using TelegramBotBase.Args; using TelegramBotBase.Base; using TelegramBotBase.Enums; using TelegramBotBase.Exceptions; diff --git a/TelegramBotBase/Form/ArrayPromptDialog.cs b/TelegramBotBase/Form/ArrayPromptDialog.cs index 0891a88..36ee256 100644 --- a/TelegramBotBase/Form/ArrayPromptDialog.cs +++ b/TelegramBotBase/Form/ArrayPromptDialog.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using TelegramBotBase.Args; using TelegramBotBase.Base; namespace TelegramBotBase.Form diff --git a/TelegramBotBase/Form/AutoCleanForm.cs b/TelegramBotBase/Form/AutoCleanForm.cs index ce23679..fc441aa 100644 --- a/TelegramBotBase/Form/AutoCleanForm.cs +++ b/TelegramBotBase/Form/AutoCleanForm.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Telegram.Bot.Types; +using TelegramBotBase.Args; using TelegramBotBase.Base; using TelegramBotBase.Enums; diff --git a/TelegramBotBase/Form/ConfirmDialog.cs b/TelegramBotBase/Form/ConfirmDialog.cs index acdb25e..8147be8 100644 --- a/TelegramBotBase/Form/ConfirmDialog.cs +++ b/TelegramBotBase/Form/ConfirmDialog.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using TelegramBotBase.Args; using TelegramBotBase.Base; namespace TelegramBotBase.Form diff --git a/TelegramBotBase/Form/GroupForm.cs b/TelegramBotBase/Form/GroupForm.cs index 96a1303..3d7e115 100644 --- a/TelegramBotBase/Form/GroupForm.cs +++ b/TelegramBotBase/Form/GroupForm.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using TelegramBotBase.Args; using TelegramBotBase.Base; using static TelegramBotBase.Base.Async; diff --git a/TelegramBotBase/SessionBase.cs b/TelegramBotBase/SessionBase.cs index 9f9a64f..a66c61f 100644 --- a/TelegramBotBase/SessionBase.cs +++ b/TelegramBotBase/SessionBase.cs @@ -3,6 +3,7 @@ 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.Sessions; diff --git a/TelegramBotBase/Sessions/DeviceSession.cs b/TelegramBotBase/Sessions/DeviceSession.cs index e0aac88..bc6c697 100644 --- a/TelegramBotBase/Sessions/DeviceSession.cs +++ b/TelegramBotBase/Sessions/DeviceSession.cs @@ -12,6 +12,7 @@ using Telegram.Bot.Types; using Telegram.Bot.Types.Enums; using Telegram.Bot.Types.InputFiles; using Telegram.Bot.Types.ReplyMarkups; +using TelegramBotBase.Args; using TelegramBotBase.Base; using TelegramBotBase.Exceptions; using TelegramBotBase.Form;