Update README.md

Feature request: https://github.com/MajMcCloud/TelegramBotFramework/issues/2

Examples/JoinHiderBot/JoinHiderBot.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TelegramBotBase" Version="3.0.0" />
+    <PackageReference Include="TelegramBotBase" Version="3.1.1" />
   </ItemGroup>
 
 </Project>

Examples/SystemCommandsBot/SystemCommandsBot.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="TelegramBotBase" Version="3.0.0" />
+    <PackageReference Include="TelegramBotBase" Version="3.1.1" />
   </ItemGroup>
 
 </Project>

README.md

@@ -71,6 +71,8 @@ Thanks !
 
 	* [ButtonGrid](#button-grid)
 	
+		* [Paging and Searching](#paging--searching)
+
 - [Groups](#groups)
 	* [SplitterForm](#splitter-form)
 
@@ -118,7 +120,7 @@ It gives you features which will look/feel like WinForms or have a good way to c
 ## How to start:
 
 Within your empty App your need to put some initial lines including your APIKey to get things started. 
-The "BotBase" Class will manage a lot of things for you, like system calls, action events and so on. 
+The "BotBase" Class will manage a lot of things for you, like bot commands, action events and so on. 
 "StartForm" is your first Formular which every user will get internally redirected to, like a start page, you could redirect from there later in code, so users won't recognize it. 
 It needs to be a subclass of "FormBase" you will find in Namespace TelegramBotBase.Base
 
@@ -129,7 +131,10 @@ It needs to be a subclass of "FormBase" you will find in Namespace TelegramBotBa
 BotBase<StartForm> bb = new BotBase<StartForm>("{YOUR API KEY}");
 
 //Add Systemcommands if you like, you could catch them later
-bb.SystemCalls.Add("/start");
+bb.BotCommands.Add(new BotCommand() { Command = "start", Description = "Starts the bot" });
+
+//Update bot commands to botfather
+bb.UploadBotCommands().Wait();
 
 //Start your Bot
 bb.Start();
@@ -154,17 +159,10 @@ public class StartForm : FormBase
             
         }
 		
-	//Gets invoked if the form gets opened (with Form.NavigateTo(NewForm))
+    	//Opened() got replaced with event handler
-        public override async Task Opened()
-        {
 
-        }
+    	//Closed() got replaced with event handler
 
-	//Gets invoked if the form gets leaved
-        public override async Task Closed()
-        {
-
-        }
 		
 	//Gets invoked on every Message/Action/Data in this context
         public override async Task Load(MessageResult message)
@@ -221,10 +219,10 @@ await this.NavigateTo(tf);
 
 All examples are within the test project, so just try it out on your own.
 
-### Add some system calls (Example #0 - System Calls)
+### Add some system calls (Example #0 - Bot Commands)
 
 Inside of the BotFather you are able to add "Commands" to your TelegramBot. The user will see them, depending on the application as options he could choose.
-I'm calling them Systemcalls. Before start (and later for sure) you could add them to your BotBase. Every time a message comes in they will get checked if they are one of them.
+Before start (and later for sure) you could add them to your BotBase. Every time a message comes in they will get checked if they are one of them.
 If so, a special event Handler will get raised where you are easier able to manage the action behind.
 
 Below we have 4 options.
@@ -242,13 +240,12 @@ Below we have 4 options.
 ```
 BotBase<Start> bb = new BotBase<Start>("{YOUR API KEY}");
 
-bb.SystemCalls.Add("/start");
+bb.BotCommands.Add(new BotCommand() { Command = "start", Description = "Starts the bot" });
-bb.SystemCalls.Add("/form1");
+bb.BotCommands.Add(new BotCommand() { Command = "form1", Description = "Opens test form 1" });
-bb.SystemCalls.Add("/form2");
+bb.BotCommands.Add(new BotCommand() { Command = "form2", Description = "Opens test form 2" });
+bb.BotCommands.Add(new BotCommand() { Command = "params", Description = "Returns all send parameters as a message." });
 
-bb.SystemCalls.Add("/params");
+bb.BotCommand += async (s, en) =>
-
-bb.SystemCall += async (s, en) =>
 {
 	switch (en.Command)
 	{
@@ -279,6 +276,9 @@ bb.SystemCall += async (s, en) =>
 
 };
 
+//Update Bot commands to botfather
+bb.UploadBotCommands().Wait();
+
 bb.Start();
 
 ```
@@ -293,19 +293,21 @@ On every input the user is sending back to the bot the Action event gets raised.
 ```
 public class SimpleForm : AutoCleanForm
 {
-        public SimpleForm()
+    public SimpleForm()
-        {
+    {
-            this.DeleteSide = eSide.Both;
+        this.DeleteSide = TelegramBotBase.Enums.eDeleteSide.Both;
-            this.DeleteMode = eDeleteMode.OnLeavingForm;
+        this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-        }
 
-	public override async Task Opened()
+        this.Opened += SimpleForm_Opened;
-	{
+    }
-	    await this.Device.Send("Hello world! (send 'back' to get back to Start)\r\nOr\r\nhi, hello, maybe, bye and ciao");
+	
-	}
+    private async Task SimpleForm_Opened(object sender, EventArgs e)
+    {
+        await this.Device.Send("Hello world! (send 'back' to get back to Start)\r\nOr\r\nhi, hello, maybe, bye and ciao");
+    }
 
 
-	public override async Task Load(MessageResult message)
+    public override async Task Load(MessageResult message)
 	{
 	    //message.MessageText will work also, cause it is a string you could manage a lot different scenerios here
 
@@ -680,7 +682,7 @@ public async override Task Render(MessageResult message)
 ```
 
 There is also a second example, where every of these 3 inputs gets requested by a different formular (class). Just for imagination of the possiblites.
-Cause its to much Text, i didnt have added it here. You will find it under [TelegramBaseTest/Tests/Register/PerStep.cs](TelegramBaseTest/Tests/Register/PerStep.cs)
+Cause its to much Text, i didnt have added it here. You will find it under [TelegramBotBaseTest/Tests/Register/PerStep.cs](TelegramBotBaseTest/Tests/Register/PerStep.cs)
 Beginn there and navigate your way through these Steps in the subfolder.
 
 
@@ -799,6 +801,8 @@ await this.NavigateTo(cd);
 ### Button Grid
 <img src="images/buttongrid.gif?raw=true" />
 
+#### Paging & Searching
+<img src="images/buttongrid_pagingfilter.gif?raw=true" />
 
 ## Groups
 

TelegramBotBase/Base/FormBase.cs

@@ -410,6 +410,19 @@ namespace TelegramBotBase.Form
             this.Controls.Remove(control);
         }
 
+        /// <summary>
+        /// Removes all controls.
+        /// </summary>
+        public void RemoveAllControls()
+        {
+            foreach(var c in this.Controls)
+            {
+                c.Cleanup().Wait();
+
+                this.Controls.Remove(c);
+            }
+        }
+
         /// <summary>
         /// Cleanup
         /// </summary>

TelegramBotBase/BotBase.cs

@@ -33,7 +33,7 @@ namespace TelegramBotBase
         /// <summary>
         /// List of all running/active sessions
         /// </summary>
-        public SessionBase Sessions { get; set; }
+        public SessionBase<T> Sessions { get; set; }
 
         /// <summary>
         /// Contains System commands which will be available at everytime and didnt get passed to forms, i.e. /start
@@ -79,7 +79,8 @@ namespace TelegramBotBase
 
             this.BotCommands = new List<BotCommand>();
 
-            this.Sessions = new SessionBase();
+            this.Sessions = new SessionBase<T>();
+            this.Sessions.BotBase = this;
         }
 
         /// <summary>
@@ -193,10 +194,7 @@ namespace TelegramBotBase
 
             this.Client.TelegramClient.StopReceiving();
 
-            if (this.StateMachine != null)
+            this.Sessions.SaveSessionStates();
-            {
-                this.Sessions.SaveSessionStates(this.StateMachine);
-            }
         }
 
         /// <summary>
@@ -442,11 +440,8 @@ namespace TelegramBotBase
 
                         if (uhc.Handled)
                         {
-                            if (ds.FormSwitched)
+                            e.Handled = true;
-                            {
+                            if (!ds.FormSwitched)
-                                continue;
-                            }
-                            else
                             {
                                 break;
                             }

TelegramBotBase/Controls/ButtonGrid.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.SymbolStore;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,6 +13,7 @@ using TelegramBotBase.Base;
 using TelegramBotBase.Enums;
 using TelegramBotBase.Exceptions;
 using TelegramBotBase.Form;
+using static TelegramBotBase.Base.Async;
 
 namespace TelegramBotBase.Controls
 {
@@ -55,6 +57,17 @@ namespace TelegramBotBase.Controls
         /// </summary>
         public bool EnablePaging { get; set; } = false;
 
+
+        /// <summary>
+        /// Enabled a search function.
+        /// </summary>
+        public bool EnableSearch { get; set; } = false;
+
+        public String SearchQuery { get; set; }
+
+        public eNavigationBarVisibility NavigationBarVisibility { get; set; } = eNavigationBarVisibility.always;
+
+
         /// <summary>
         /// Index of the current page
         /// </summary>
@@ -66,11 +79,18 @@ namespace TelegramBotBase.Controls
 
         public String NoItemsLabel = Localizations.Default.Language["ButtonGrid_NoItems"];
 
+        public String SearchLabel = Localizations.Default.Language["ButtonGrid_SearchFeature"];
+
         /// <summary>
         /// Layout of the buttons which should be displayed always on top.
         /// </summary>
         public List<ButtonBase> HeadLayoutButtonRow { get; set; }
 
+        /// <summary>
+        /// Layout of columns which should be displayed below the header
+        /// </summary>
+        public List<ButtonBase> SubHeadLayoutButtonRow { get; set; }
+
         /// <summary>
         /// Defines which type of Button Keyboard should be rendered.
         /// </summary>
@@ -115,7 +135,7 @@ namespace TelegramBotBase.Controls
         }
 
 
-        public event EventHandler<ButtonClickedEventArgs> ButtonClicked
+        public event AsyncEventHandler<ButtonClickedEventArgs> ButtonClicked
         {
             add
             {
@@ -127,9 +147,13 @@ namespace TelegramBotBase.Controls
             }
         }
 
-        public void OnButtonClicked(ButtonClickedEventArgs e)
+        public async Task OnButtonClicked(ButtonClickedEventArgs e)
         {
-            (this.Events[__evButtonClicked] as EventHandler<ButtonClickedEventArgs>)?.Invoke(this, e);
+            var handler = this.Events[__evButtonClicked].GetInvocationList().Cast<AsyncEventHandler<ButtonClickedEventArgs>>();
+            foreach (var h in handler)
+            {
+                await Async.InvokeAllAsync<ButtonClickedEventArgs>(h, this, e);
+            }
         }
 
         public async override Task Load(MessageResult result)
@@ -140,33 +164,61 @@ namespace TelegramBotBase.Controls
             if (!result.IsFirstHandler)
                 return;
 
-            var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText) ?? ButtonsForm.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText);
+            var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText)
+                        ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText)
+                        ?? ButtonsForm.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText);
 
             if (button == null)
             {
-                if (result.MessageText != null)
+                if (result.MessageText == null)
+                    return;
+
+                if (result.MessageText == PreviousPageLabel)
                 {
-                    if (result.MessageText == PreviousPageLabel)
+                    if (this.CurrentPageIndex > 0)
-                    {
+                        this.CurrentPageIndex--;
-                        if (this.CurrentPageIndex > 0)
-                            this.CurrentPageIndex--;
 
-                        this.Updated();
+                    this.Updated();
-                    }
-                    else if (result.MessageText == NextPageLabel)
-                    {
-                        if (this.CurrentPageIndex < this.PageCount - 1)
-                            this.CurrentPageIndex++;
-
-                        this.Updated();
-                    }
                 }
+                else if (result.MessageText == NextPageLabel)
+                {
+                    if (this.CurrentPageIndex < this.PageCount - 1)
+                        this.CurrentPageIndex++;
+
+                    this.Updated();
+                }
+                else if (this.EnableSearch)
+                {
+                    if (result.MessageText.StartsWith("🔍"))
+                    {
+                        //Sent note about searching
+                        if (this.SearchQuery == null)
+                        {
+                            await this.Device.Send(this.SearchLabel);
+                        }
+
+                        this.SearchQuery = null;
+                        this.Updated();
+                        return;
+                    }
+
+                    this.SearchQuery = result.MessageText;
+
+                    if (this.SearchQuery != null && this.SearchQuery != "")
+                    {
+                        this.CurrentPageIndex = 0;
+                        this.Updated();
+                    }
+
+                }
+
+
 
                 return;
             }
 
 
-            OnButtonClicked(new ButtonClickedEventArgs(button));
+            await OnButtonClicked(new ButtonClickedEventArgs(button));
 
             //Remove button click message
             if (this.DeletePreviousMessage)
@@ -191,7 +243,9 @@ namespace TelegramBotBase.Controls
             {
                 case eKeyboardType.InlineKeyBoard:
 
-                    var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData) ?? ButtonsForm.ToList().FirstOrDefault(a => a.Value == result.RawData);
+                    var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
+                                ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
+                                ?? ButtonsForm.ToList().FirstOrDefault(a => a.Value == result.RawData);
 
                     if (button == null)
                     {
@@ -219,7 +273,7 @@ namespace TelegramBotBase.Controls
                         return;
                     }
 
-                    OnButtonClicked(new ButtonClickedEventArgs(button));
+                    await OnButtonClicked(new ButtonClickedEventArgs(button));
 
                     result.Handled = true;
 
@@ -277,8 +331,16 @@ namespace TelegramBotBase.Controls
 
             Message m = null;
 
-            ButtonForm form = this.ButtonsForm.Duplicate();
+            ButtonForm form = this.ButtonsForm;
 
+            if (this.EnableSearch && this.SearchQuery != null && this.SearchQuery != "")
+            {
+                form = form.FilterDuplicate(this.SearchQuery, true);
+            }
+            else
+            {
+                form = form.Duplicate();
+            }
 
             if (this.EnablePaging)
             {
@@ -290,6 +352,18 @@ namespace TelegramBotBase.Controls
                 form.InsertButtonRow(0, this.HeadLayoutButtonRow);
             }
 
+            if (this.SubHeadLayoutButtonRow != null && SubHeadLayoutButtonRow.Count > 0)
+            {
+                if (this.IsNavigationBarVisible)
+                {
+                    form.InsertButtonRow(2, this.SubHeadLayoutButtonRow);
+                }
+                else
+                {
+                    form.InsertButtonRow(1, this.SubHeadLayoutButtonRow);
+                }
+            }
+
             switch (this.KeyboardType)
             {
                 //Reply Keyboard could only be updated with a new keyboard.
@@ -363,10 +437,23 @@ namespace TelegramBotBase.Controls
                 bf.AddButtonRow(new ButtonBase(NoItemsLabel, "$"));
             }
 
+            if (this.IsNavigationBarVisible)
+            {
+                //🔍
+                List<ButtonBase> lst = new List<ButtonBase>();
+                lst.Add(new ButtonBase(PreviousPageLabel, "$previous$"));
+                lst.Add(new ButtonBase(String.Format(Localizations.Default.Language["ButtonGrid_CurrentPage"], this.CurrentPageIndex + 1, this.PageCount), "$site$"));
+                lst.Add(new ButtonBase(NextPageLabel, "$next$"));
 
-            bf.InsertButtonRow(0, new ButtonBase(PreviousPageLabel, "$previous$"), new ButtonBase(String.Format(Localizations.Default.Language["ButtonGrid_CurrentPage"], this.CurrentPageIndex + 1, this.PageCount), "$site$"), new ButtonBase(NextPageLabel, "$next$"));
+                if (this.EnableSearch)
+                {
+                    lst.Insert(2, new ButtonBase("🔍 " + (this.SearchQuery ?? ""), "$search$"));
+                }
 
-            bf.AddButtonRow(new ButtonBase(PreviousPageLabel, "$previous$"), new ButtonBase(String.Format(Localizations.Default.Language["ButtonGrid_CurrentPage"], this.CurrentPageIndex + 1, this.PageCount), "$site$"), new ButtonBase(NextPageLabel, "$next$"));
+                bf.InsertButtonRow(0, lst);
+
+                bf.AddButtonRow(lst);
+            }
 
             return bf;
         }
@@ -375,7 +462,25 @@ namespace TelegramBotBase.Controls
         {
             get
             {
-                if ((this.KeyboardType == eKeyboardType.InlineKeyBoard && ButtonsForm.Rows > Constants.Telegram.MaxInlineKeyBoardRows) | (this.KeyboardType == eKeyboardType.ReplyKeyboard && ButtonsForm.Rows > Constants.Telegram.MaxReplyKeyboardRows))
+                if (this.KeyboardType == eKeyboardType.InlineKeyBoard && TotalRows > Constants.Telegram.MaxInlineKeyBoardRows)
+                {
+                    return true;
+                }
+
+                if (this.KeyboardType == eKeyboardType.ReplyKeyboard && TotalRows > Constants.Telegram.MaxReplyKeyboardRows)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+        }
+
+        public bool IsNavigationBarVisible
+        {
+            get
+            {
+                if (this.NavigationBarVisibility == eNavigationBarVisibility.always | (this.NavigationBarVisibility == eNavigationBarVisibility.auto && PagingNecessary))
                 {
                     return true;
                 }
@@ -405,6 +510,18 @@ namespace TelegramBotBase.Controls
             }
         }
 
+        /// <summary>
+        /// Returns the number of all rows (layout + navigation + content);
+        /// </summary>
+        public int TotalRows
+        {
+            get
+            {
+                return this.LayoutRows + ButtonsForm.Rows;
+            }
+        }
+
+
         /// <summary>
         /// Contains the Number of Rows which are used by the layout.
         /// </summary>
@@ -412,11 +529,17 @@ namespace TelegramBotBase.Controls
         {
             get
             {
-                int layoutRows = 2;
+                int layoutRows = 0;
+
+                if (this.NavigationBarVisibility == eNavigationBarVisibility.always | this.NavigationBarVisibility == eNavigationBarVisibility.auto)
+                    layoutRows += 2;
 
                 if (this.HeadLayoutButtonRow != null && this.HeadLayoutButtonRow.Count > 0)
                     layoutRows++;
 
+                if (this.SubHeadLayoutButtonRow != null && this.SubHeadLayoutButtonRow.Count > 0)
+                    layoutRows++;
+
                 return layoutRows;
             }
         }
@@ -428,7 +551,17 @@ namespace TelegramBotBase.Controls
                 if (this.ButtonsForm.Count == 0)
                     return 1;
 
-                return (int)Math.Ceiling((decimal)(this.ButtonsForm.Rows / (decimal)(MaximumRow - 3)));
+                var bf = this.ButtonsForm;
+
+                if (this.EnableSearch && this.SearchQuery != null && this.SearchQuery != "")
+                {
+                    bf = bf.FilterDuplicate(this.SearchQuery);
+                }
+
+                if (bf.Rows == 0)
+                    return 1;
+
+                return (int)Math.Ceiling((decimal)(bf.Rows / (decimal)(MaximumRow - 3)));
             }
         }
 

TelegramBotBase/Controls/ToggleButton.cs

@@ -20,6 +20,8 @@ namespace TelegramBotBase.Controls
 
         public String UncheckedString { get; set; } = Localizations.Default.Language["ToggleButton_Off"];
 
+        public String ChangedString { get; set; } = Localizations.Default.Language["ToggleButton_Changed"];
+
         public String Title { get; set; } = Localizations.Default.Language["ToggleButton_Title"];
 
         public int? MessageId { get; set; }
@@ -68,7 +70,7 @@ namespace TelegramBotBase.Controls
             if (result.Handled)
                 return;
 
-            await result.ConfirmAction();
+            await result.ConfirmAction(this.ChangedString);
 
             switch (value ?? "unknown")
             {

TelegramBotBase/Enums/eNavigationBarVisibility.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TelegramBotBase.Enums
+{
+    public enum eNavigationBarVisibility
+    {
+        /// <summary>
+        /// Shows it depending on the amount of items.
+        /// </summary>
+        auto = 0,
+
+        /// <summary>
+        /// Will not show it at any time.
+        /// </summary>
+        never = 1,
+
+        /// <summary>
+        /// Will show it at any time.
+        /// </summary>
+        always = 2
+
+    }
+}

TelegramBotBase/Form/AlertDialog.cs

@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TelegramBotBase.Attributes;
 using TelegramBotBase.Base;
 
 namespace TelegramBotBase.Form
@@ -11,6 +12,7 @@ namespace TelegramBotBase.Form
     /// <summary>
     /// A simple prompt dialog with one ok Button
     /// </summary>
+    [IgnoreState]
     public class AlertDialog : ConfirmDialog
     {
         public String ButtonText { get; set; }

TelegramBotBase/Form/ArrayPromptDialog.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
+using TelegramBotBase.Attributes;
 using TelegramBotBase.Base;
 
 namespace TelegramBotBase.Form
@@ -12,11 +13,11 @@ namespace TelegramBotBase.Form
     /// <summary>
     /// A prompt with a lot of buttons
     /// </summary>
+    [IgnoreState]
     public class ArrayPromptDialog : FormBase
     {
         public String Message { get; set; }
 
-
         public ButtonBase[][] Buttons { get; set; }
 
         [Obsolete]

TelegramBotBase/Form/AutoCleanForm.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Telegram.Bot.Types;
 using TelegramBotBase.Args;
+using TelegramBotBase.Attributes;
 using TelegramBotBase.Base;
 using TelegramBotBase.Enums;
 
@@ -15,17 +16,20 @@ namespace TelegramBotBase.Form
     /// </summary>
     public class AutoCleanForm : FormBase
     {
-        List<Message> OldMessages { get; set; }
+        [SaveState]
+        public List<int> OldMessages { get; set; }
 
+        [SaveState]
         public eDeleteMode DeleteMode { get; set; }
 
+        [SaveState]
         public eDeleteSide DeleteSide { get; set; }
 
         
 
         public AutoCleanForm()
         {
-            this.OldMessages = new List<Message>();
+            this.OldMessages = new List<int>();
             this.DeleteMode = eDeleteMode.OnEveryCall;
             this.DeleteSide = eDeleteSide.BotOnly;
 
@@ -52,7 +56,7 @@ namespace TelegramBotBase.Form
             if (this.DeleteSide == eDeleteSide.BotOnly)
                 return;
 
-            this.OldMessages.Add(e.Message);
+            this.OldMessages.Add(e.Message.MessageId);
         }
 
         private void Device_MessageSent(object sender, MessageSentEventArgs e)
@@ -60,7 +64,7 @@ namespace TelegramBotBase.Form
             if (this.DeleteSide == eDeleteSide.UserOnly)
                 return;
 
-            this.OldMessages.Add(e.Message);
+            this.OldMessages.Add(e.Message.MessageId);
         }
 
         public override async Task PreLoad(MessageResult message)
@@ -77,7 +81,17 @@ namespace TelegramBotBase.Form
         /// <param name="Id"></param>
         public void AddMessage(Message m)
         {
-            this.OldMessages.Add(m);
+            this.OldMessages.Add(m.MessageId);
+        }
+
+
+        /// <summary>
+        /// Adds a message to this of removable ones
+        /// </summary>
+        /// <param name="Id"></param>
+        public void AddMessage(int messageId)
+        {
+            this.OldMessages.Add(messageId);
         }
 
         /// <summary>
@@ -86,11 +100,7 @@ namespace TelegramBotBase.Form
         /// <param name="Id"></param>
         public void LeaveMessage(int Id)
         {
-            var m = this.OldMessages.FirstOrDefault(a => a.MessageId == Id);
+            this.OldMessages.Remove(Id);
-            if (m == null)
-                return;
-
-            this.OldMessages.Remove(m);
         }
 
         /// <summary>
@@ -120,7 +130,7 @@ namespace TelegramBotBase.Form
         {
             while (this.OldMessages.Count > 0)
             {
-                if (!await this.Device.DeleteMessage(this.OldMessages[0].MessageId))
+                if (!await this.Device.DeleteMessage(this.OldMessages[0]))
                 {
                     //Message can't be deleted cause it seems not to exist anymore
                     if (this.OldMessages.Count > 0)

TelegramBotBase/Form/ButtonBase.cs

@@ -12,7 +12,7 @@ namespace TelegramBotBase.Form
     /// </summary>
     public class ButtonBase
     {
-        public String Text { get; set; }
+        public virtual String Text { get; set; }
 
         public String Value { get; set; }
 

TelegramBotBase/Form/ButtonForm.cs

@@ -61,6 +61,11 @@ namespace TelegramBotBase.Form
             this.DependencyControl = control;
         }
 
+        public void AddButtonRow(String Text, String Value, String Url = null)
+        {
+            Buttons.Add(new List<ButtonBase>() { new ButtonBase(Text, Value, Url) });
+        }
+
         public void AddButtonRow(IEnumerable<ButtonBase> row)
         {
             Buttons.Add(row.ToList());
@@ -129,7 +134,7 @@ namespace TelegramBotBase.Form
 
         public List<ButtonBase> ToList()
         {
-            return this.Buttons.Aggregate((a, b) => a.Union(b).ToList());
+            return this.Buttons.DefaultIfEmpty(new List<ButtonBase>()).Aggregate((a, b) => a.Union(b).ToList());
         }
 
         public InlineKeyboardButton[][] ToInlineButtonArray()
@@ -188,10 +193,10 @@ namespace TelegramBotBase.Form
                 DependencyControl = this.DependencyControl
             };
 
-            foreach(var b in Buttons)
+            foreach (var b in Buttons)
             {
                 var lst = new List<ButtonBase>();
-                foreach(var b2 in b)
+                foreach (var b2 in b)
                 {
                     lst.Add(b2);
                 }
@@ -200,5 +205,44 @@ namespace TelegramBotBase.Form
 
             return bf;
         }
+
+        /// <summary>
+        /// Creates a copy of this form and filters by the parameter.
+        /// </summary>
+        /// <returns></returns>
+        public ButtonForm FilterDuplicate(String filter, bool ByRow = false)
+        {
+            var bf = new ButtonForm()
+            {
+                Markup = this.Markup,
+                DependencyControl = this.DependencyControl
+            };
+
+            foreach (var b in Buttons)
+            {
+                var lst = new List<ButtonBase>();
+                foreach (var b2 in b)
+                {
+                    if (b2.Text.IndexOf(filter, StringComparison.InvariantCultureIgnoreCase) == -1)
+                        continue;
+
+                    //Copy full row, when at least one match has found.
+                    if (ByRow)
+                    {
+                        lst.AddRange(b);
+                        break;
+                    }
+                    else
+                    {
+                        lst.Add(b2);
+                    }
+                }
+
+                if (lst.Count > 0)
+                    bf.Buttons.Add(lst);
+            }
+
+            return bf;
+        }
     }
 }

TelegramBotBase/Form/ConfirmDialog.cs

@@ -5,14 +5,20 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
+using TelegramBotBase.Attributes;
 using TelegramBotBase.Base;
 
 namespace TelegramBotBase.Form
 {
+    [IgnoreState]
     public class ConfirmDialog : ModalDialog
     {
         public String Message { get; set; }
 
+        /// <summary>
+        /// Automatically close form on button click
+        /// </summary>
+        public bool AutoCloseOnClick { get; set; } = true;
 
         public List<ButtonBase> Buttons { get; set; }
 
@@ -48,6 +54,12 @@ namespace TelegramBotBase.Form
 
         public override async Task Action(MessageResult message)
         {
+            if (message.Handled)
+                return;
+
+            if (!message.IsFirstHandler)
+                return;
+
             var call = message.GetData<CallbackData>();
             if (call == null)
                 return;
@@ -66,6 +78,9 @@ namespace TelegramBotBase.Form
             }
 
             OnButtonClicked(new ButtonClickedEventArgs(button));
+
+            if (AutoCloseOnClick)
+                await CloseForm();
         }
 
 

TelegramBotBase/Form/DynamicButton.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TelegramBotBase.Form
+{
+    public class DynamicButton : ButtonBase
+    {
+        public override string Text
+        {
+            get
+            {
+                return GetText?.Invoke() ?? m_text;
+            }
+            set
+            {
+                m_text = value;
+            }
+        }
+
+        private String m_text = "";
+
+        private Func<String> GetText;
+
+        public DynamicButton(String Text, String Value, String Url = null)
+        {
+            this.Text = Text;
+            this.Value = Value;
+            this.Url = Url;
+        }
+
+        public DynamicButton(Func<String> GetText, String Value, String Url = null)
+        {
+            this.GetText = GetText;
+            this.Value = Value;
+            this.Url = Url;
+        }
+
+
+    }
+}

TelegramBotBase/Form/ModalDialog.cs

@@ -22,7 +22,7 @@ namespace TelegramBotBase.Form
             await this.OnClosed(new EventArgs());
 
 
-            this.ParentForm?.ReturnFromModal(this);
+            await this.ParentForm?.ReturnFromModal(this);
         }
     }
 }

TelegramBotBase/Form/PromptDialog.cs

@@ -4,11 +4,14 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Telegram.Bot.Types;
 using Telegram.Bot.Types.ReplyMarkups;
+using TelegramBotBase.Attributes;
 using TelegramBotBase.Base;
 
 namespace TelegramBotBase.Form
 {
+    [IgnoreState]
     public class PromptDialog : ModalDialog
     {
         public String Message { get; set; }
@@ -23,6 +26,11 @@ namespace TelegramBotBase.Form
 
         public String BackLabel { get; set; } = Localizations.Default.Language["PromptDialog_Back"];
 
+        /// <summary>
+        /// Contains the RAW received message.
+        /// </summary>
+        public Message ReceivedMessage { get; set; }
+
         public PromptDialog()
         {
 
@@ -38,6 +46,9 @@ namespace TelegramBotBase.Form
             if (message.Handled)
                 return;
 
+            if (!message.IsFirstHandler)
+                return;
+
             if (this.ShowBackButton && message.MessageText == BackLabel)
             {
                 await this.CloseForm();
@@ -48,6 +59,8 @@ namespace TelegramBotBase.Form
             if (this.Value == null)
             {
                 this.Value = message.MessageText;
+
+                ReceivedMessage = message.Message;
             }
 
 
@@ -71,6 +84,8 @@ namespace TelegramBotBase.Form
             }
 
 
+            message.Handled = true;
+
             OnCompleted(new EventArgs());
 
             await this.CloseForm();

TelegramBotBase/Localizations/English.cs

@@ -11,13 +11,22 @@ namespace TelegramBotBase.Localizations
             Values["Language"] = "English";
             Values["ButtonGrid_Title"] = "Menu";
             Values["ButtonGrid_NoItems"] = "There are no items.";
+            Values["ButtonGrid_PreviousPage"] = "◀️";
+            Values["ButtonGrid_NextPage"] = "▶️";
             Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}";
+            Values["ButtonGrid_SearchFeature"] = "💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
             Values["CalendarPicker_Title"] = "Pick date";
+            Values["CalendarPicker_PreviousPage"] = "◀️";
+            Values["CalendarPicker_NextPage"] = "▶️";
             Values["TreeView_Title"] = "Select node";
             Values["TreeView_LevelUp"] = "🔼 level up";
             Values["ToggleButton_On"] = "On";
             Values["ToggleButton_Off"] = "Off";
+            Values["ToggleButton_OnIcon"] = "⚫";
+            Values["ToggleButton_OffIcon"] = "⚪";
             Values["ToggleButton_Title"] = "Toggle";
+            Values["PromptDialog_Back"] = "Back";
+            Values["ToggleButton_Changed"] = "Setting changed";
         }
 
 

TelegramBotBase/Localizations/Localization.cs

@@ -24,6 +24,7 @@ namespace TelegramBotBase.Localizations
             Values["ButtonGrid_PreviousPage"] = "◀️";
             Values["ButtonGrid_NextPage"] = "▶️";
             Values["ButtonGrid_CurrentPage"] = "Seite {0} von {1}";
+            Values["ButtonGrid_SearchFeature"] = "💡 Sende eine Nachricht um die Liste zu filtern. Klicke die 🔍 um den Filter zurückzusetzen.";
             Values["CalendarPicker_Title"] = "Datum auswählen";
             Values["CalendarPicker_PreviousPage"] = "◀️";
             Values["CalendarPicker_NextPage"] = "▶️";
@@ -35,6 +36,7 @@ namespace TelegramBotBase.Localizations
             Values["ToggleButton_OffIcon"] = "⚪";
             Values["ToggleButton_Title"] = "Schalter";
             Values["PromptDialog_Back"] = "Zurück";
+            Values["ToggleButton_Changed"] = "Einstellung geändert";
             
         }
 

TelegramBotBase/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Florian Dahn")]
 [assembly: AssemblyProduct("TelegramBotBase Framework")]
-[assembly: AssemblyCopyright("Copyright © Florian Dahn 2019")]
+[assembly: AssemblyCopyright("Copyright © Florian Dahn 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("3.1.0.0")]

TelegramBotBase/SessionBase.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
@@ -14,12 +16,15 @@ namespace TelegramBotBase
     /// <summary>
     /// Base class for managing all active sessions
     /// </summary>
-    public class SessionBase
+    public class SessionBase<T>
+        where T : FormBase
     {
         public MessageClient Client { get; set; }
 
         public Dictionary<long, DeviceSession> SessionList { get; set; }
 
+        public BotBase<T> BotBase { get; set; }
+
 
         public SessionBase()
         {
@@ -130,7 +135,22 @@ namespace TelegramBotBase
                     continue;
                 }
 
-                var form = t.GetConstructor(new Type[] { }).Invoke(new object[] { }) as FormBase;
+                var form = t.GetConstructor(new Type[] { })?.Invoke(new object[] { }) as FormBase;
+
+                //No default constructor, fallback
+                if (form == null)
+                {
+                    if (!statemachine.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
+                        continue;
+
+                    form = statemachine.FallbackStateForm.GetConstructor(new Type[] { })?.Invoke(new object[] { }) as FormBase;
+
+                    //Fallback failed, due missing default constructor
+                    if (form == null)
+                        continue;
+
+                }
+
 
                 if (s.Values != null && s.Values.Count > 0)
                 {
@@ -145,6 +165,16 @@ namespace TelegramBotBase
 
                         try
                         {
+                            if (f.PropertyType.IsEnum)
+                            {
+                                var ent = Enum.Parse(f.PropertyType, p.Value.ToString());
+
+                                f.SetValue(form, ent);
+
+                                continue;
+                            }
+
+
                             f.SetValue(form, p.Value);
                         }
                         catch (ArgumentException ex)
@@ -268,5 +298,17 @@ namespace TelegramBotBase
 
             statemachine.SaveFormStates(new SaveStatesEventArgs(sc));
         }
+
+        /// <summary>
+        /// Saves all open states into the machine.
+        /// </summary>
+        public void SaveSessionStates()
+        {
+            if (this.BotBase.StateMachine == null)
+                return;
+
+
+            this.SaveSessionStates(this.BotBase.StateMachine);
+        }
     }
 }

TelegramBotBase/Sessions/DeviceSession.cs

@@ -135,6 +135,7 @@ namespace TelegramBotBase.Sessions
             this.ActiveForm.Device = this;
         }
 
+
         /// <summary>
         /// Edits the text message
         /// </summary>
@@ -142,7 +143,7 @@ namespace TelegramBotBase.Sessions
         /// <param name="text"></param>
         /// <param name="buttons"></param>
         /// <returns></returns>
-        public async Task<Message> Edit(int messageId, String text, ButtonForm buttons = null)
+        public async Task<Message> Edit(int messageId, String text, ButtonForm buttons = null, ParseMode parseMode = ParseMode.Default)
         {
             InlineKeyboardMarkup markup = buttons;
 
@@ -153,7 +154,7 @@ namespace TelegramBotBase.Sessions
 
             try
             {
-                return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, replyMarkup: markup);
+                return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, parseMode, replyMarkup: markup);
             }
             catch
             {
@@ -171,7 +172,7 @@ namespace TelegramBotBase.Sessions
         /// <param name="text"></param>
         /// <param name="buttons"></param>
         /// <returns></returns>
-        public async Task<Message> Edit(int messageId, String text, InlineKeyboardMarkup markup)
+        public async Task<Message> Edit(int messageId, String text, InlineKeyboardMarkup markup, ParseMode parseMode = ParseMode.Default)
         {
             if (text.Length > Constants.Telegram.MaxMessageLength)
             {
@@ -180,7 +181,7 @@ namespace TelegramBotBase.Sessions
 
             try
             {
-                return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, replyMarkup: markup);
+                return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, parseMode, replyMarkup: markup);
             }
             catch
             {
@@ -198,7 +199,7 @@ namespace TelegramBotBase.Sessions
         /// <param name="text"></param>
         /// <param name="buttons"></param>
         /// <returns></returns>
-        public async Task<Message> Edit(Message message, ButtonForm buttons = null)
+        public async Task<Message> Edit(Message message, ButtonForm buttons = null, ParseMode parseMode = ParseMode.Default)
         {
             InlineKeyboardMarkup markup = buttons;
 
@@ -209,7 +210,7 @@ namespace TelegramBotBase.Sessions
 
             try
             {
-                return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, message.MessageId, message.Text, replyMarkup: markup);
+                return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, message.MessageId, message.Text, parseMode, replyMarkup: markup);
             }
             catch
             {
@@ -249,7 +250,7 @@ namespace TelegramBotBase.Sessions
         /// <param name="replyTo"></param>
         /// <param name="disableNotification"></param>
         /// <returns></returns>
-        public async Task<Message> Send(String text, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default, bool MarkdownV2AutoEscape = true)
+        public async Task<Message> Send(long deviceId, String text, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default, bool MarkdownV2AutoEscape = true)
         {
             if (this.ActiveForm == null)
                 return null;
@@ -270,7 +271,7 @@ namespace TelegramBotBase.Sessions
 
             try
             {
-                m = await (this.Client.TelegramClient.SendTextMessageAsync(this.DeviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
+                m = await (this.Client.TelegramClient.SendTextMessageAsync(deviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
 
                 OnMessageSent(new MessageSentEventArgs(m));
             }
@@ -286,6 +287,19 @@ namespace TelegramBotBase.Sessions
             return m;
         }
 
+        /// <summary>
+        /// Sends a simple text message
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="buttons"></param>
+        /// <param name="replyTo"></param>
+        /// <param name="disableNotification"></param>
+        /// <returns></returns>
+        public async Task<Message> Send(String text, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default, bool MarkdownV2AutoEscape = true)
+        {
+            return await Send(this.DeviceId, text, buttons, replyTo, disableNotification, parseMode, MarkdownV2AutoEscape);
+        }
+
         /// <summary>
         /// Sends a simple text message
         /// </summary>
@@ -380,7 +394,7 @@ namespace TelegramBotBase.Sessions
         /// <param name="replyTo"></param>
         /// <param name="disableNotification"></param>
         /// <returns></returns>
-        public async Task<Message> SendPhoto(InputOnlineFile file, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default)
+        public async Task<Message> SendPhoto(InputOnlineFile file, String caption = null, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default)
         {
             if (this.ActiveForm == null)
                 return null;
@@ -391,7 +405,7 @@ namespace TelegramBotBase.Sessions
 
             try
             {
-                m = await this.Client.TelegramClient.SendPhotoAsync(this.DeviceId, file, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification);
+                m = await this.Client.TelegramClient.SendPhotoAsync(this.DeviceId, file, caption: caption, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification);
 
                 OnMessageSent(new MessageSentEventArgs(m));
             }
@@ -416,13 +430,13 @@ namespace TelegramBotBase.Sessions
         /// <param name="replyTo"></param>
         /// <param name="disableNotification"></param>
         /// <returns></returns>
-        public async Task<Message> SendPhoto(Image image, String name, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
+        public async Task<Message> SendPhoto(Image image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
         {
             using (var fileStream = Tools.Images.ToStream(image, ImageFormat.Png))
             {
                 InputOnlineFile fts = new InputOnlineFile(fileStream, name);
 
-                return await SendPhoto(fts, buttons, replyTo, disableNotification);
+                return await SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
             }
         }
 
@@ -435,13 +449,13 @@ namespace TelegramBotBase.Sessions
         /// <param name="replyTo"></param>
         /// <param name="disableNotification"></param>
         /// <returns></returns>
-        public async Task<Message> SendPhoto(Bitmap image, String name, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
+        public async Task<Message> SendPhoto(Bitmap image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
         {
             using (var fileStream = Tools.Images.ToStream(image, ImageFormat.Png))
             {
                 InputOnlineFile fts = new InputOnlineFile(fileStream, name);
 
-                return await SendPhoto(fts, buttons, replyTo, disableNotification);
+                return await SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
             }
         }
 
@@ -453,7 +467,7 @@ namespace TelegramBotBase.Sessions
         /// <param name="replyTo"></param>
         /// <param name="disableNotification"></param>
         /// <returns></returns>
-        public async Task<Message> SendVideo(InputOnlineFile file, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default)
+        public async Task<Message> SendVideo(InputOnlineFile file, String caption = null, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default)
         {
             if (this.ActiveForm == null)
                 return null;
@@ -464,7 +478,7 @@ namespace TelegramBotBase.Sessions
 
             try
             {
-                m = await this.Client.TelegramClient.SendVideoAsync(this.DeviceId, file, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification);
+                m = await this.Client.TelegramClient.SendVideoAsync(this.DeviceId, file, caption: caption, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification);
 
                 OnMessageSent(new MessageSentEventArgs(m));
             }
@@ -723,6 +737,19 @@ namespace TelegramBotBase.Sessions
             }
         }
 
+        public virtual async Task UnbanUser(int userId)
+        {
+            try
+            {
+                await this.Client.TelegramClient.UnbanChatMemberAsync(this.DeviceId, userId);
+            }
+            catch
+            {
+
+            }
+        }
+
+
 
         /// <summary>
         /// Eventhandler for sent messages

TelegramBotBase/States/JSONStateMachine.cs

@@ -36,7 +36,7 @@ namespace TelegramBotBase.States
 
             this.FallbackStateForm = fallbackStateForm;
 
-            if (!this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
+            if (this.FallbackStateForm != null && !this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
             {
                 throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
             }

TelegramBotBase/States/SimpleJSONStateMachine.cs

@@ -36,7 +36,7 @@ namespace TelegramBotBase.States
 
             this.FallbackStateForm = fallbackStateForm;
 
-            if (!this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
+            if (this.FallbackStateForm != null && !this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
             {
                 throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
             }

TelegramBotBase/States/XMLStateMachine.cs

@@ -35,7 +35,7 @@ namespace TelegramBotBase.States
 
             this.FallbackStateForm = fallbackStateForm;
 
-            if (!this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
+            if (this.FallbackStateForm != null && !this.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
             {
                 throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
             }

TelegramBotBase/TelegramBotBase.csproj

@@ -1,20 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net461;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
     <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
-    <PackageReleaseNotes>- moving from .Net Framework 4.7.2 to  .Net Standard 2.1 for the Library and .Net Core 3.0 for the test project!</PackageReleaseNotes>
+    <PackageReleaseNotes>- moving from .Net Framework 4.7.2 to  .Net Standard 2.1 for the Library and .Net Core 3.1 for the test project!</PackageReleaseNotes>
     <Configurations>Debug;Release;</Configurations>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
     <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -56,6 +64,7 @@
 
   <ItemGroup>
     <None Remove="cpack.ps1" />
+    <None Remove="cpack_bak.ps1" />
     <None Remove="cpush.ps1" />
     <None Remove="nuget.exe" />
     <None Remove="TelegramBotBase.1.5.0.nupkg" />
@@ -64,6 +73,11 @@
     <None Remove="TelegramBotBase.1.5.1.zip" />
     <None Remove="TelegramBotBase.1.5.2.nupkg" />
     <None Remove="TelegramBotBase.1.5.2.zip" />
+    <None Remove="TelegramBotBase.2.0.0.nupkg" />
+    <None Remove="TelegramBotBase.2.1.0.nupkg" />
+    <None Remove="TelegramBotBase.2.1.0.zip" />
+    <None Remove="TelegramBotBase.3.0.0.nupkg" />
+    <None Remove="TelegramBotBase.3.0.0.zip" />
     <None Remove="TelegramBotBase.nuspec" />
   </ItemGroup>
 

TelegramBotBaseTest/Program.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Telegram.Bot.Types;
+using TelegramBotBase;
+using TelegramBotBase.Form;
+using TelegramBotBaseTest.Tests;
+
+namespace TelegramBotBaseTest
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+
+            BotBase<Start> bb = new BotBase<Start>(APIKey);
+
+            bb.BotCommands.Add(new BotCommand() { Command = "start", Description = "Starts the bot" });
+            bb.BotCommands.Add(new BotCommand() { Command = "form1", Description = "Opens test form 1" });
+            bb.BotCommands.Add(new BotCommand() { Command = "form2", Description = "Opens test form 2" });
+            bb.BotCommands.Add(new BotCommand() { Command = "params", Description = "Returns all send parameters as a message." });
+
+            bb.BotCommand += async (s, en) =>
+            {
+                switch (en.Command)
+                {
+                    case "/start":
+
+                        var start = new Menu();
+
+                        await en.Device.ActiveForm.NavigateTo(start);
+
+                        break;
+                    case "/form1":
+
+                        var form1 = new TestForm();
+
+                        await en.Device.ActiveForm.NavigateTo(form1);
+
+                        break;
+
+                    case "/form2":
+
+                        var form2 = new TestForm2();
+
+                        await en.Device.ActiveForm.NavigateTo(form2);
+
+                        break;
+
+                    case "/params":
+
+                        String m = en.Parameters.DefaultIfEmpty("").Aggregate((a, b) => a + " and " + b);
+                        
+                        await en.Device.Send("Your parameters are: " + m, replyTo: en.Device.LastMessageId);
+
+                        en.Handled = true;
+
+                        break;
+                }
+
+            };
+
+            //Update Bot commands to botfather
+            bb.UploadBotCommands().Wait();
+
+            bb.SetSetting(TelegramBotBase.Enums.eSettings.LogAllMessages, true);
+
+            bb.Message += (s,en) =>
+            {
+                Console.WriteLine(en.DeviceId + " " + en.Message.MessageText + " " + (en.Message.RawData ?? ""));
+            };
+
+            bb.Start();
+
+
+
+            Console.WriteLine("Telegram Bot started...");
+
+            Console.WriteLine("Press q to quit application.");
+
+
+            Console.ReadLine();
+
+            bb.Stop();
+
+        }
+
+
+    }
+}

TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs

@@ -44,7 +44,7 @@ namespace TelegramBotBaseTest.Tests.Controls
 
         }
 
-        private async void Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+        private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
         {
             if (e.Button == null)
                 return;

TelegramBotBaseTest/Tests/Controls/ButtonGridPagingForm.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TelegramBotBase.Args;
+using TelegramBotBase.Controls;
+using TelegramBotBase.Form;
+
+namespace TelegramBotBaseTest.Tests.Controls
+{
+    public class ButtonGridPagingForm : AutoCleanForm
+    {
+
+        ButtonGrid m_Buttons = null;
+
+        public ButtonGridPagingForm()
+        {
+            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
+
+            this.Init += ButtonGridForm_Init;
+        }
+
+        private async Task ButtonGridForm_Init(object sender, InitEventArgs e)
+        {
+            m_Buttons = new ButtonGrid();
+
+            m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard;
+
+            m_Buttons.EnablePaging = true;
+            m_Buttons.EnableSearch = true;
+
+            m_Buttons.HeadLayoutButtonRow = new List<ButtonBase>() { new ButtonBase("Back", "back") };
+
+            var countries = CultureInfo.GetCultures(CultureTypes.SpecificCultures);
+
+            ButtonForm bf = new ButtonForm();
+
+            foreach (var c in countries)
+            {
+                bf.AddButtonRow(new ButtonBase(c.EnglishName, c.EnglishName));
+            }
+
+            m_Buttons.ButtonsForm = bf;
+
+            m_Buttons.ButtonClicked += Bg_ButtonClicked;
+
+            this.AddControl(m_Buttons);
+
+
+        }
+
+        private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+        {
+            if (e.Button == null)
+                return;
+
+            if (e.Button.Value == "back")
+            {
+                var start = new Menu();
+                await this.NavigateTo(start);
+            }
+            else
+            {
+
+                await this.Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
+            }
+
+
+        }
+    }
+}

TelegramBotBaseTest/Tests/Menu.cs

@@ -146,6 +146,16 @@ namespace TelegramBotBaseTest.Tests
 
                     await this.NavigateTo(bg);
 
+                    break;
+
+                case "buttongridfilter":
+
+                    message.Handled = true;
+
+                    var bg2 = new Controls.ButtonGridPagingForm();
+
+                    await this.NavigateTo(bg2);
+
                     break;
             }
 
@@ -175,6 +185,8 @@ namespace TelegramBotBaseTest.Tests
 
             btn.AddButtonRow(new ButtonBase("#12 ButtonGrid", new CallbackData("a", "buttongrid").Serialize()));
 
+            btn.AddButtonRow(new ButtonBase("#13 ButtonGrid Paging & Filter", new CallbackData("a", "buttongridfilter").Serialize()));
+
             await this.Device.Send("Choose your test:", btn);
         }