Merge pull request #43 from MajMcCloud/development

Merging development branch to master

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: #[MajMcCloud]
-custom: ["https://paypal.me/majmccloud", dahn.partners]
+custom: ["https://paypal.me/majmccloud"]

.gitignore

@@ -252,3 +252,8 @@ TelegramBotBase/Archive
 /TelegramBotBase/TelegramBotBase.1.5.2.zip
 /TelegramBotBase/cpush.ps1
 /TelegramBotBase/cpack.ps1
+*.ps1
+*.exe
+*.snupkg
+*.zip
+*.nuspec

Examples/AsyncFormUpdates/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
-</configuration>

Examples/AsyncFormUpdates/AsyncFormUpdates.csproj

@@ -1,69 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{673A56F5-6110-4AED-A68D-562FD6ED3EA6}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>AsyncFormUpdates</RootNamespace>
-    <AssemblyName>AsyncFormUpdates</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Telegram.Bot, Version=15.7.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Telegram.Bot.15.7.1\lib\net45\Telegram.Bot.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="forms\AsyncFormEdit.cs" />
-    <Compile Include="forms\AsyncFormUpdate.cs" />
-    <Compile Include="forms\Start.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj">
-      <Project>{0bd16fb9-7ed4-4ccb-83eb-5cee538e1b6c}</Project>
-      <Name>TelegramBotBase</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
+    </ItemGroup>
+
+</Project>

Examples/AsyncFormUpdates/Forms/AsyncFormEdit.cs

@@ -0,0 +1,48 @@
+using TelegramBotBase.Attributes;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+
+namespace AsyncFormUpdates.Forms;
+
+public class AsyncFormEdit : FormBase
+{
+    [SaveState] private int _counter;
+
+    private int _messageId;
+
+    public override Task Load(MessageResult message)
+    {
+        _counter++;
+        return Task.CompletedTask;
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        await message.ConfirmAction();
+
+        switch (message.RawData ?? "")
+        {
+            case "back":
+                var st = new Start();
+                await NavigateTo(st);
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var bf = new ButtonForm();
+        bf.AddButtonRow("Back", "back");
+
+        if (_messageId != 0)
+        {
+            await Device.Edit(_messageId, $"Your current count is at: {_counter}", bf);
+        }
+        else
+        {
+            var m = await Device.Send($"Your current count is at: {_counter}", bf, disableNotification: true);
+            _messageId = m.MessageId;
+        }
+    }
+}

Examples/AsyncFormUpdates/Forms/AsyncFormUpdate.cs

@@ -0,0 +1,38 @@
+using TelegramBotBase.Attributes;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+
+namespace AsyncFormUpdates.Forms;
+
+public class AsyncFormUpdate : AutoCleanForm
+{
+    [SaveState] private int _counter;
+
+    public override Task Load(MessageResult message)
+    {
+        _counter++;
+        return Task.CompletedTask;
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        await message.ConfirmAction();
+
+        switch (message.RawData ?? "")
+        {
+            case "back":
+                var st = new Start();
+                await NavigateTo(st);
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var bf = new ButtonForm();
+        bf.AddButtonRow("Back", "back");
+
+        await Device.Send($"Your current count is at: {_counter}", bf, disableNotification: true);
+    }
+}

Examples/AsyncFormUpdates/Forms/Start.cs

@@ -0,0 +1,42 @@
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+
+namespace AsyncFormUpdates.Forms;
+
+public class Start : AutoCleanForm
+{
+    public override async Task Action(MessageResult message)
+    {
+        await message.ConfirmAction();
+
+        switch (message.RawData ?? "")
+        {
+            case "async":
+
+                var afe = new AsyncFormEdit();
+                await NavigateTo(afe);
+
+
+                break;
+
+            case "async_del":
+
+                var afu = new AsyncFormUpdate();
+                await NavigateTo(afu);
+
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var bf = new ButtonForm();
+
+        bf.AddButtonRow("Open Async Form with AutoCleanupForm", "async_del");
+
+        bf.AddButtonRow("Open Async Form with Edit", "async");
+
+        await Device.Send("Choose your option", bf);
+    }
+}

Examples/AsyncFormUpdates/Program.cs

@@ -1,48 +1,47 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Timers;
+using System.Timers;
+using AsyncFormUpdates.Forms;
+using TelegramBotBase;
+using TelegramBotBase.Builder;
+using Timer = System.Timers.Timer;
 
-namespace AsyncFormUpdates
+namespace AsyncFormUpdates;
+
+internal class Program
 {
-    class Program
+    private static BotBase __bot;
+
+    private static async Task Main(string[] args)
     {
-        static TelegramBotBase.BotBase<forms.Start> bot = null;
+        __bot = BotBaseBuilder.Create()
+                              .QuickStart<Start>(Environment.GetEnvironmentVariable("API_KEY") ??
+                                                 throw new Exception("API_KEY is not set"))
+                              .Build();
 
-        static void Main(string[] args)
+        await __bot.Start();
+
+        var timer = new Timer(5000);
+
+        timer.Elapsed += Timer_Elapsed;
+        timer.Start();
+
+        Console.ReadLine();
+
+        timer.Stop();
+        await __bot.Stop();
+    }
+
+    private static async void Timer_Elapsed(object sender, ElapsedEventArgs e)
+    {
+        foreach (var s in __bot.Sessions.SessionList)
         {
-            String apiKey = "APIKey";
-
-            bot = new TelegramBotBase.BotBase<forms.Start>(apiKey);
-
-            bot.Start();
-
-            var timer = new Timer(5000);
-
-            timer.Elapsed += Timer_Elapsed;
-            timer.Start();
-
-            Console.ReadLine();
-
-            timer.Stop();
-            bot.Stop();
-        }
-
-        private static async void Timer_Elapsed(object sender, ElapsedEventArgs e)
-        {
-            
-            foreach(var s in bot.Sessions.SessionList)
+            //Only for AsyncUpdateForm
+            if (s.Value.ActiveForm.GetType() != typeof(AsyncFormUpdate) &&
+                s.Value.ActiveForm.GetType() != typeof(AsyncFormEdit))
             {
-                //Only for AsyncUpdateForm
-                if (s.Value.ActiveForm.GetType() != typeof(forms.AsyncFormUpdate) && s.Value.ActiveForm.GetType() != typeof(forms.AsyncFormEdit))
-                    continue;
-
-                await bot.InvokeMessageLoop(s.Key);
+                continue;
             }
 
-
+            await __bot.InvokeMessageLoop(s.Key);
         }
     }
 }

Examples/AsyncFormUpdates/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("AsyncFormUpdates")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("AsyncFormUpdates")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
-// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("673a56f5-6110-4aed-a68d-562fd6ed3ea6")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-// indem Sie "*" wie unten gezeigt eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

Examples/AsyncFormUpdates/forms/AsyncFormEdit.cs

@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Attributes;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-
-namespace AsyncFormUpdates.forms
-{
-    public class AsyncFormEdit : FormBase
-    {
-        [SaveState]
-        int counter = 0;
-
-        int MessageId = 0;
-
-        public override async Task Load(MessageResult message)
-        {
-            counter++;
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            await message.ConfirmAction("");
-
-            switch (message.RawData ?? "")
-            {
-                case "back":
-
-                    var st = new Start();
-                    await NavigateTo(st);
-
-                    break;
-            }
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            var bf = new ButtonForm();
-            bf.AddButtonRow("Back", "back");
-
-            if (MessageId != 0)
-            {
-                await Device.Edit(MessageId, $"Your current count is at: {counter}", bf);
-            }
-            else
-            {
-                var m = await Device.Send($"Your current count is at: {counter}", bf, disableNotification: true);
-                MessageId = m.MessageId;
-            }
-
-        }
-
-    }
-}

Examples/AsyncFormUpdates/forms/AsyncFormUpdate.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Attributes;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-
-namespace AsyncFormUpdates.forms
-{
-    public class AsyncFormUpdate : AutoCleanForm
-    {
-        [SaveState]
-        int counter = 0;
-
-
-        public override async Task Load(MessageResult message)
-        {
-            counter++;
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            await message.ConfirmAction("");
-
-            switch (message.RawData ?? "")
-            {
-                case "back":
-
-                    var st = new Start();
-                    await NavigateTo(st);
-
-                    break;
-            }
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            var bf = new ButtonForm();
-            bf.AddButtonRow("Back", "back");
-
-            await Device.Send($"Your current count is at: {counter}", bf, disableNotification: true);
-        }
-
-
-    }
-}

Examples/AsyncFormUpdates/forms/Start.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-
-namespace AsyncFormUpdates.forms
-{
-    public class Start : AutoCleanForm
-    {
-
-
-        public override async Task Action(MessageResult message)
-        {
-            await message.ConfirmAction("");
-
-            switch (message.RawData ?? "")
-            {
-                case "async":
-
-                    var afe = new AsyncFormEdit();
-                    await NavigateTo(afe);
-
-
-                    break;
-
-                case "async_del":
-
-                    var afu = new AsyncFormUpdate();
-                    await NavigateTo(afu);
-
-
-                    break;
-            }
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            var bf = new ButtonForm();
-
-            bf.AddButtonRow("Open Async Form with AutoCleanupForm", "async_del");
-
-            bf.AddButtonRow("Open Async Form with Edit", "async");
-
-            await Device.Send("Choose your option", bf);
-        }
-
-    }
-}

Examples/AsyncFormUpdates/packages.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net472" />
-  <package id="System.Net.Requests" version="4.3.0" targetFramework="net472" />
-  <package id="Telegram.Bot" version="15.7.1" targetFramework="net472" />
-</packages>

Examples/EFCoreBot/Database/BotDbContext.cs

@@ -0,0 +1,12 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace EFCoreBot.Database;
+
+public class BotDbContext : DbContext
+{
+    public BotDbContext(DbContextOptions options) : base(options)
+    {
+    }
+
+    public DbSet<User> Users { get; set; }
+}

Examples/EFCoreBot/Database/User.cs

@@ -0,0 +1,7 @@
+namespace EFCoreBot.Database;
+
+public class User
+{
+    public long Id { get; set; }
+    public string LastMessage { get; set; }
+}

Examples/EFCoreBot/EFCoreBot.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
+    </ItemGroup>
+
+</Project>

Examples/EFCoreBot/Program.cs

@@ -0,0 +1,24 @@
+using EFCoreBot;
+using EFCoreBot.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using TelegramBotBase.Builder;
+
+var serviceCollection = new ServiceCollection()
+    .AddDbContext<BotDbContext>(x => x.UseInMemoryDatabase("TelegramBotBase"));
+
+var serviceProvider = serviceCollection.BuildServiceProvider();
+
+var bot = BotBaseBuilder.Create()
+                        .WithAPIKey(Environment.GetEnvironmentVariable("API_KEY") ??
+                                    throw new Exception("API_KEY is not set"))
+                        .DefaultMessageLoop()
+                        .WithServiceProvider<StartForm>(serviceProvider)
+                        .NoProxy()
+                        .NoCommands()
+                        .NoSerialization()
+                        .DefaultLanguage()
+                        .Build();
+
+await bot.Start();
+await Task.Delay(-1);

Examples/EFCoreBot/StartForm.cs

@@ -0,0 +1,36 @@
+using EFCoreBot.Database;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+
+namespace EFCoreBot;
+
+public class StartForm : FormBase
+{
+    private readonly BotDbContext _dbContext;
+
+    public StartForm(BotDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public override async Task Load(MessageResult message)
+    {
+        var user = await _dbContext.Users.FindAsync(Device.DeviceId);
+        if (user is null)
+        {
+            user = new User
+            {
+                Id = Device.DeviceId,
+                LastMessage = "<unknown>"
+            };
+
+            _dbContext.Users.Add(user);
+            await _dbContext.SaveChangesAsync();
+        }
+
+        await Device.Send($"Your last message's text was: `{user.LastMessage}`");
+
+        user.LastMessage = string.IsNullOrWhiteSpace(message.MessageText) ? "<unknown>" : message.MessageText;
+        await _dbContext.SaveChangesAsync();
+    }
+}

Examples/JoinHiderBot/Forms/GroupManageForm.cs

@@ -0,0 +1,21 @@
+using Telegram.Bot.Types.Enums;
+using TelegramBotBase.Args;
+using TelegramBotBase.Form;
+
+namespace JoinHiderBot.Forms;
+
+public class GroupManageForm : GroupForm
+{
+    public override async Task OnMemberChanges(MemberChangeEventArgs e)
+    {
+        if (e.Type != MessageType.ChatMembersAdded && e.Type != MessageType.ChatMemberLeft)
+        {
+            return;
+        }
+
+
+        var m = e.Result.Message;
+
+        await Device.DeleteMessage(m);
+    }
+}

Examples/JoinHiderBot/Forms/Start.cs

@@ -0,0 +1,23 @@
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+
+namespace JoinHiderBot.Forms;
+
+public class Start : SplitterForm
+{
+    public override async Task<bool> Open(MessageResult e)
+    {
+        await Device.Send("This bot works only in groups.");
+
+        return true;
+    }
+
+    public override async Task<bool> OpenGroup(MessageResult e)
+    {
+        var gmf = new GroupManageForm();
+
+        await NavigateTo(gmf);
+
+        return true;
+    }
+}

Examples/JoinHiderBot/JoinHiderBot.csproj

@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="TelegramBotBase" Version="3.1.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
+    </ItemGroup>
 
 </Project>

Examples/JoinHiderBot/Program.cs

@@ -1,19 +1,19 @@
-using System;
+using JoinHiderBot.Forms;
+using TelegramBotBase.Builder;
 
-namespace JoinHiderBot
+namespace JoinHiderBot;
+
+internal class Program
 {
-    class Program
+    private static async Task Main(string[] args)
     {
-        static void Main(string[] args)
-        {
+        var bot = BotBaseBuilder.Create()
+                                .QuickStart<Start>(Environment.GetEnvironmentVariable("API_KEY") ??
+                                                   throw new Exception("API_KEY is not set"))
+                                .Build();
 
-            String apiKey = "";
+        await bot.Start();
 
-            var bot = new TelegramBotBase.BotBase<forms.Start>(apiKey);
-
-            bot.Start();
-
-            Console.ReadLine();
-        }
+        Console.ReadLine();
     }
 }

Examples/JoinHiderBot/forms/GroupManageForm.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Args;
-using TelegramBotBase.Form;
-
-namespace JoinHiderBot.forms
-{
-    public class GroupManageForm : GroupForm
-    {
-
-        public override async Task OnMemberChanges(MemberChangeEventArgs e)
-        {
-            if (e.Type != Telegram.Bot.Types.Enums.MessageType.ChatMembersAdded && e.Type != Telegram.Bot.Types.Enums.MessageType.ChatMemberLeft)
-                return;
-
-
-            var m = e.Result.Message;
-
-            await this.Device.DeleteMessage(m);
-        }
-
-    }
-}

Examples/JoinHiderBot/forms/Start.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-
-namespace JoinHiderBot.forms
-{
-    public class Start :  SplitterForm
-    {
-        public override async Task<bool> Open(MessageResult e)
-        {
-            await this.Device.Send("This bot works only in groups.");
-
-            return true;
-        }
-
-        public override async Task<bool> OpenGroup(MessageResult e)
-        {
-            var gmf = new GroupManageForm();
-
-            await this.NavigateTo(gmf);
-
-            return true;
-        }
-
-    }
-}

Examples/SystemCommandsBot/Command.cs

@@ -0,0 +1,21 @@
+namespace SystemCommandsBot;
+
+public class Command
+{
+    public int Id { get; set; }
+
+    public string Title { get; set; }
+
+    public string ShellCmd { get; set; }
+
+    public bool Enabled { get; set; } = true;
+
+    public string Action { get; set; }
+
+    public bool UseShell { get; set; } = true;
+
+
+    public int? MaxInstances { get; set; }
+
+    public string ProcName { get; set; }
+}

Examples/SystemCommandsBot/Config.cs

@@ -0,0 +1,90 @@
+using Newtonsoft.Json;
+
+namespace SystemCommandsBot;
+
+public class Config
+{
+    public Config()
+    {
+        Commands = new List<Command>();
+    }
+
+    public string Password { get; set; }
+
+    public string ApiKey { get; set; }
+
+    public List<Command> Commands { get; set; }
+
+    public void LoadDefaultValues()
+    {
+        ApiKey = "";
+        Commands.Add(new Command
+        {
+            Id = 0, Enabled = true, Title = "Test Befehl", ShellCmd = "explorer.exe", Action = "start",
+            MaxInstances = 2
+        });
+    }
+
+
+    public static Config Load()
+    {
+        try
+        {
+            return Load(AppContext.BaseDirectory + "config\\default.cfg");
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message);
+        }
+
+        return null;
+    }
+
+
+    public static Config Load(string path)
+    {
+        try
+        {
+            var cfg = JsonConvert.DeserializeObject<Config>(File.ReadAllText(path));
+            return cfg;
+        }
+        catch (DirectoryNotFoundException)
+        {
+            var di = new DirectoryInfo(path);
+
+            if (!Directory.Exists(di.Parent.FullName))
+            {
+                Directory.CreateDirectory(di.Parent.FullName);
+            }
+
+            var cfg = new Config();
+            cfg.LoadDefaultValues();
+            cfg.Save(path);
+            return cfg;
+        }
+        catch (FileNotFoundException)
+        {
+            var cfg = new Config();
+            cfg.LoadDefaultValues();
+            cfg.Save(path);
+            return cfg;
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex.Message);
+        }
+
+        return null;
+    }
+
+    public void Save(string path)
+    {
+        try
+        {
+            File.WriteAllText(path, JsonConvert.SerializeObject(this));
+        }
+        catch
+        {
+        }
+    }
+}

Examples/SystemCommandsBot/Forms/CmdForm.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+
+namespace SystemCommandsBot.Forms;
+
+public class CmdForm : AutoCleanForm
+{
+    public DateTime ExpiresAt { get; set; }
+
+    public int? MessageId { get; set; }
+
+    public override Task Load(MessageResult message)
+    {
+        return Task.CompletedTask;
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        var btn = message.RawData;
+
+        var id = -1;
+
+        if (!int.TryParse(btn, out id))
+        {
+            return;
+        }
+
+        var cmd = Program.BotConfig.Commands.Where(a => a.Enabled && a.Id == id).FirstOrDefault();
+        if (cmd == null)
+        {
+            await Device.Send("Cmd nicht verfügbar.");
+            return;
+        }
+
+        message.Handled = true;
+
+        switch (cmd.Action)
+        {
+            case "start":
+
+                var fi = new FileInfo(cmd.ShellCmd);
+
+                if (cmd.MaxInstances != null && cmd.MaxInstances >= 0)
+                {
+                    if (Process.GetProcessesByName(cmd.ProcName).Count() >= cmd.MaxInstances)
+                    {
+                        await Device.Send("Anwendung läuft bereits.");
+                        await message.ConfirmAction("Anwendung läuft bereits.");
+
+                        return;
+                    }
+                }
+
+                var psi = new ProcessStartInfo
+                {
+                    FileName = cmd.ShellCmd,
+                    WorkingDirectory = fi.DirectoryName,
+                    UseShellExecute = cmd.UseShell
+                };
+
+                Process.Start(psi);
+
+                await Device.Send(fi.Name + " wurde gestarted.");
+
+                await message.ConfirmAction(fi.Name + " wurde gestarted.");
+
+                break;
+
+            case "kill":
+
+                var fi2 = new FileInfo(cmd.ShellCmd);
+
+                var pros = fi2.Name.Replace(fi2.Extension, "");
+
+                var proc = Process.GetProcessesByName(pros).ToList();
+
+                foreach (var p in proc)
+                {
+                    try
+                    {
+                        p.Kill();
+                    }
+                    catch
+                    {
+                    }
+                }
+
+                await Device.Send(fi2.Name + " wurde beendet.");
+
+                await message.ConfirmAction(fi2.Name + " wurde beendet.");
+
+                break;
+
+            case "restart":
+
+                var fi3 = new FileInfo(cmd.ShellCmd);
+
+                var pros2 = fi3.Name.Replace(fi3.Extension, "");
+
+                var proc2 = Process.GetProcessesByName(pros2).ToList();
+
+                foreach (var p in proc2)
+                {
+                    try
+                    {
+                        p.Kill();
+                    }
+                    catch
+                    {
+                    }
+                }
+
+                var fi4 = new FileInfo(cmd.ShellCmd);
+
+                var psi2 = new ProcessStartInfo
+                {
+                    FileName = cmd.ShellCmd,
+                    WorkingDirectory = fi4.DirectoryName
+                };
+                psi2.FileName = cmd.ShellCmd;
+                psi2.UseShellExecute = cmd.UseShell;
+
+                Process.Start(psi2);
+
+                await Device.Send(fi3.Name + " wurde neugestarted.");
+                await message.ConfirmAction(fi3.Name + " wurde neugestarted.");
+
+
+                break;
+
+            default:
+
+                await message.ConfirmAction();
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        if (MessageId == null)
+        {
+            var buttons = Program.BotConfig.Commands.Where(a => a.Enabled)
+                                 .Select(a => new ButtonBase(a.Title, a.Id.ToString()));
+
+            var bf = new ButtonForm();
+            bf.AddSplitted(buttons, 1);
+            await Device.Send("Deine Optionen", bf);
+        }
+    }
+}

Examples/SystemCommandsBot/Forms/StartForm.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Threading.Tasks;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+
+namespace SystemCommandsBot.Forms;
+
+public class StartForm : FormBase
+{
+    public string Password { get; set; }
+
+    public override Task Load(MessageResult message)
+    {
+        var inp = message.MessageText;
+        if (Program.BotConfig.Password == inp)
+        {
+            Password = inp;
+        }
+
+        return Task.CompletedTask;
+    }
+
+
+    public override async Task Render(MessageResult message)
+    {
+        if (Password == null || Password.Trim() == "")
+        {
+            await Device.Send("Bitte gib dein Passwort an.");
+            return;
+        }
+
+
+        var cmd = new CmdForm();
+        cmd.ExpiresAt = DateTime.Now.AddDays(14);
+
+        await NavigateTo(cmd);
+    }
+}

Examples/SystemCommandsBot/Program.cs

@@ -1,36 +1,35 @@
 using System;
+using System.Threading.Tasks;
+using SystemCommandsBot.Forms;
+using TelegramBotBase.Builder;
 
-namespace SystemCommandsBot
+namespace SystemCommandsBot;
+
+internal class Program
 {
-    class Program
+    public static Config BotConfig { get; set; }
+
+    private static async Task Main(string[] args)
     {
-        public static config.Config BotConfig { get; set; }
+        BotConfig = Config.Load();
 
-
-        static void Main(string[] args)
+        if (BotConfig.ApiKey == null || BotConfig.ApiKey.Trim() == "")
         {
-
-            BotConfig = config.Config.load();
-
-            if (BotConfig.ApiKey == null || BotConfig.ApiKey.Trim() == "")
-            {
-                Console.WriteLine("Config created...");
-                Console.ReadLine();
-                return;
-            }
-
-            var bot = new TelegramBotBase.BotBase<forms.StartForm>(BotConfig.ApiKey);
-
-            bot.Start();
-
-            Console.WriteLine("Bot started");
-
+            Console.WriteLine("Config created...");
             Console.ReadLine();
-
-
-            bot.Stop();
-
-
+            return;
         }
+
+        var bot = BotBaseBuilder.Create()
+                                .QuickStart<StartForm>(BotConfig.ApiKey)
+                                .Build();
+
+        await bot.Start();
+
+        Console.WriteLine("Bot started");
+        Console.ReadLine();
+
+
+        await bot.Stop();
     }
 }

Examples/SystemCommandsBot/SystemCommandsBot.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="TelegramBotBase" Version="3.1.1" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
+    </ItemGroup>
 
-</Project>
+</Project>

Examples/SystemCommandsBot/commands/Commando.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace SystemCommandsBot.commands
-{
-    public class Commando
-    {
-        public int ID { get; set; }
-
-        public String Title { get; set; }
-
-        public String ShellCmd { get; set; }
-
-        public bool Enabled { get; set; } = true;
-
-        public String Action { get; set; }
-
-        public bool UseShell { get; set; } = true;
-
-
-        public int? MaxInstances { get; set; }
-
-        public String ProcName
-        {
-            get;set;
-        }
-    }
-}

Examples/SystemCommandsBot/config/Config.cs

@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace SystemCommandsBot.config
-{
-    public class Config
-    {
-        public String Password { get; set; }
-
-        public String ApiKey { get; set; }
-
-        public List<commands.Commando> Commandos { get; set; }
-
-
-        public Config()
-        {
-            this.Commandos = new List<commands.Commando>();
-        }
-
-        public void loadDefaultValues()
-        {
-            this.ApiKey = "";
-            this.Commandos.Add(new commands.Commando() { ID = 0, Enabled = true, Title = "Test Befehl", ShellCmd = "explorer.exe", Action = "start", MaxInstances = 2 });
-        }
-
-
-        public static Config load()
-        {
-            try
-            {
-                return load(AppContext.BaseDirectory + "config\\default.cfg");
-
-                
-            }
-            catch(Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-            return null;
-        }
-
-
-        public static Config load(String path)
-        {
-            try
-            {
-                var cfg = Newtonsoft.Json.JsonConvert.DeserializeObject<Config>(File.ReadAllText(path)) as Config;
-                return cfg;
-            }
-            catch (DirectoryNotFoundException ex)
-            {
-                DirectoryInfo di = new DirectoryInfo(path);
-
-                if (!Directory.Exists(di.Parent.FullName))
-                {
-                    Directory.CreateDirectory(di.Parent.FullName);
-                }
-
-                var cfg = new Config();
-                cfg.loadDefaultValues();
-                cfg.save(path);
-                return cfg;
-            }
-            catch (FileNotFoundException ex)
-            {
-                var cfg = new Config();
-                cfg.loadDefaultValues();
-                cfg.save(path);
-                return cfg;
-            }
-            catch(Exception ex)
-            {
-                Console.WriteLine(ex.Message);
-            }
-            return null;
-        }
-
-        public void save(String path)
-        {
-            try
-            {
-                File.WriteAllText(path, Newtonsoft.Json.JsonConvert.SerializeObject(this));
-            }
-            catch
-            {
-
-            }
-        }
-    }
-}

Examples/SystemCommandsBot/forms/CmdForm.cs

@@ -1,172 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-
-namespace SystemCommandsBot.forms
-{
-    public class CmdForm : TelegramBotBase.Form.AutoCleanForm
-    {
-        public DateTime ExpiresAt { get; set; }
-
-        public int? MessageId { get; set; }
-
-        public override async Task Load(MessageResult message)
-        {
-
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            var btn = message.RawData;
-
-            int id = -1;
-
-            if (!int.TryParse(btn, out id))
-            {
-
-                return;
-            }
-
-            var cmd = Program.BotConfig.Commandos.Where(a => a.Enabled && a.ID == id).FirstOrDefault();
-            if (cmd == null)
-            {
-                await this.Device.Send("Cmd nicht verfügbar.");
-                return;
-            }
-
-            message.Handled = true;
-
-            switch (cmd.Action)
-            {
-                case "start":
-
-                    FileInfo fi = new FileInfo(cmd.ShellCmd);
-
-                    if (cmd.MaxInstances != null && cmd.MaxInstances >= 0)
-                    {
-
-                        if (Process.GetProcessesByName(cmd.ProcName).Count() >= cmd.MaxInstances)
-                        {
-                            await this.Device.Send("Anwendung läuft bereits.");
-                            await message.ConfirmAction("Anwendung läuft bereits.");
-
-                            return;
-                        }
-
-                    }
-
-                    ProcessStartInfo psi = new ProcessStartInfo();
-                    psi.FileName = cmd.ShellCmd;
-                    psi.WorkingDirectory = fi.DirectoryName;
-                    psi.UseShellExecute = cmd.UseShell;
-
-                    Process.Start(psi);
-
-                    await this.Device.Send(fi.Name + " wurde gestarted.");
-
-                    await message.ConfirmAction(fi.Name + " wurde gestarted.");
-
-                    break;
-
-                case "kill":
-
-                    FileInfo fi2 = new FileInfo(cmd.ShellCmd);
-
-                    String pros = fi2.Name.Replace(fi2.Extension, "");
-
-                    var proc = Process.GetProcessesByName(pros).ToList();
-
-                    foreach (var p in proc)
-                    {
-                        try
-                        {
-                            p.Kill();
-                        }
-                        catch
-                        {
-
-                        }
-                    }
-
-                    await this.Device.Send(fi2.Name + " wurde beendet.");
-
-                    await message.ConfirmAction(fi2.Name + " wurde beendet.");
-
-                    break;
-
-                case "restart":
-
-                    FileInfo fi3 = new FileInfo(cmd.ShellCmd);
-
-                    String pros2 = fi3.Name.Replace(fi3.Extension, "");
-
-                    var proc2 = Process.GetProcessesByName(pros2).ToList();
-
-                    foreach (var p in proc2)
-                    {
-                        try
-                        {
-                            p.Kill();
-                        }
-                        catch
-                        {
-
-                        }
-                    }
-
-                    FileInfo fi4 = new FileInfo(cmd.ShellCmd);
-
-                    ProcessStartInfo psi2 = new ProcessStartInfo();
-                    psi2.FileName = cmd.ShellCmd;
-                    psi2.WorkingDirectory = fi4.DirectoryName;
-                    psi2.FileName = cmd.ShellCmd;
-                    psi2.UseShellExecute = cmd.UseShell;
-
-                    Process.Start(psi2);
-
-                    await this.Device.Send(fi3.Name + " wurde neugestarted.");
-                    await message.ConfirmAction(fi3.Name + " wurde neugestarted.");
-
-
-                    break;
-
-                default:
-
-                    await message.ConfirmAction();
-
-                    break;
-
-            }
-
-
-
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            if (this.MessageId == null)
-            {
-                var buttons = Program.BotConfig.Commandos.Where(a => a.Enabled).Select(a => new ButtonBase(a.Title, a.ID.ToString()));
-
-                ButtonForm bf = new ButtonForm();
-                bf.AddSplitted(buttons, 1);
-                await this.Device.Send("Deine Optionen", bf);
-
-                return;
-            }
-
-
-        }
-
-
-
-
-    }
-}

Examples/SystemCommandsBot/forms/StartForm.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
-
-namespace SystemCommandsBot.forms
-{
-    public class StartForm : TelegramBotBase.Form.FormBase
-    {
-        public String Password { get; set; }
-
-        public override async Task Load(MessageResult message)
-        {
-            var inp = message.MessageText;
-            if (Program.BotConfig.Password == inp)
-            {
-                this.Password = inp;
-            }
-
-
-        }
-
-
-        public override async Task Render(MessageResult message)
-        {
-            if (this.Password == null || this.Password.Trim() == "")
-            {
-                await this.Device.Send("Bitte gib dein Passwort an.");
-                return;
-            }
-
-
-            var cmd = new forms.CmdForm();
-            cmd.ExpiresAt = DateTime.Now.AddDays(14);
-
-            await this.NavigateTo(cmd);
-
-        }
-
-    }
-}

TelegramBotBase.Extensions.Images/ImageExtensions.cs

@@ -1,12 +1,11 @@
-using System;
-using System.Drawing;
+using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Threading.Tasks;
-using Telegram.Bot.Types.InputFiles;
 using Telegram.Bot.Types;
-using TelegramBotBase.Sessions;
+using Telegram.Bot.Types.InputFiles;
 using TelegramBotBase.Form;
+using TelegramBotBase.Sessions;
 
 namespace TelegramBotBase.Extensions.Images
 {
@@ -14,14 +13,14 @@ namespace TelegramBotBase.Extensions.Images
     {
         public static Stream ToStream(this Image image, ImageFormat format)
         {
-            var stream = new System.IO.MemoryStream();
+            var stream = new MemoryStream();
             image.Save(stream, format);
             stream.Position = 0;
             return stream;
         }
 
         /// <summary>
-        /// Sends an image
+        ///     Sends an image
         /// </summary>
         /// <param name="image"></param>
         /// <param name="name"></param>
@@ -29,18 +28,20 @@ namespace TelegramBotBase.Extensions.Images
         /// <param name="replyTo"></param>
         /// <param name="disableNotification"></param>
         /// <returns></returns>
-        public static async Task<Message> SendPhoto(this DeviceSession session, Image image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
+        public static async Task<Message> SendPhoto(this DeviceSession session, Image image, string name,
+                                                    string caption, ButtonForm buttons = null, int replyTo = 0,
+                                                    bool disableNotification = false)
         {
             using (var fileStream = ToStream(image, ImageFormat.Png))
             {
-                InputOnlineFile fts = new InputOnlineFile(fileStream, name);
+                var fts = new InputOnlineFile(fileStream, name);
 
-                return await session.SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
+                return await session.SendPhoto(fts, caption, buttons, replyTo, disableNotification);
             }
         }
 
         /// <summary>
-        /// Sends an image
+        ///     Sends an image
         /// </summary>
         /// <param name="image"></param>
         /// <param name="name"></param>
@@ -48,14 +49,16 @@ namespace TelegramBotBase.Extensions.Images
         /// <param name="replyTo"></param>
         /// <param name="disableNotification"></param>
         /// <returns></returns>
-        public static async Task<Message> SendPhoto(this DeviceSession session, Bitmap image, String name, String caption, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false)
+        public static async Task<Message> SendPhoto(this DeviceSession session, Bitmap image, string name,
+                                                    string caption, ButtonForm buttons = null, int replyTo = 0,
+                                                    bool disableNotification = false)
         {
             using (var fileStream = ToStream(image, ImageFormat.Png))
             {
-                InputOnlineFile fts = new InputOnlineFile(fileStream, name);
+                var fts = new InputOnlineFile(fileStream, name);
 
-                return await session.SendPhoto(fts, caption: caption, buttons, replyTo, disableNotification);
+                return await session.SendPhoto(fts, caption, buttons, replyTo, disableNotification);
             }
         }
     }
-}
+}

TelegramBotBase.Extensions.Images/README.md

@@ -1,8 +1,7 @@
 # TelegramBotBase.Extensions.Images
 
 [![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Images.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
-[![telegram chat](https://img.shields.io/badge/Support_Chat-Telegram-blue.svg?style=flat-square)](https://www.t.me/tgbotbase)
+[![Telegram chat](https://img.shields.io/badge/Support_Chat-Telegram-blue.svg?style=flat-square)](https://www.t.me/tgbotbase)
 
-
-[![license](https://img.shields.io/github/license/MajMcCloud/telegrambotframework.svg?style=flat-square&maxAge=2592000&label=License)](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
-[![downloads](https://img.shields.io/nuget/dt/TelegramBotBase.Extensions.Images.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images)
+[![License](https://img.shields.io/github/license/MajMcCloud/telegrambotframework.svg?style=flat-square&maxAge=2592000&label=License)](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
+[![Package Downloads](https://img.shields.io/nuget/dt/TelegramBotBase.Extensions.Images.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images)

TelegramBotBase.Extensions.Images/TelegramBotBase.Extensions.Images.csproj

@@ -1,25 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net5;netcoreapp3.1;net6</TargetFrameworks>
-		<RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
-		<PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
-		<Copyright>MIT</Copyright>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;net5;netcoreapp3.1;net6</TargetFrameworks>
+        <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
+        <Copyright>MIT</Copyright>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-		<PackageReference Include="Telegram.Bot" Version="17.0.0" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="System.Drawing.Common" Version="6.0.0"/>
+    </ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj"/>
+    </ItemGroup>
 
-</Project>
+</Project>

TelegramBotBase.Extensions.Serializer.Database.MSSQL/BotBaseBuilderExtensions.cs

@@ -0,0 +1,82 @@
+using System;
+using TelegramBotBase.Builder;
+using TelegramBotBase.Builder.Interfaces;
+
+namespace TelegramBotBase.Extensions.Serializer.Database.MSSQL
+{
+    public static class BotBaseBuilderExtensions
+    {
+        /// <summary>
+        ///     Uses an Microsoft SQL Server Database to save and restore sessions.
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="connectionString"></param>
+        /// <param name="tablePrefix"></param>
+        /// <param name="fallbackForm"></param>
+        /// <returns></returns>
+        public static ILanguageSelectionStage UseSqlDatabase(this ISessionSerializationStage builder,
+                                                             string connectionString, Type fallbackForm = null,
+                                                             string tablePrefix = "tgb_")
+        {
+            var serializer = new MssqlSerializer(connectionString, tablePrefix, fallbackForm);
+
+            builder.UseSerialization(serializer);
+
+            return builder as BotBaseBuilder;
+        }
+
+
+        /// <summary>
+        ///     Uses an Microsoft SQL Server Database to save and restore sessions.
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="hostOrIP"></param>
+        /// <param name="userId"></param>
+        /// <param name="password"></param>
+        /// <param name="databaseName"></param>
+        /// <param name="tablePrefix"></param>
+        /// <param name="fallbackForm"></param>
+        /// <returns></returns>
+        public static ILanguageSelectionStage UseSqlDatabase(this ISessionSerializationStage builder, string hostOrIP,
+                                                             string databaseName, string userId, string password,
+                                                             Type fallbackForm = null, string tablePrefix = "tgb_")
+        {
+            var connectionString =
+                $"Server={hostOrIP}; Database={databaseName}; User Id={userId}; Password={password}; TrustServerCertificate=true;";
+
+            var serializer = new MssqlSerializer(connectionString, tablePrefix, fallbackForm);
+
+            builder.UseSerialization(serializer);
+
+            return builder as BotBaseBuilder;
+        }
+
+        /// <summary>
+        ///     Uses an Microsoft SQL Server Database with Windows Authentication to save and restore sessions.
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <param name="hostOrIP"></param>
+        /// <param name="databaseName"></param>
+        /// <param name="tablePrefix"></param>
+        /// <param name="fallbackForm"></param>
+        /// <returns></returns>
+        public static ILanguageSelectionStage UseSqlDatabase(this ISessionSerializationStage builder, string hostOrIP,
+                                                             string databaseName, bool integratedSecurity = true,
+                                                             Type fallbackForm = null, string tablePrefix = "tgb_")
+        {
+            if (!integratedSecurity)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+
+            var connectionString =
+                $"Server={hostOrIP}; Database={databaseName}; Integrated Security=true; TrustServerCertificate=true;";
+
+            var serializer = new MssqlSerializer(connectionString, tablePrefix, fallbackForm);
+
+            builder.UseSerialization(serializer);
+
+            return builder as BotBaseBuilder;
+        }
+    }
+}

TelegramBotBase.Extensions.Serializer.Database.MSSQL/MSSQLSerializer.cs

@@ -0,0 +1,183 @@
+using System;
+using System.Data;
+using Microsoft.Data.SqlClient;
+using Newtonsoft.Json;
+using TelegramBotBase.Args;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+using TelegramBotBase.Interfaces;
+
+namespace TelegramBotBase.Extensions.Serializer.Database.MSSQL
+{
+    public class MssqlSerializer : IStateMachine
+    {
+        /// <summary>
+        ///     Will initialize the state machine.
+        /// </summary>
+        /// <param name="file">Path of the file and name where to save the session details.</param>
+        /// <param name="fallbackStateForm">
+        ///     Type of Form which will be saved instead of Form which has
+        ///     <seealso cref="Attributes.IgnoreState" /> attribute declared. Needs to be subclass of
+        ///     <seealso cref="Form.FormBase" />.
+        /// </param>
+        /// <param name="overwrite">Declares of the file could be overwritten.</param>
+        public MssqlSerializer(string connectionString, string tablePrefix = "tgb_", Type fallbackStateForm = null)
+        {
+            ConnectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString));
+
+            TablePrefix = tablePrefix;
+
+            FallbackStateForm = fallbackStateForm;
+
+            if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
+            {
+                throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
+            }
+        }
+
+        public string ConnectionString { get; }
+        public string TablePrefix { get; set; }
+        public Type FallbackStateForm { get; set; }
+
+        public StateContainer LoadFormStates()
+        {
+            var sc = new StateContainer();
+
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                connection.Open();
+
+                var command = connection.CreateCommand();
+                command.CommandText = "SELECT deviceId, deviceTitle, FormUri, QualifiedName FROM " + TablePrefix +
+                                      "devices_sessions";
+
+                var dataTable = new DataTable();
+                using (var dataAdapter = new SqlDataAdapter(command))
+                {
+                    dataAdapter.Fill(dataTable);
+
+                    foreach (DataRow r in dataTable.Rows)
+                    {
+                        var se = new StateEntry
+                        {
+                            DeviceId = (long)r["deviceId"],
+                            ChatTitle = r["deviceTitle"].ToString(),
+                            FormUri = r["FormUri"].ToString(),
+                            QualifiedName = r["QualifiedName"].ToString()
+                        };
+
+                        sc.States.Add(se);
+
+                        if (se.DeviceId > 0)
+                        {
+                            sc.ChatIds.Add(se.DeviceId);
+                        }
+                        else
+                        {
+                            sc.GroupIds.Add(se.DeviceId);
+                        }
+
+                        var command2 = connection.CreateCommand();
+                        command2.CommandText = "SELECT [key], value, type FROM " + TablePrefix +
+                                               "devices_sessions_data WHERE deviceId = @deviceId";
+                        command2.Parameters.Add(new SqlParameter("@deviceId", r["deviceId"]));
+
+                        var dataTable2 = new DataTable();
+                        using (var dataAdapter2 = new SqlDataAdapter(command2))
+                        {
+                            dataAdapter2.Fill(dataTable2);
+
+                            foreach (DataRow r2 in dataTable2.Rows)
+                            {
+                                var key = r2["key"].ToString();
+                                var type = Type.GetType(r2["type"].ToString());
+
+                                var value = JsonConvert.DeserializeObject(r2["value"].ToString(), type);
+
+                                se.Values.Add(key, value);
+                            }
+                        }
+                    }
+                }
+
+
+                connection.Close();
+            }
+
+            return sc;
+        }
+
+        public void SaveFormStates(SaveStatesEventArgs e)
+        {
+            var container = e.States;
+
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                connection.Open();
+
+                //Cleanup old Session data
+                var clearCommand = connection.CreateCommand();
+
+                clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions_data";
+
+                clearCommand.ExecuteNonQuery();
+
+                clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions";
+
+                clearCommand.ExecuteNonQuery();
+
+                //Prepare new session commands
+                var sessionCommand = connection.CreateCommand();
+                var dataCommand = connection.CreateCommand();
+
+                sessionCommand.CommandText = "INSERT INTO " + TablePrefix +
+                                             "devices_sessions (deviceId, deviceTitle, FormUri, QualifiedName) VALUES (@deviceId, @deviceTitle, @FormUri, @QualifiedName)";
+                sessionCommand.Parameters.Add(new SqlParameter("@deviceId", ""));
+                sessionCommand.Parameters.Add(new SqlParameter("@deviceTitle", ""));
+                sessionCommand.Parameters.Add(new SqlParameter("@FormUri", ""));
+                sessionCommand.Parameters.Add(new SqlParameter("@QualifiedName", ""));
+
+                dataCommand.CommandText = "INSERT INTO " + TablePrefix +
+                                          "devices_sessions_data (deviceId, [key], value, type) VALUES (@deviceId, @key, @value, @type)";
+                dataCommand.Parameters.Add(new SqlParameter("@deviceId", ""));
+                dataCommand.Parameters.Add(new SqlParameter("@key", ""));
+                dataCommand.Parameters.Add(new SqlParameter("@value", ""));
+                dataCommand.Parameters.Add(new SqlParameter("@type", ""));
+
+                //Store session data in database
+                foreach (var state in container.States)
+                {
+                    sessionCommand.Parameters["@deviceId"].Value = state.DeviceId;
+                    sessionCommand.Parameters["@deviceTitle"].Value = state.ChatTitle ?? "";
+                    sessionCommand.Parameters["@FormUri"].Value = state.FormUri;
+                    sessionCommand.Parameters["@QualifiedName"].Value = state.QualifiedName;
+
+                    sessionCommand.ExecuteNonQuery();
+
+                    foreach (var data in state.Values)
+                    {
+                        dataCommand.Parameters["@deviceId"].Value = state.DeviceId;
+                        dataCommand.Parameters["@key"].Value = data.Key;
+
+                        var type = data.Value.GetType();
+
+                        if (type.IsPrimitive || type.Equals(typeof(string)))
+                        {
+                            dataCommand.Parameters["@value"].Value = data.Value;
+                        }
+                        else
+                        {
+                            dataCommand.Parameters["@value"].Value = JsonConvert.SerializeObject(data.Value);
+                        }
+
+                        dataCommand.Parameters["@type"].Value = type.AssemblyQualifiedName;
+
+                        dataCommand.ExecuteNonQuery();
+                    }
+                }
+
+                connection.Close();
+            }
+        }
+    }
+}

TelegramBotBase.Extensions.Serializer.Database.MSSQL/README.md

@@ -0,0 +1,27 @@
+# TelegramBotBase.Extensions.Serializer.Database.MSSQL
+
+[![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Serializer.Database.MSSQL.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
+[![Telegram chat](https://img.shields.io/badge/Support_Chat-Telegram-blue.svg?style=flat-square)](https://www.t.me/tgbotbase)
+
+[![License](https://img.shields.io/github/license/MajMcCloud/telegrambotframework.svg?style=flat-square&maxAge=2592000&label=License)](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
+[![Package Downloads](https://img.shields.io/nuget/dt/TelegramBotBase.Extensions.Serializer.Database.MSSQL.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL)
+
+## How to use
+
+```csharp
+using TelegramBotBase.Extensions.Serializer.Database.MSSQL;
+
+
+var bot = BotBaseBuilder
+            .Create()
+            .WithAPIKey(APIKey)
+            .DefaultMessageLoop()
+            .WithStartForm<Start>()
+            .NoProxy()
+            .OnlyStart()
+            .UseSQLDatabase("localhost", "telegram_bot")
+            .UseEnglish()
+            .Build();
+
+bot.Start();
+```

TelegramBotBase.Extensions.Serializer.Database.MSSQL/TelegramBotBase.Extensions.Serializer.Database.MSSQL.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;net5;netcoreapp3.1;net6</TargetFrameworks>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
+        <Copyright>MIT</Copyright>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <AssemblyVersion>1.0.1</AssemblyVersion>
+        <FileVersion>1.0.1</FileVersion>
+        <Version>1.0.1</Version>
+        <Description>A session serializer for Microsoft SQL Server.
+        </Description>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj"/>
+    </ItemGroup>
+
+</Project>

TelegramBotBase.Extensions.Serializer.Database.MSSQL/create_tables.sql

@@ -0,0 +1,81 @@
+USE
+[telegram_bot]
+GO
+/****** Object:  Table [dbo].[tgb_devices_sessions]    Script Date: 30.06.2022 16:22:09 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[tgb_devices_sessions]
+(
+    [
+    deviceId] [
+    bigint]
+    NOT
+    NULL, [
+    deviceTitle] [
+    nvarchar]
+(
+    512
+) NOT NULL,
+    [FormUri] [nvarchar]
+(
+    512
+) NOT NULL,
+    [QualifiedName] [nvarchar]
+(
+    512
+) NOT NULL,
+    CONSTRAINT [PK_tgb_devices_sessions_1] PRIMARY KEY CLUSTERED
+(
+[
+    deviceId] ASC
+)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF)
+    ON [PRIMARY]
+    )
+    ON [PRIMARY]
+    GO
+/****** Object:  Table [dbo].[tgb_devices_sessions_data]    Script Date: 30.06.2022 16:22:09 ******/
+    SET ANSI_NULLS
+    ON
+    GO
+    SET QUOTED_IDENTIFIER
+    ON
+    GO
+CREATE TABLE [dbo].[tgb_devices_sessions_data]
+(
+    [
+    Id] [
+    uniqueidentifier]
+    NOT
+    NULL, [
+    deviceId] [
+    bigint]
+    NOT
+    NULL, [
+    key] [
+    nvarchar]
+(
+    512
+) NOT NULL,
+    [value] [nvarchar]
+(
+    max
+) NOT NULL,
+    [type] [nvarchar]
+(
+    512
+) NOT NULL,
+    CONSTRAINT [PK_tgb_devices_session_data] PRIMARY KEY CLUSTERED
+(
+[
+    Id] ASC
+)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF)
+    ON [PRIMARY]
+    )
+    ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+    GO
+ALTER TABLE [dbo].[tgb_devices_sessions_data] ADD CONSTRAINT [DF_tgb_devices_session_data_Id] DEFAULT (newid()) FOR [Id]
+    GO

TelegramBotBase.Test/App.config

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

TelegramBotBase.Test/Program.cs

@@ -1,109 +1,109 @@
 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;
-using TelegramBotBase.Commands;
+using TelegramBotBase.Args;
 using TelegramBotBase.Builder;
+using TelegramBotBase.Commands;
+using TelegramBotBase.Enums;
+using TelegramBotBase.Example.Tests;
 
-namespace TelegramBotBaseTest
+namespace TelegramBotBase.Example;
+
+internal class Program
 {
-    class Program
+    private static async Task Main(string[] args)
     {
-        static void Main(string[] args)
+        var bot = BotBaseBuilder
+                 .Create()
+                 .WithAPIKey(Environment.GetEnvironmentVariable("API_KEY") ??
+                             throw new Exception("API_KEY is not set"))
+                 .DefaultMessageLoop()
+                 .WithStartForm<Start>()
+                 .NoProxy()
+                 .CustomCommands(a =>
+                 {
+                     a.Start("Starts the bot");
+                     a.Add("myid", "Returns my Device ID");
+                     a.Help("Should show you some help");
+                     a.Settings("Should show you some settings");
+                     a.Add("form1", "Opens test form 1");
+                     a.Add("form2", "Opens test form 2");
+                     a.Add("params", "Returns all send parameters as a message.");
+                 })
+                 .NoSerialization()
+                 .UseEnglish()
+                 .Build();
+
+
+        bot.BotCommand += Bb_BotCommand;
+
+        //Update Bot commands to botfather
+        bot.UploadBotCommands().Wait();
+
+        bot.SetSetting(ESettings.LogAllMessages, true);
+
+        bot.Message += (s, en) =>
         {
+            Console.WriteLine(en.DeviceId + " " + en.Message.MessageText + " " + (en.Message.RawData ?? ""));
+        };
 
-            String APIKey = "";
+        await bot.Start();
 
-            var bb = BotBaseBuilder
-                      .Create()
-                      .WithAPIKey(APIKey)
-                      .DefaultMessageLoop()
-                      .WithStartForm<Start>()
-                      .NoProxy()
-                      .CustomCommands(a =>
-                      {
-                          a.Start("Starts the bot");
-                          a.Help("Should show you some help");
-                          a.Settings("Should show you some settings");
-                          a.Add("form1", "Opens test form 1");
-                          a.Add("form2", "Opens test form 2");
-                          a.Add("params", "Returns all send parameters as a message.");
-                      })
-                      .NoSerialization()
-                      .UseEnglish()
-                      .Build();
+        Console.WriteLine("Telegram Bot started...");
+        Console.WriteLine("Press q to quit application.");
+
+        Console.ReadLine();
+
+        await bot.Stop();
+    }
+
+    private static async Task Bb_BotCommand(object sender, BotCommandEventArgs en)
+    {
+        switch (en.Command)
+        {
+            case "/start":
 
 
-            bb.BotCommand += async (s, en) =>
-            {
-                switch (en.Command)
-                {
-                    case "/start":
+                var start = new Menu();
 
-                        var start = new Menu();
+                await en.Device.ActiveForm.NavigateTo(start);
 
-                        await en.Device.ActiveForm.NavigateTo(start);
+                break;
+            case "/form1":
 
-                        break;
-                    case "/form1":
+                var form1 = new TestForm();
 
-                        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();
+                await en.Device.ActiveForm.NavigateTo(form1);
 
 
-
-            Console.WriteLine("Telegram Bot started...");
-
-            Console.WriteLine("Press q to quit application.");
+                break;
 
 
-            Console.ReadLine();
+            case "/form2":
 
-            bb.Stop();
+                var form2 = new TestForm2();
 
+                await en.Device.ActiveForm.NavigateTo(form2);
+
+                break;
+
+            case "/myid":
+
+                await en.Device.Send($"Your Device ID is: {en.DeviceId}");
+
+                en.Handled = true;
+
+                break;
+
+            case "/params":
+
+                var 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;
         }
-
-
     }
 }

TelegramBotBase.Test/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden 
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("TelegramBotBaseTest")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TelegramBotBaseTest")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten.  Wenn Sie auf einen Typ in dieser Assembly von 
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("5817184c-0d59-4924-ac6c-6b943967811c")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

TelegramBotBase.Test/TelegramBotBase.Example.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\TelegramBotBase.Extensions.Images\TelegramBotBase.Extensions.Images.csproj" />
+      <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
+    </ItemGroup>
+
+</Project>

TelegramBotBase.Test/TelegramBotBaseTest.csproj

@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <Configurations>Debug;Release</Configurations>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\TelegramBotBase.Extensions.Images\TelegramBotBase.Extensions.Images.csproj" />
-    <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
-  </ItemGroup>
-
-</Project>

TelegramBotBase.Test/Tests/ButtonTestForm.cs

@@ -1,102 +1,94 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests
+namespace TelegramBotBase.Example.Tests;
+
+public class ButtonTestForm : AutoCleanForm
 {
-    public class ButtonTestForm : AutoCleanForm
+    public ButtonTestForm()
     {
+        Opened += ButtonTestForm_Opened;
+    }
 
-        public ButtonTestForm()
+    private async Task ButtonTestForm_Opened(object sender, EventArgs e)
+    {
+        await Device.Send("Hello world! (Click 'back' to get back to Start)");
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        var call = message.GetData<CallbackData>();
+
+        await message.ConfirmAction();
+
+
+        if (call == null)
         {
-            this.Opened += ButtonTestForm_Opened;
+            return;
         }
 
-        private async Task ButtonTestForm_Opened(object sender, EventArgs e)
+        message.Handled = true;
+
+        switch (call.Value)
         {
-            await this.Device.Send("Hello world! (Click 'back' to get back to Start)");
-        }
+            case "button1":
 
-        public override async Task Action(MessageResult message)
-        {
+                await Device.Send("Button 1 pressed");
 
-            var call = message.GetData<CallbackData>();
+                break;
 
-            await message.ConfirmAction();
+            case "button2":
 
+                await Device.Send("Button 2 pressed");
 
-            if (call == null)
-                return;
+                break;
 
-            message.Handled = true;
+            case "button3":
 
-            switch (call.Value)
-            {
-                case "button1":
+                await Device.Send("Button 3 pressed");
 
-                    await this.Device.Send("Button 1 pressed");
+                break;
 
-                    break;
+            case "button4":
 
-                case "button2":
+                await Device.Send("Button 4 pressed");
 
-                    await this.Device.Send("Button 2 pressed");
+                break;
 
-                    break;
+            case "back":
 
-                case "button3":
+                var st = new Menu();
 
-                    await this.Device.Send("Button 3 pressed");
+                await NavigateTo(st);
 
-                    break;
+                break;
 
-                case "button4":
-
-                    await this.Device.Send("Button 4 pressed");
-
-                    break;
-
-                case "back":
-
-                    var st = new Menu();
-
-                    await this.NavigateTo(st);
-
-                    break;
-
-                default:
-
-                    message.Handled = false;
-
-                    break;
-            }
-
-
-        }
-
-
-        public override async Task Render(MessageResult message)
-        {
-
-            ButtonForm btn = new ButtonForm();
-
-            btn.AddButtonRow(new ButtonBase("Button 1", new CallbackData("a", "button1").Serialize()), new ButtonBase("Button 2", new CallbackData("a", "button2").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("Button 3", new CallbackData("a", "button3").Serialize()), new ButtonBase("Button 4", new CallbackData("a", "button4").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("Google.com", "google", "https://www.google.com"), new ButtonBase("Telegram", "telegram", "https://telegram.org/"));
-
-            btn.AddButtonRow(new ButtonBase("Back", new CallbackData("a", "back").Serialize()));
-
-            await this.Device.Send("Click a button", btn);
+            default:
 
+                message.Handled = false;
 
+                break;
         }
     }
-}
 
 
+    public override async Task Render(MessageResult message)
+    {
+        var btn = new ButtonForm();
+
+        btn.AddButtonRow(new ButtonBase("Button 1", new CallbackData("a", "button1").Serialize()),
+                         new ButtonBase("Button 2", new CallbackData("a", "button2").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("Button 3", new CallbackData("a", "button3").Serialize()),
+                         new ButtonBase("Button 4", new CallbackData("a", "button4").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("Google.com", "google", "https://www.google.com"),
+                         new ButtonBase("Telegram", "telegram", "https://telegram.org/"));
+
+        btn.AddButtonRow(new ButtonBase("Back", new CallbackData("a", "back").Serialize()));
+
+        await Device.Send("Click a button", btn);
+    }
+}

TelegramBotBase.Test/Tests/Controls/ButtonGridForm.cs

@@ -1,81 +1,69 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using TelegramBotBase.Args;
-using TelegramBotBase.Controls;
 using TelegramBotBase.Controls.Hybrid;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class ButtonGridForm : AutoCleanForm
 {
-    public class ButtonGridForm : AutoCleanForm
+    private ButtonGrid _mButtons;
+
+    public ButtonGridForm()
     {
+        DeleteMode = EDeleteMode.OnLeavingForm;
 
-        ButtonGrid m_Buttons = null;
+        Init += ButtonGridForm_Init;
+    }
 
-        public ButtonGridForm()
+    private Task ButtonGridForm_Init(object sender, InitEventArgs e)
+    {
+        _mButtons = new ButtonGrid
         {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
+            KeyboardType = EKeyboardType.InlineKeyBoard
+        };
 
-            this.Init += ButtonGridForm_Init;
+        var bf = new ButtonForm();
+
+        bf.AddButtonRow(new ButtonBase("Back", "back"), new ButtonBase("Switch Keyboard", "switch"));
+
+        bf.AddButtonRow(new ButtonBase("Button1", "b1"), new ButtonBase("Button2", "b2"));
+
+        bf.AddButtonRow(new ButtonBase("Button3", "b3"), new ButtonBase("Button4", "b4"));
+
+        _mButtons.DataSource.ButtonForm = bf;
+
+        _mButtons.ButtonClicked += Bg_ButtonClicked;
+
+        AddControl(_mButtons);
+        return Task.CompletedTask;
+    }
+
+    private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+    {
+        if (e.Button == null)
+        {
+            return;
         }
 
-        private async Task ButtonGridForm_Init(object sender, InitEventArgs e)
+        if (e.Button.Value == "back")
         {
-            m_Buttons = new ButtonGrid();
-
-            m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard;
-
-            ButtonForm bf = new ButtonForm();
-
-            bf.AddButtonRow(new ButtonBase("Back", "back"), new ButtonBase("Switch Keyboard", "switch"));
-
-            bf.AddButtonRow(new ButtonBase("Button1", "b1"), new ButtonBase("Button2", "b2"));
-
-            bf.AddButtonRow(new ButtonBase("Button3", "b3"), new ButtonBase("Button4", "b4"));
-
-            m_Buttons.ButtonsForm = bf;
-
-            m_Buttons.ButtonClicked += Bg_ButtonClicked;
-
-            this.AddControl(m_Buttons);
-
-
+            var start = new Menu();
+            await NavigateTo(start);
         }
-
-        private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+        else if (e.Button.Value == "switch")
         {
-            if (e.Button == null)
-                return;
-
-            if (e.Button.Value == "back")
+            _mButtons.KeyboardType = _mButtons.KeyboardType switch
             {
-                var start = new Menu();
-                await this.NavigateTo(start);
-            }
-            else if (e.Button.Value == "switch")
-            {
-                switch (m_Buttons.KeyboardType)
-                {
-                    case TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard:
-                        m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard;
-                        break;
-                    case TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard:
-                        m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard;
-                        break;
-                }
-
-
-            }
-            else
-            {
-
-                await this.Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
-            }
-
-
+                EKeyboardType.ReplyKeyboard => EKeyboardType.InlineKeyBoard,
+                EKeyboardType.InlineKeyBoard => EKeyboardType.ReplyKeyboard,
+                _ => _mButtons.KeyboardType
+            };
+        }
+        else
+        {
+            await Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
         }
     }
 }

TelegramBotBase.Test/Tests/Controls/ButtonGridPagingForm.cs

@@ -1,74 +1,66 @@
-using System;
-using System.Collections.Generic;
+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.Controls.Hybrid;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class ButtonGridPagingForm : AutoCleanForm
 {
-    public class ButtonGridPagingForm : AutoCleanForm
+    private ButtonGrid _mButtons;
+
+    public ButtonGridPagingForm()
     {
+        DeleteMode = EDeleteMode.OnLeavingForm;
 
-        ButtonGrid m_Buttons = null;
+        Init += ButtonGridForm_Init;
+    }
 
-        public ButtonGridPagingForm()
+    private Task ButtonGridForm_Init(object sender, InitEventArgs e)
+    {
+        _mButtons = new ButtonGrid
         {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
+            KeyboardType = EKeyboardType.ReplyKeyboard,
+            EnablePaging = true,
+            EnableSearch = true,
+            HeadLayoutButtonRow = new List<ButtonBase> { new("Back", "back") }
+        };
 
-            this.Init += ButtonGridForm_Init;
+        var countries = CultureInfo.GetCultures(CultureTypes.SpecificCultures);
+
+        var bf = new ButtonForm();
+
+        foreach (var c in countries)
+        {
+            bf.AddButtonRow(new ButtonBase(c.EnglishName, c.EnglishName));
         }
 
-        private async Task ButtonGridForm_Init(object sender, InitEventArgs e)
+        _mButtons.DataSource.ButtonForm = bf;
+
+        _mButtons.ButtonClicked += Bg_ButtonClicked;
+
+        AddControl(_mButtons);
+        return Task.CompletedTask;
+    }
+
+    private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+    {
+        if (e.Button == null)
         {
-            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);
-
-
+            return;
         }
 
-        private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+        if (e.Button.Value == "back")
         {
-            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}");
-            }
-
-
+            var start = new Menu();
+            await NavigateTo(start);
+        }
+        else
+        {
+            await Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
         }
     }
 }

TelegramBotBase.Test/Tests/Controls/ButtonGridTagForm.cs

@@ -1,77 +1,74 @@
-using System;
-using System.Collections.Generic;
+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.Controls.Hybrid;
+using TelegramBotBase.DataSources;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class ButtonGridTagForm : AutoCleanForm
 {
-    public class ButtonGridTagForm : AutoCleanForm
+    private TaggedButtonGrid _mButtons;
+
+    public ButtonGridTagForm()
     {
+        DeleteMode = EDeleteMode.OnLeavingForm;
 
-        TaggedButtonGrid m_Buttons = null;
-
-        public ButtonGridTagForm()
-        {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-
-            this.Init += ButtonGridTagForm_Init;
-        }
-
-        private async Task ButtonGridTagForm_Init(object sender, InitEventArgs e)
-        {
-            m_Buttons = new TaggedButtonGrid();
-
-            m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard;
-
-            m_Buttons.EnablePaging = 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 TagButtonBase(c.EnglishName, c.EnglishName, c.Parent.EnglishName));
-            }
-
-            m_Buttons.Tags = countries.Select(a => a.Parent.EnglishName).Distinct().OrderBy(a => a).ToList();
-            m_Buttons.SelectedTags = countries.Select(a => a.Parent.EnglishName).Distinct().OrderBy(a => a).ToList();
-
-            m_Buttons.EnableCheckAllTools = true;
-
-            m_Buttons.DataSource = new TelegramBotBase.Datasources.ButtonFormDataSource(bf);
-
-            m_Buttons.ButtonClicked += Bg_ButtonClicked;
-
-            this.AddControl(m_Buttons);
-        }
-
-        private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
-        {
-            if (e.Button == null)
-                return;
-
-            switch (e.Button.Value)
-            {
-
-                case "back":
-                    var start = new Menu();
-                    await this.NavigateTo(start);
-                    return;
-
-            }
-
-
-            await this.Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
-        }
+        Init += ButtonGridTagForm_Init;
     }
-}
+
+    private Task ButtonGridTagForm_Init(object sender, InitEventArgs e)
+    {
+        _mButtons = new TaggedButtonGrid
+        {
+            KeyboardType = EKeyboardType.ReplyKeyboard,
+            EnablePaging = true,
+            HeadLayoutButtonRow = new List<ButtonBase> { new("Back", "back") }
+        };
+
+
+        var countries = CultureInfo.GetCultures(CultureTypes.SpecificCultures);
+
+        var bf = new ButtonForm();
+
+        foreach (var c in countries)
+        {
+            bf.AddButtonRow(new TagButtonBase(c.EnglishName, c.EnglishName, c.Parent.EnglishName));
+        }
+
+        _mButtons.Tags = countries.Select(a => a.Parent.EnglishName).Distinct().OrderBy(a => a).ToList();
+        _mButtons.SelectedTags = countries.Select(a => a.Parent.EnglishName).Distinct().OrderBy(a => a).ToList();
+
+        _mButtons.EnableCheckAllTools = true;
+
+        _mButtons.DataSource = new ButtonFormDataSource(bf);
+
+        _mButtons.ButtonClicked += Bg_ButtonClicked;
+
+        AddControl(_mButtons);
+        return Task.CompletedTask;
+    }
+
+    private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+    {
+        if (e.Button == null)
+        {
+            return;
+        }
+
+        switch (e.Button.Value)
+        {
+            case "back":
+                var start = new Menu();
+                await NavigateTo(start);
+                return;
+        }
+
+
+        await Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
+    }
+}

TelegramBotBase.Test/Tests/Controls/CalendarPickerForm.cs

@@ -1,81 +1,69 @@
-using System;
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-using TelegramBotBase.Controls;
+using System.Threading.Tasks;
 using TelegramBotBase.Args;
+using TelegramBotBase.Base;
 using TelegramBotBase.Controls.Inline;
+using TelegramBotBase.Enums;
+using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class CalendarPickerForm : AutoCleanForm
 {
-    public class CalendarPickerForm : AutoCleanForm
+    public CalendarPickerForm()
     {
-
-        public CalendarPicker Picker { get; set; }
-
-        int? selectedDateMessage { get; set; }
-
-        public CalendarPickerForm()
-        {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-            this.Init += CalendarPickerForm_Init;
-        }
-
-        private async Task CalendarPickerForm_Init(object sender, InitEventArgs e)
-        {
-            this.Picker = new CalendarPicker();
-            this.Picker.Title = "Datum auswählen / Pick date";
-            
-            this.AddControl(Picker);
-        }
-
-
-        public override async Task Action(MessageResult message)
-        {
-
-            switch(message.RawData)
-            {
-                case "back":
-
-                    var s = new Menu();
-
-                    await this.NavigateTo(s);
-
-                    break;
-            }
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            String s = "";
-
-            s = "Selected date is " + this.Picker.SelectedDate.ToShortDateString() + "\r\n";
-            s += "Selected month is " + this.Picker.Culture.DateTimeFormat.MonthNames[this.Picker.VisibleMonth.Month - 1] + "\r\n";
-            s += "Selected year is " + this.Picker.VisibleMonth.Year.ToString();
-
-            ButtonForm bf = new ButtonForm();
-            bf.AddButtonRow(new ButtonBase("Back","back"));
-
-            if (selectedDateMessage != null)
-            {
-                await this.Device.Edit(this.selectedDateMessage.Value, s, bf);
-            }
-            else
-            {
-                var m = await this.Device.Send(s, bf);
-                this.selectedDateMessage = m.MessageId;
-            }
-
-
-
-        }
-
-
-
+        DeleteMode = EDeleteMode.OnLeavingForm;
+        Init += CalendarPickerForm_Init;
     }
-}
+
+    public CalendarPicker Picker { get; set; }
+
+    private int? SelectedDateMessage { get; set; }
+
+    private Task CalendarPickerForm_Init(object sender, InitEventArgs e)
+    {
+        Picker = new CalendarPicker
+        {
+            Title = "Datum auswählen / Pick date"
+        };
+
+        AddControl(Picker);
+        return Task.CompletedTask;
+    }
+
+
+    public override async Task Action(MessageResult message)
+    {
+        switch (message.RawData)
+        {
+            case "back":
+
+                var s = new Menu();
+
+                await NavigateTo(s);
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var s = "";
+
+        s = "Selected date is " + Picker.SelectedDate.ToShortDateString() + "\r\n";
+        s += "Selected month is " + Picker.Culture.DateTimeFormat.MonthNames[Picker.VisibleMonth.Month - 1] + "\r\n";
+        s += "Selected year is " + Picker.VisibleMonth.Year;
+
+        var bf = new ButtonForm();
+        bf.AddButtonRow(new ButtonBase("Back", "back"));
+
+        if (SelectedDateMessage != null)
+        {
+            await Device.Edit(SelectedDateMessage.Value, s, bf);
+        }
+        else
+        {
+            var m = await Device.Send(s, bf);
+            SelectedDateMessage = m.MessageId;
+        }
+    }
+}

TelegramBotBase.Test/Tests/Controls/CheckedButtonListForm.cs

@@ -1,92 +1,86 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
-using TelegramBotBase.Controls;
 using TelegramBotBase.Controls.Hybrid;
+using TelegramBotBase.DataSources;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class CheckedButtonListForm : AutoCleanForm
 {
-    public class CheckedButtonListForm : AutoCleanForm
+    private CheckedButtonList _mButtons;
+
+    public CheckedButtonListForm()
     {
+        DeleteMode = EDeleteMode.OnLeavingForm;
 
-        CheckedButtonList m_Buttons = null;
+        Init += CheckedButtonListForm_Init;
+    }
 
-        public CheckedButtonListForm()
+    private Task CheckedButtonListForm_Init(object sender, InitEventArgs e)
+    {
+        _mButtons = new CheckedButtonList
         {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
+            KeyboardType = EKeyboardType.InlineKeyBoard,
+            EnablePaging = true,
+            HeadLayoutButtonRow = new List<ButtonBase> { new("Back", "back"), new("Switch Keyboard", "switch") },
+            SubHeadLayoutButtonRow = new List<ButtonBase> { new("No checked items", "$") }
+        };
 
-            this.Init += CheckedButtonListForm_Init;
+        var bf = new ButtonForm();
+
+        for (var i = 0; i < 30; i++)
+        {
+            bf.AddButtonRow($"{i + 1}. Item", i.ToString());
         }
 
-        private async Task CheckedButtonListForm_Init(object sender, InitEventArgs e)
+        _mButtons.DataSource = new ButtonFormDataSource(bf);
+
+        _mButtons.ButtonClicked += Bg_ButtonClicked;
+        _mButtons.CheckedChanged += M_Buttons_CheckedChanged;
+
+        AddControl(_mButtons);
+        return Task.CompletedTask;
+    }
+
+    private Task M_Buttons_CheckedChanged(object sender, CheckedChangedEventArgs e)
+    {
+        _mButtons.SubHeadLayoutButtonRow = new List<ButtonBase>
+            { new($"{_mButtons.CheckedItems.Count} checked items", "$") };
+        return Task.CompletedTask;
+    }
+
+    private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+    {
+        if (e.Button == null)
         {
-            m_Buttons = new CheckedButtonList();
-
-            m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard;
-            m_Buttons.EnablePaging = true;
-
-            m_Buttons.HeadLayoutButtonRow = new List<ButtonBase>() { new ButtonBase("Back", "back"), new ButtonBase("Switch Keyboard", "switch") };
-
-            m_Buttons.SubHeadLayoutButtonRow = new List<ButtonBase>() { new ButtonBase("No checked items", "$") };
-
-            ButtonForm bf = new ButtonForm();
-
-            for (int i = 0; i < 30; i++)
-            {
-                bf.AddButtonRow($"{i + 1}. Item", i.ToString());
-            }
-
-            m_Buttons.DataSource = new TelegramBotBase.Datasources.ButtonFormDataSource(bf);
-
-            m_Buttons.ButtonClicked += Bg_ButtonClicked;
-            m_Buttons.CheckedChanged += M_Buttons_CheckedChanged;
-
-            this.AddControl(m_Buttons);
+            return;
         }
 
-        private async Task M_Buttons_CheckedChanged(object sender, CheckedChangedEventArgs e)
+        switch (e.Button.Value)
         {
-            m_Buttons.SubHeadLayoutButtonRow = new List<ButtonBase>() { new ButtonBase($"{m_Buttons.CheckedItems.Count} checked items", "$") };
-        }
+            case "back":
 
-        private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
-        {
-            if (e.Button == null)
-                return;
-
-            switch (e.Button.Value)
-            {
-                case "back":
-
-                    var start = new Menu();
-                    await NavigateTo(start);
-                    break;
+                var start = new Menu();
+                await NavigateTo(start);
+                break;
 
 
-                case "switch":
-                    switch (m_Buttons.KeyboardType)
-                    {
-                        case TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard:
-                            m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard;
-                            break;
-                        case TelegramBotBase.Enums.eKeyboardType.InlineKeyBoard:
-                            m_Buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard;
-                            break;
-                    }
-
-
-                    break;
-
-                default:
-                    await Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
-                    break;
-            }
+            case "switch":
+                _mButtons.KeyboardType = _mButtons.KeyboardType switch
+                {
+                    EKeyboardType.ReplyKeyboard => EKeyboardType.InlineKeyBoard,
+                    EKeyboardType.InlineKeyBoard => EKeyboardType.ReplyKeyboard,
+                    _ => _mButtons.KeyboardType
+                };
 
+                break;
 
+            default:
+                await Device.Send($"Button clicked with Text: {e.Button.Text} and Value {e.Button.Value}");
+                break;
         }
     }
-}
+}

TelegramBotBase.Test/Tests/Controls/MonthPickerForm.cs

@@ -1,79 +1,67 @@
-using System;
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
-using TelegramBotBase.Form;
-using TelegramBotBase.Controls;
+using System.Threading.Tasks;
 using TelegramBotBase.Args;
+using TelegramBotBase.Base;
 using TelegramBotBase.Controls.Inline;
+using TelegramBotBase.Enums;
+using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class MonthPickerForm : AutoCleanForm
 {
-    public class MonthPickerForm : AutoCleanForm
+    public MonthPickerForm()
     {
-
-        public MonthPicker Picker { get; set; }
-
-        int? selectedDateMessage { get; set; }
-
-        public MonthPickerForm()
-        {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-            this.Init += MonthPickerForm_Init;
-        }
-
-        private async Task MonthPickerForm_Init(object sender, InitEventArgs e)
-        {
-            this.Picker = new MonthPicker();
-            this.Picker.Title = "Monat auswählen / Pick month";
-            this.AddControl(Picker);
-        }
-
-
-        public override async Task Action(MessageResult message)
-        {
-
-            switch(message.RawData)
-            {
-                case "back":
-
-                    var s = new Menu();
-
-                    await this.NavigateTo(s);
-
-                    break;
-            }
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            String s = "";
-
-            s += "Selected month is " + this.Picker.Culture.DateTimeFormat.MonthNames[this.Picker.SelectedDate.Month - 1] + "\r\n";
-            s += "Selected year is " + this.Picker.VisibleMonth.Year.ToString();
-
-            ButtonForm bf = new ButtonForm();
-            bf.AddButtonRow(new ButtonBase("Back","back"));
-
-            if (selectedDateMessage != null)
-            {
-                await this.Device.Edit(this.selectedDateMessage.Value, s, bf);
-            }
-            else
-            {
-                var m = await this.Device.Send(s, bf);
-                this.selectedDateMessage = m.MessageId;
-            }
-
-
-
-        }
-
-
-
+        DeleteMode = EDeleteMode.OnLeavingForm;
+        Init += MonthPickerForm_Init;
     }
-}
+
+    public MonthPicker Picker { get; set; }
+
+    private int? SelectedDateMessage { get; set; }
+
+    private Task MonthPickerForm_Init(object sender, InitEventArgs e)
+    {
+        Picker = new MonthPicker
+        {
+            Title = "Monat auswählen / Pick month"
+        };
+        AddControl(Picker);
+        return Task.CompletedTask;
+    }
+
+
+    public override async Task Action(MessageResult message)
+    {
+        switch (message.RawData)
+        {
+            case "back":
+
+                var s = new Menu();
+
+                await NavigateTo(s);
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var s = "";
+
+        s += "Selected month is " + Picker.Culture.DateTimeFormat.MonthNames[Picker.SelectedDate.Month - 1] + "\r\n";
+        s += "Selected year is " + Picker.VisibleMonth.Year;
+
+        var bf = new ButtonForm();
+        bf.AddButtonRow(new ButtonBase("Back", "back"));
+
+        if (SelectedDateMessage != null)
+        {
+            await Device.Edit(SelectedDateMessage.Value, s, bf);
+        }
+        else
+        {
+            var m = await Device.Send(s, bf);
+            SelectedDateMessage = m.MessageId;
+        }
+    }
+}

TelegramBotBase.Test/Tests/Controls/MultiToggleButtons.cs

@@ -1,53 +1,55 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
-using TelegramBotBase.Controls;
 using TelegramBotBase.Controls.Inline;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class MultiToggleButtons : AutoCleanForm
 {
-    public class MultiToggleButtons : AutoCleanForm
+    public MultiToggleButtons()
     {
-        public MultiToggleButtons()
-        {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
+        DeleteMode = EDeleteMode.OnLeavingForm;
 
-            this.Init += ToggleButtons_Init;
-        }
-
-        private async Task ToggleButtons_Init(object sender, InitEventArgs e)
-        {
-
-            var mtb = new MultiToggleButton();
-
-            mtb.Options = new List<ButtonBase>() { new ButtonBase("Option 1", "1"), new ButtonBase("Option 2", "2"), new ButtonBase("Option 3", "3") };
-            mtb.SelectedOption = mtb.Options.FirstOrDefault();
-            mtb.Toggled += Tb_Toggled;
-            this.AddControl(mtb);
-
-            mtb = new MultiToggleButton();
-
-            mtb.Options = new List<ButtonBase>() { new ButtonBase("Option 4", "4"), new ButtonBase("Option 5", "5"), new ButtonBase("Option 6", "6") };
-            mtb.SelectedOption = mtb.Options.FirstOrDefault();
-            mtb.AllowEmptySelection = false;
-            mtb.Toggled += Tb_Toggled;
-            this.AddControl(mtb);
-        }
-
-        private void Tb_Toggled(object sender, EventArgs e)
-        {
-            var tb = sender as MultiToggleButton;
-            if (tb.SelectedOption != null)
-            {
-                Console.WriteLine(tb.ID.ToString() + " was pressed, and toggled to " + tb.SelectedOption.Value);
-                return;
-            }
-
-            Console.WriteLine("Selection for " + tb.ID.ToString() + " has been removed.");
-        }
+        Init += ToggleButtons_Init;
     }
-}
+
+    private Task ToggleButtons_Init(object sender, InitEventArgs e)
+    {
+        var mtb = new MultiToggleButton
+        {
+            Options = new List<ButtonBase> { new("Option 1", "1"), new("Option 2", "2"), new("Option 3", "3") }
+        };
+
+        mtb.SelectedOption = mtb.Options.FirstOrDefault();
+        mtb.Toggled += Tb_Toggled;
+        AddControl(mtb);
+
+        mtb = new MultiToggleButton
+        {
+            Options = new List<ButtonBase> { new("Option 4", "4"), new("Option 5", "5"), new("Option 6", "6") }
+        };
+
+        mtb.SelectedOption = mtb.Options.FirstOrDefault();
+        mtb.AllowEmptySelection = false;
+        mtb.Toggled += Tb_Toggled;
+        AddControl(mtb);
+        return Task.CompletedTask;
+    }
+
+    private void Tb_Toggled(object sender, EventArgs e)
+    {
+        var tb = sender as MultiToggleButton;
+        if (tb.SelectedOption != null)
+        {
+            Console.WriteLine(tb.Id + " was pressed, and toggled to " + tb.SelectedOption.Value);
+            return;
+        }
+
+        Console.WriteLine("Selection for " + tb.Id + " has been removed.");
+    }
+}

TelegramBotBase.Test/Tests/Controls/MultiViewForm.cs

@@ -1,53 +1,51 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
+using System.Threading.Tasks;
+using TelegramBotBase.Args;
 using TelegramBotBase.Controls.Hybrid;
+using TelegramBotBase.DataSources;
+using TelegramBotBase.Enums;
+using TelegramBotBase.Example.Tests.Controls.Subclass;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class MultiViewForm : AutoCleanForm
 {
-    public class MultiViewForm : AutoCleanForm
+    private ButtonGrid _bg;
+    private MultiViewTest _mvt;
+
+    public MultiViewForm()
     {
+        DeleteMode = EDeleteMode.OnLeavingForm;
+        Init += MultiViewForm_Init;
+    }
 
-        Subclass.MultiViewTest mvt = null;
+    private Task MultiViewForm_Init(object sender, InitEventArgs e)
+    {
+        _mvt = new MultiViewTest();
 
-        ButtonGrid bg = null;
+        AddControl(_mvt);
 
-        public MultiViewForm()
+        _bg = new ButtonGrid
         {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-            this.Init += MultiViewForm_Init;
-        }
+            DataSource = new ButtonFormDataSource()
+        };
+        _bg.DataSource.ButtonForm.AddButtonRow("Back", "$back$");
+        _bg.ButtonClicked += Bg_ButtonClicked;
+        _bg.KeyboardType = EKeyboardType.ReplyKeyboard;
+        AddControl(_bg);
+        return Task.CompletedTask;
+    }
 
-        private async Task MultiViewForm_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
+    private async Task Bg_ButtonClicked(object sender, ButtonClickedEventArgs e)
+    {
+        switch (e.Button.Value)
         {
-            mvt = new Subclass.MultiViewTest();
+            case "$back$":
 
-            AddControl(mvt);
+                var mn = new Menu();
+                await NavigateTo(mn);
 
-            bg = new ButtonGrid();
-            bg.ButtonsForm = new ButtonForm();
-            bg.ButtonsForm.AddButtonRow("Back", "$back$");
-            bg.ButtonClicked += Bg_ButtonClicked;
-            bg.KeyboardType = TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard;
-            AddControl(bg);
+                break;
         }
-
-        private async Task Bg_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e)
-        {
-            switch(e.Button.Value)
-            {
-                case "$back$":
-
-                    var mn = new Menu();
-                    await NavigateTo(mn);
-
-                    break;
-            }
-        }
-
-
     }
 }

TelegramBotBase.Test/Tests/Controls/Subclass/MultiViewTest.cs

@@ -1,64 +1,52 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
+using TelegramBotBase.Controls.Hybrid;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls.Subclass
+namespace TelegramBotBase.Example.Tests.Controls.Subclass;
+
+public class MultiViewTest : MultiView
 {
-    public class MultiViewTest : TelegramBotBase.Controls.Hybrid.MultiView
+    public override Task Action(MessageResult result, string value = null)
     {
-
-
-        public override async Task Action(MessageResult result, string value = null)
+        switch (result.RawData)
         {
+            case "back":
 
-            switch (result.RawData)
-            {
-                case "back":
+                SelectedViewIndex--;
 
-                    this.SelectedViewIndex--;
+                break;
+            case "next":
 
-                    break;
-                case "next":
-
-                    this.SelectedViewIndex++;
-
-                    break;
-            }
+                SelectedViewIndex++;
 
+                break;
         }
 
-        public override async Task RenderView(RenderViewEventArgs e)
-        {
-
-            ButtonForm bf = new ButtonForm();
-            bf.AddButtonRow(new ButtonBase("Back", "back"), new ButtonBase("Next", "next"));
-
-            switch (e.CurrentView)
-            {
-                case 0:
-                case 1:
-                case 2:
-
-                    await Device.Send($"Page {e.CurrentView + 1}", bf);
-
-                    break;
-
-                default:
-
-                    await Device.Send("Unknown Page", bf);
-
-                    break;
-
-
-            }
-
-        }
-
-
-
+        return Task.CompletedTask;
     }
-}
+
+    public override async Task RenderView(RenderViewEventArgs e)
+    {
+        var bf = new ButtonForm();
+        bf.AddButtonRow(new ButtonBase("Back", "back"), new ButtonBase("Next", "next"));
+
+        switch (e.CurrentView)
+        {
+            case 0:
+            case 1:
+            case 2:
+
+                await Device.Send($"Page {e.CurrentView + 1}", bf);
+
+                break;
+
+            default:
+
+                await Device.Send("Unknown Page", bf);
+
+                break;
+        }
+    }
+}

TelegramBotBase.Test/Tests/Controls/ToggleButtons.cs

@@ -1,51 +1,52 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
-using TelegramBotBase.Controls;
 using TelegramBotBase.Controls.Inline;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class ToggleButtons : AutoCleanForm
 {
-    public class ToggleButtons : AutoCleanForm
+    public ToggleButtons()
     {
-        public ToggleButtons()
-        {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
+        DeleteMode = EDeleteMode.OnLeavingForm;
 
-            this.Init += ToggleButtons_Init;
-        }
-
-        private async Task ToggleButtons_Init(object sender, InitEventArgs e)
-        {
-
-            var tb = new ToggleButton();
-            tb.Checked = true;
-            tb.Toggled += Tb_Toggled;
-
-            this.AddControl(tb);
-
-            tb = new ToggleButton();
-            tb.Checked = false;
-            tb.Toggled += Tb_Toggled;
-
-            this.AddControl(tb);
-
-            tb = new ToggleButton();
-            tb.Checked = true;
-            tb.Toggled += Tb_Toggled;
-
-            this.AddControl(tb);
-
-        }
-
-        private void Tb_Toggled(object sender, EventArgs e)
-        {
-            var tb = sender as ToggleButton;
-            Console.WriteLine(tb.ID.ToString() + " was pressed, and toggled to " + (tb.Checked ? "Checked" : "Unchecked"));
-        }
+        Init += ToggleButtons_Init;
     }
-}
+
+    private Task ToggleButtons_Init(object sender, InitEventArgs e)
+    {
+        var tb = new ToggleButton
+        {
+            Checked = true
+        };
+        tb.Toggled += Tb_Toggled;
+
+        AddControl(tb);
+
+        tb = new ToggleButton
+        {
+            Checked = false
+        };
+        tb.Toggled += Tb_Toggled;
+
+        AddControl(tb);
+
+        tb = new ToggleButton
+        {
+            Checked = true
+        };
+        tb.Toggled += Tb_Toggled;
+
+        AddControl(tb);
+        return Task.CompletedTask;
+    }
+
+    private void Tb_Toggled(object sender, EventArgs e)
+    {
+        var tb = sender as ToggleButton;
+        Console.WriteLine(tb.Id + " was pressed, and toggled to " + (tb.Checked ? "Checked" : "Unchecked"));
+    }
+}

TelegramBotBase.Test/Tests/Controls/TreeViewForms.cs

@@ -1,101 +1,98 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Form;
-using TelegramBotBase.Controls;
-using TelegramBotBase.Base;
+using System.Threading.Tasks;
 using TelegramBotBase.Args;
+using TelegramBotBase.Base;
 using TelegramBotBase.Controls.Inline;
+using TelegramBotBase.Enums;
+using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Controls
+namespace TelegramBotBase.Example.Tests.Controls;
+
+public class TreeViewForms : AutoCleanForm
 {
-    public class TreeViewForms : AutoCleanForm
+    public TreeViewForms()
     {
-        public TreeView view { get; set; }
-
-        private int? MessageId { get; set; }
-
-        public TreeViewForms()
-        {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-            this.Init += TreeViewForms_Init;
-        }
-
-        private async Task TreeViewForms_Init(object sender, InitEventArgs e)
-        {
-            view = new TreeView();
-
-            var tvn = new TreeViewNode("Cars", "cars");
-
-            tvn.AddNode(new TreeViewNode("Porsche", "porsche", new TreeViewNode("Website", "web", "https://www.porsche.com/germany/"), new TreeViewNode("911", "911"), new TreeViewNode("918 Spyder", "918")));
-            tvn.AddNode(new TreeViewNode("BMW", "bmw"));
-            tvn.AddNode(new TreeViewNode("Audi", "audi"));
-            tvn.AddNode(new TreeViewNode("VW", "vw"));
-            tvn.AddNode(new TreeViewNode("Lamborghini", "lamborghini"));
-
-            view.Nodes.Add(tvn);
-
-            tvn = new TreeViewNode("Fruits", "fruits");
-
-            tvn.AddNode(new TreeViewNode("Apple", "apple"));
-            tvn.AddNode(new TreeViewNode("Orange", "orange"));
-            tvn.AddNode(new TreeViewNode("Lemon", "lemon"));
-
-            view.Nodes.Add(tvn);
-
-            this.AddControl(view);
-
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            await message.ConfirmAction();
-
-            if (message.Handled)
-                return;
-
-            switch (message.RawData)
-            {
-                case "back":
-
-                    message.Handled = true;
-
-                    var start = new Menu();
-
-                    await this.NavigateTo(start);
-
-                    break;
-
-            }
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            String s = "";
-
-            s += "Selected Node: " + (this.view.SelectedNode?.Text ?? "(null)") + "\r\n";
-
-            s += "Visible Node: " + (this.view.VisibleNode?.Text ?? "(top)") + "\r\n";
-
-            s += "Visible Path: " + this.view.GetPath() + "\r\n";
-            s += "Selected Path: " + (this.view.SelectedNode?.GetPath() ?? "(null)") + "\r\n";
-
-            ButtonForm bf = new ButtonForm();
-            bf.AddButtonRow(new ButtonBase("Back", "back"));
-
-            if (MessageId != null)
-            {
-                await this.Device.Edit(this.MessageId.Value, s, bf);
-            }
-            else
-            {
-                var m = await this.Device.Send(s, bf);
-                this.MessageId = m.MessageId;
-            }
-        }
-
+        DeleteMode = EDeleteMode.OnLeavingForm;
+        Init += TreeViewForms_Init;
     }
-}
+
+    public TreeView View { get; set; }
+
+    private int? MessageId { get; set; }
+
+    private Task TreeViewForms_Init(object sender, InitEventArgs e)
+    {
+        View = new TreeView();
+
+        var tvn = new TreeViewNode("Cars", "cars");
+
+        tvn.AddNode(new TreeViewNode("Porsche", "porsche",
+                                     new TreeViewNode("Website", "web", "https://www.porsche.com/germany/"),
+                                     new TreeViewNode("911", "911"),
+                                     new TreeViewNode("918 Spyder", "918")));
+        tvn.AddNode(new TreeViewNode("BMW", "bmw"));
+        tvn.AddNode(new TreeViewNode("Audi", "audi"));
+        tvn.AddNode(new TreeViewNode("VW", "vw"));
+        tvn.AddNode(new TreeViewNode("Lamborghini", "lamborghini"));
+
+        View.Nodes.Add(tvn);
+
+        tvn = new TreeViewNode("Fruits", "fruits");
+
+        tvn.AddNode(new TreeViewNode("Apple", "apple"));
+        tvn.AddNode(new TreeViewNode("Orange", "orange"));
+        tvn.AddNode(new TreeViewNode("Lemon", "lemon"));
+
+        View.Nodes.Add(tvn);
+
+        AddControl(View);
+        return Task.CompletedTask;
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        await message.ConfirmAction();
+
+        if (message.Handled)
+        {
+            return;
+        }
+
+        switch (message.RawData)
+        {
+            case "back":
+
+                message.Handled = true;
+
+                var start = new Menu();
+
+                await NavigateTo(start);
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var s = "";
+
+        s += "Selected Node: " + (View.SelectedNode?.Text ?? "(null)") + "\r\n";
+
+        s += "Visible Node: " + (View.VisibleNode?.Text ?? "(top)") + "\r\n";
+
+        s += "Visible Path: " + View.GetPath() + "\r\n";
+        s += "Selected Path: " + (View.SelectedNode?.GetPath() ?? "(null)") + "\r\n";
+
+        var bf = new ButtonForm();
+        bf.AddButtonRow(new ButtonBase("Back", "back"));
+
+        if (MessageId != null)
+        {
+            await Device.Edit(MessageId.Value, s, bf);
+        }
+        else
+        {
+            var m = await Device.Send(s, bf);
+            MessageId = m.MessageId;
+        }
+    }
+}

TelegramBotBase.Test/Tests/DataForm.cs

@@ -1,143 +1,132 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using System.Threading.Tasks;
 using Telegram.Bot;
-using Telegram.Bot.Types;
+using Telegram.Bot.Types.Enums;
 using Telegram.Bot.Types.InputFiles;
 using Telegram.Bot.Types.ReplyMarkups;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests
+namespace TelegramBotBase.Example.Tests;
+
+public class DataForm : AutoCleanForm
 {
-    public class DataForm : AutoCleanForm
+    public override async Task SentData(DataResult data)
     {
+        var tmp = "";
+        InputOnlineFile file;
 
-
-        public override async Task SentData(DataResult data)
+        switch (data.Type)
         {
-            String tmp = "";
-            InputOnlineFile file;
+            case MessageType.Contact:
 
-            switch (data.Type)
-            {
-                case Telegram.Bot.Types.Enums.MessageType.Contact:
+                tmp += "Firstname: " + data.Contact.FirstName + "\r\n";
+                tmp += "Lastname: " + data.Contact.LastName + "\r\n";
+                tmp += "Phonenumber: " + data.Contact.PhoneNumber + "\r\n";
+                tmp += "UserId: " + data.Contact.UserId + "\r\n";
 
-                    tmp += "Firstname: " + data.Contact.FirstName + "\r\n";
-                    tmp += "Lastname: " + data.Contact.LastName + "\r\n";
-                    tmp += "Phonenumber: " + data.Contact.PhoneNumber + "\r\n";
-                    tmp += "UserId: " + data.Contact.UserId + "\r\n";
+                await Device.Send("Your contact: \r\n" + tmp, replyTo: data.MessageId);
 
-                    await this.Device.Send("Your contact: \r\n" + tmp, replyTo: data.MessageId);
+                break;
 
-                    break;
+            case MessageType.Document:
 
-                case Telegram.Bot.Types.Enums.MessageType.Document:
+                file = new InputOnlineFile(data.Document.FileId);
 
-                    file = new InputOnlineFile(data.Document.FileId);
-
-                    await this.Device.SendDocument(file, "Your uploaded document");
+                await Device.SendDocument(file, "Your uploaded document");
 
 
-                    break;
+                break;
 
-                case Telegram.Bot.Types.Enums.MessageType.Video:
+            case MessageType.Video:
 
-                    file = new InputOnlineFile(data.Document.FileId);
+                file = new InputOnlineFile(data.Document.FileId);
 
-                    await this.Device.SendDocument(file, "Your uploaded video");
+                await Device.SendDocument(file, "Your uploaded video");
 
-                    break;
+                break;
 
-                case Telegram.Bot.Types.Enums.MessageType.Audio:
+            case MessageType.Audio:
 
-                    file = new InputOnlineFile(data.Document.FileId);
+                file = new InputOnlineFile(data.Document.FileId);
 
-                    await this.Device.SendDocument(file, "Your uploaded audio");
+                await Device.SendDocument(file, "Your uploaded audio");
 
-                    break;
+                break;
 
-                case Telegram.Bot.Types.Enums.MessageType.Location:
+            case MessageType.Location:
 
-                    tmp += "Lat: " + data.Location.Latitude + "\r\n";
-                    tmp += "Lng: " + data.Location.Longitude + "\r\n";
+                tmp += "Lat: " + data.Location.Latitude + "\r\n";
+                tmp += "Lng: " + data.Location.Longitude + "\r\n";
 
-                    await this.Device.Send("Your location: \r\n" + tmp, replyTo: data.MessageId);
+                await Device.Send("Your location: \r\n" + tmp, replyTo: data.MessageId);
 
-                    break;
+                break;
 
-                case Telegram.Bot.Types.Enums.MessageType.Photo:
+            case MessageType.Photo:
 
-                    InputOnlineFile photo = new InputOnlineFile(data.Photos.Last().FileId);
+                var photo = new InputOnlineFile(data.Photos.Last().FileId);
 
-                    await this.Device.Send("Your image: ", replyTo: data.MessageId);
-                    await this.Client.TelegramClient.SendPhotoAsync(this.Device.DeviceId, photo);
+                await Device.Send("Your image: ", replyTo: data.MessageId);
+                await Client.TelegramClient.SendPhotoAsync(Device.DeviceId, photo);
 
-                    break;
+                break;
 
-                default:
+            default:
 
-                    await this.Device.Send("Unknown response");
+                await Device.Send("Unknown response");
 
-                    break;
-            }
+                break;
+        }
+    }
 
+    public override async Task Action(MessageResult message)
+    {
+        await message.ConfirmAction();
+
+        if (message.Handled)
+        {
+            return;
         }
 
-        public override async Task Action(MessageResult message)
+        switch (message.RawData)
         {
-            await message.ConfirmAction();
+            case "contact":
 
-            if (message.Handled)
-                return;
+                await Device.RequestContact();
 
-            switch (message.RawData)
-            {
-                case "contact":
+                break;
 
-                    await this.Device.RequestContact();
+            case "location":
 
-                    break;
+                await Device.RequestLocation();
 
-                case "location":
+                break;
 
-                    await this.Device.RequestLocation();
+            case "back":
 
-                    break;
+                message.Handled = true;
 
-                case "back":
-
-                    message.Handled = true;
-
-                    var start = new Menu();
-
-                    await this.NavigateTo(start);
-
-                    break;
-            }
+                var start = new Menu();
 
+                await NavigateTo(start);
 
+                break;
         }
+    }
 
-        public override async Task Render(MessageResult message)
-        {
-            ButtonForm bf = new ButtonForm();
+    public override async Task Render(MessageResult message)
+    {
+        var bf = new ButtonForm();
 
-            bf.AddButtonRow(new ButtonBase("Request User contact", "contact"));
+        bf.AddButtonRow(new ButtonBase("Request User contact", "contact"));
 
-            bf.AddButtonRow(new ButtonBase("Request User location", "location"));
+        bf.AddButtonRow(new ButtonBase("Request User location", "location"));
 
-            bf.AddButtonRow(new ButtonBase("Back", "back"));
+        bf.AddButtonRow(new ButtonBase("Back", "back"));
 
-            InlineKeyboardMarkup ikv = bf;
-
-            await this.Device.Send("Please upload a contact, photo, video, audio, document or location.", bf);
-
-
-
-        }
+        InlineKeyboardMarkup ikv = bf;
 
+        await Device.Send("Please upload a contact, photo, video, audio, document or location.", bf);
     }
 }

TelegramBotBase.Test/Tests/DataSources/CustomDataSource.cs

@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json;
+using TelegramBotBase.Controls.Hybrid;
+using TelegramBotBase.DataSources;
+using TelegramBotBase.Form;
+
+namespace TelegramBotBase.Example.Tests.DataSources;
+
+public class CustomDataSource : ButtonFormDataSource
+{
+    public List<string> Countries = new() { "Country 1", "Country 2", "Country 3" };
+
+    public CustomDataSource()
+    {
+        LoadData();
+    }
+
+    public override int Count => Countries.Count;
+
+    public override int ColumnCount => 1;
+
+    public override int RowCount => Count;
+
+    /// <summary>
+    ///     This method has the example purpose of creating and loading some example data.
+    ///     When using a database you do not need this kind of method.
+    /// </summary>
+    private void LoadData()
+    {
+        //Exists data source? Read it
+        if (File.Exists(AppContext.BaseDirectory + "countries.json"))
+        {
+            try
+            {
+                var list = JsonConvert.DeserializeObject<List<string>>(File.ReadAllText("countries.json"));
+
+
+                Countries = list;
+            }
+            catch
+            {
+            }
+
+
+            return;
+        }
+
+        //If not, create it
+        try
+        {
+            var countries = CultureInfo.GetCultures(CultureTypes.SpecificCultures).Select(a => a.DisplayName).ToList();
+
+            Countries = countries;
+
+            var tmp = JsonConvert.SerializeObject(countries);
+
+            File.WriteAllText(AppContext.BaseDirectory + "countries.json", tmp);
+        }
+        catch
+        {
+        }
+    }
+
+    public override ButtonRow ItemAt(int index)
+    {
+        var item = Countries.ElementAt(index);
+        if (item == null)
+        {
+            return new ButtonRow();
+        }
+
+        return Render(item);
+    }
+
+    public override List<ButtonRow> ItemRange(int start, int count)
+    {
+        var items = Countries.Skip(start).Take(count);
+
+        var lst = new List<ButtonRow>();
+        foreach (var c in items)
+        {
+            lst.Add(Render(c));
+        }
+
+        return lst;
+    }
+
+    public override List<ButtonRow> AllItems()
+    {
+        var lst = new List<ButtonRow>();
+        foreach (var c in Countries)
+        {
+            lst.Add(Render(c));
+        }
+
+        return lst;
+    }
+
+    public override ButtonForm PickItems(int start, int count, string filter = null)
+    {
+        var rows = ItemRange(start, count);
+
+        var lst = new ButtonForm();
+        foreach (var c in rows)
+        {
+            lst.AddButtonRow(c);
+        }
+
+        return lst;
+    }
+
+    public override ButtonForm PickAllItems(string filter = null)
+    {
+        var rows = AllItems();
+
+        var bf = new ButtonForm();
+
+        bf.AddButtonRows(rows);
+
+        return bf;
+    }
+
+    public override int CalculateMax(string filter = null)
+    {
+        if (filter == null)
+        {
+            return Countries.Count;
+        }
+
+        return Countries.Where(a => a.IndexOf(filter, StringComparison.InvariantCultureIgnoreCase) != -1).Count();
+    }
+
+    public override ButtonRow Render(object data)
+    {
+        if (!(data is string s))
+        {
+            return new ButtonRow(new ButtonBase("Empty", "zero"));
+        }
+
+        return new ButtonRow(new ButtonBase(s, s));
+    }
+}

TelegramBotBase.Test/Tests/DataSources/List.cs

@@ -0,0 +1,51 @@
+using System.Threading.Tasks;
+using TelegramBotBase.Args;
+using TelegramBotBase.Controls.Hybrid;
+using TelegramBotBase.Enums;
+using TelegramBotBase.Form;
+
+namespace TelegramBotBase.Example.Tests.DataSources;
+
+public class List : FormBase
+{
+    private ButtonGrid _buttons;
+
+    public List()
+    {
+        Init += List_Init;
+    }
+
+    private Task List_Init(object sender, InitEventArgs e)
+    {
+        _buttons = new ButtonGrid
+        {
+            EnablePaging = true,
+            EnableSearch = false
+        };
+
+        _buttons.ButtonClicked += __buttons_ButtonClicked;
+        _buttons.KeyboardType = EKeyboardType.ReplyKeyboard;
+        _buttons.DeleteReplyMessage = true;
+
+        _buttons.HeadLayoutButtonRow = new ButtonRow(new ButtonBase("Back", "back"));
+
+        var cds = new CustomDataSource();
+        _buttons.DataSource = cds;
+
+        AddControl(_buttons);
+        return Task.CompletedTask;
+    }
+
+    private async Task __buttons_ButtonClicked(object sender, ButtonClickedEventArgs e)
+    {
+        switch (e.Button.Value)
+        {
+            case "back":
+
+                var mn = new Menu();
+                await NavigateTo(mn);
+
+                break;
+        }
+    }
+}

TelegramBotBase.Test/Tests/Datasources/CustomDataSource.cs

@@ -1,163 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using TelegramBotBase.Controls.Hybrid;
-using TelegramBotBase.Datasources;
-using TelegramBotBase.Form;
-
-namespace TelegramBotBaseTest.Tests.Datasources
-{
-    public class CustomDataSource : ButtonFormDataSource
-    {
-
-        public List<String> Countries = new List<string>() { "Country 1", "Country 2", "Country 3" };
-
-        public CustomDataSource()
-        {
-            loadData();
-        }
-
-        /// <summary>
-        /// This method has the example purpose of creating and loading some example data.
-        /// When using a database you do not need this kind of method.
-        /// </summary>
-        private void loadData()
-        {
-            //Exists data source? Read it
-            if (File.Exists(AppContext.BaseDirectory + "countries.json"))
-            {
-                try
-                {
-                    var List = Newtonsoft.Json.JsonConvert.DeserializeObject<List<String>>(File.ReadAllText("countries.json"));
-
-
-                    Countries = List;
-                }
-                catch
-                {
-
-                }
-
-
-                return;
-            }
-
-            //If not, create it
-            try
-            {
-                var countries = CultureInfo.GetCultures(CultureTypes.SpecificCultures).Select(a => a.DisplayName).ToList();
-
-                Countries = countries;
-
-                var tmp = Newtonsoft.Json.JsonConvert.SerializeObject(countries);
-
-                File.WriteAllText( AppContext.BaseDirectory + "countries.json", tmp);
-            }
-            catch
-            {
-
-            }
-
-        }
-
-        public override ButtonRow ItemAt(int index)
-        {
-            var item = Countries.ElementAt(index);
-            if (item == null)
-                return new ButtonRow();
-
-            return Render(item);
-        }
-
-        public override List<ButtonRow> ItemRange(int start, int count)
-        {
-            var items = Countries.Skip(start).Take(count);
-
-            List<ButtonRow> lst = new List<ButtonRow>();
-            foreach (var c in items)
-            {
-                lst.Add(Render(c));
-            }
-
-            return lst;
-        }
-
-        public override List<ButtonRow> AllItems()
-        {
-            List<ButtonRow> lst = new List<ButtonRow>();
-            foreach (var c in Countries)
-            {
-                lst.Add(Render(c));
-            }
-            return lst;
-        }
-
-        public override ButtonForm PickItems(int start, int count, string filter = null)
-        {
-            List<ButtonRow> rows = ItemRange(start, count);
-
-            ButtonForm lst = new ButtonForm();
-            foreach (var c in rows)
-            {
-                lst.AddButtonRow(c);
-            }
-            return lst;
-        }
-
-        public override ButtonForm PickAllItems(string filter = null)
-        {
-            List<ButtonRow> rows = AllItems();
-
-            ButtonForm bf = new ButtonForm();
-
-            bf.AddButtonRows(rows);
-
-            return bf;
-        }
-
-        public override int CalculateMax(string filter = null)
-        {
-            if (filter == null)
-                return Countries.Count;
-
-            return Countries.Where(a => a.IndexOf(filter, StringComparison.InvariantCultureIgnoreCase) != -1).Count();
-        }
-
-        public override ButtonRow Render(object data)
-        {
-            var s = data as String;
-            if (s == null)
-                return new ButtonRow(new ButtonBase("Empty", "zero"));
-
-            return new ButtonRow(new ButtonBase(s, s));
-        }
-
-        public override int Count
-        {
-            get
-            {
-                return Countries.Count;
-            }
-        }
-
-        public override int ColumnCount
-        {
-            get
-            {
-                return 1;
-            }
-        }
-
-        public override int RowCount
-        {
-            get
-            {
-                return this.Count;
-            }
-        }
-
-    }
-}

TelegramBotBase.Test/Tests/Datasources/List.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using TelegramBotBase.Base;
-using TelegramBotBase.Controls.Hybrid;
-using TelegramBotBase.Form;
-
-namespace TelegramBotBaseTest.Tests.Datasources
-{
-    public class List : FormBase
-    {
-        ButtonGrid __buttons = null;
-
-        public List()
-        {
-            this.Init += List_Init;
-        }
-
-        private async Task List_Init(object sender, TelegramBotBase.Args.InitEventArgs e)
-        {
-
-            __buttons = new ButtonGrid();
-
-            __buttons.EnablePaging = true;
-            __buttons.EnableSearch = false;
-            __buttons.ButtonClicked += __buttons_ButtonClicked;
-            __buttons.KeyboardType = TelegramBotBase.Enums.eKeyboardType.ReplyKeyboard;
-            __buttons.DeleteReplyMessage = true;
-
-            __buttons.HeadLayoutButtonRow = new ButtonRow(new ButtonBase("Back", "back"));
-
-            var cds = new CustomDataSource();
-            __buttons.DataSource = cds;
-
-            AddControl(__buttons);
-        }
-
-        private async Task __buttons_ButtonClicked(object sender, TelegramBotBase.Args.ButtonClickedEventArgs e)
-        {
-            switch(e.Button.Value)
-            {
-                case "back":
-
-                    var mn = new Menu();
-                    await NavigateTo(mn);
-
-                    break;
-            }
-        }
-
-
-    }
-}

TelegramBotBase.Test/Tests/Groups/GroupChange.cs

@@ -1,76 +1,72 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Groups
+namespace TelegramBotBase.Example.Tests.Groups;
+
+public class GroupChange : GroupForm
 {
-    public class GroupChange : TelegramBotBase.Form.GroupForm
+    public GroupChange()
     {
-        public GroupChange()
-        {
-            this.Opened += GroupChange_Opened;
-        }
-
-
-        private async Task GroupChange_Opened(object sender, EventArgs e)
-        {
-
-            ButtonForm bf = new ButtonForm();
-
-            bf.AddButtonRow(new ButtonBase("Open GroupChange Test", "groupchange"));
-            bf.AddButtonRow(new ButtonBase("Open WelcomeUser Test", "welcomeuser"));
-            bf.AddButtonRow(new ButtonBase("Open LinkReplace Test", "linkreplace"));
-
-            await this.Device.Send("GroupChange started, click to switch", bf);
-
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            if (message.Handled)
-                return;
-
-
-            var bn = message.RawData;
-
-            await message.ConfirmAction();
-            message.Handled = true;
-
-            switch (bn)
-            {
-                case "groupchange":
-
-                    var gc = new GroupChange();
-
-                    await this.NavigateTo(gc);
-
-                    break;
-                case "welcomeuser":
-
-                    var wu = new WelcomeUser();
-
-                    await this.NavigateTo(wu);
-
-                    break;
-                case "linkreplace":
-
-                    var lr = new LinkReplaceTest();
-
-                    await this.NavigateTo(lr);
-
-                    break;
-            }
-
-        }
-
-        public override async Task OnGroupChanged(GroupChangedEventArgs e)
-        {
-            await this.Device.Send("Group has been changed by " + e.OriginalMessage.Message.From.FirstName + " " + e.OriginalMessage.Message.From.LastName);
-        }
-
+        Opened += GroupChange_Opened;
     }
-}
+
+
+    private async Task GroupChange_Opened(object sender, EventArgs e)
+    {
+        var bf = new ButtonForm();
+
+        bf.AddButtonRow(new ButtonBase("Open GroupChange Test", "groupchange"));
+        bf.AddButtonRow(new ButtonBase("Open WelcomeUser Test", "welcomeuser"));
+        bf.AddButtonRow(new ButtonBase("Open LinkReplace Test", "linkreplace"));
+
+        await Device.Send("GroupChange started, click to switch", bf);
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        if (message.Handled)
+        {
+            return;
+        }
+
+
+        var bn = message.RawData;
+
+        await message.ConfirmAction();
+        message.Handled = true;
+
+        switch (bn)
+        {
+            case "groupchange":
+
+                var gc = new GroupChange();
+
+                await NavigateTo(gc);
+
+                break;
+            case "welcomeuser":
+
+                var wu = new WelcomeUser();
+
+                await NavigateTo(wu);
+
+                break;
+            case "linkreplace":
+
+                var lr = new LinkReplaceTest();
+
+                await NavigateTo(lr);
+
+                break;
+        }
+    }
+
+    public override async Task OnGroupChanged(GroupChangedEventArgs e)
+    {
+        await Device.Send("Group has been changed by " + e.OriginalMessage.Message.From.FirstName + " " +
+                          e.OriginalMessage.Message.From.LastName);
+    }
+}

TelegramBotBase.Test/Tests/Groups/LinkReplaceTest.cs

@@ -1,164 +1,165 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Telegram.Bot.Types;
+using Telegram.Bot.Types.Enums;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Groups
+namespace TelegramBotBase.Example.Tests.Groups;
+
+public class LinkReplaceTest : GroupForm
 {
-    public class LinkReplaceTest : TelegramBotBase.Form.GroupForm
+    private const int Maximum = 3;
+
+
+    public LinkReplaceTest()
     {
+        Opened += LinkReplaceTest_Opened;
+    }
 
-        Dictionary<long, int> Counter { get; set; } = new Dictionary<long, int>();
+    private Dictionary<long, int> Counter { get; } = new();
 
-        private const int Maximum = 3;
+    private async Task LinkReplaceTest_Opened(object sender, EventArgs e)
+    {
+        var bf = new ButtonForm();
 
+        bf.AddButtonRow(new ButtonBase("Open GroupChange Test", "groupchange"));
+        bf.AddButtonRow(new ButtonBase("Open WelcomeUser Test", "welcomeuser"));
+        bf.AddButtonRow(new ButtonBase("Open LinkReplace Test", "linkreplace"));
 
-        public LinkReplaceTest()
+        await Device.Send("LinkReplaceTest started, click to switch", bf);
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        if (message.Handled)
         {
-            this.Opened += LinkReplaceTest_Opened;
+            return;
         }
 
-        private async Task LinkReplaceTest_Opened(object sender, EventArgs e)
+        var bn = message.RawData;
+
+        await message.ConfirmAction();
+        message.Handled = true;
+
+        switch (bn)
         {
+            case "groupchange":
 
-            ButtonForm bf = new ButtonForm();
+                var gc = new GroupChange();
 
-            bf.AddButtonRow(new ButtonBase("Open GroupChange Test", "groupchange"));
-            bf.AddButtonRow(new ButtonBase("Open WelcomeUser Test", "welcomeuser"));
-            bf.AddButtonRow(new ButtonBase("Open LinkReplace Test", "linkreplace"));
+                await NavigateTo(gc);
 
-            await this.Device.Send("LinkReplaceTest started, click to switch", bf);
+                break;
+            case "welcomeuser":
 
+                var wu = new WelcomeUser();
+
+                await NavigateTo(wu);
+
+                break;
+            case "linkreplace":
+
+                var lr = new LinkReplaceTest();
+
+                await NavigateTo(lr);
+
+                break;
+        }
+    }
+
+    public override async Task OnMessage(MessageResult e)
+    {
+        var from = e.Message.From.Id;
+
+        if (e.Message.From.IsBot)
+        {
+            return;
         }
 
-        public override async Task Action(MessageResult message)
+        //Are urls inside his message ?
+        if (!HasLinks(e.MessageText))
         {
-            if (message.Handled)
-                return;
-
-            var bn = message.RawData;
-
-            await message.ConfirmAction();
-            message.Handled = true;
-
-            switch (bn)
-            {
-                case "groupchange":
-
-                    var gc = new GroupChange();
-
-                    await this.NavigateTo(gc);
-
-                    break;
-                case "welcomeuser":
-
-                    var wu = new WelcomeUser();
-
-                    await this.NavigateTo(wu);
-
-                    break;
-                case "linkreplace":
-
-                    var lr = new LinkReplaceTest();
-
-                    await this.NavigateTo(lr);
-
-                    break;
-            }
-
+            return;
         }
 
-        public override async Task OnMessage(MessageResult e)
+        var u = await Device.GetChatUser(from);
+
+        //Don't kick Admins or Creators
+        if ((u.Status == ChatMemberStatus.Administrator) | (u.Status == ChatMemberStatus.Creator))
         {
-            var from = e.Message.From.Id;
-
-            if (e.Message.From.IsBot)
-                return;
-
-            //Are urls inside his message ?
-            if (!HasLinks(e.MessageText))
-                return;
-
-            var u = await Device.GetChatUser(from);
-
-            //Don't kick Admins or Creators
-            if (u.Status == Telegram.Bot.Types.Enums.ChatMemberStatus.Administrator | u.Status == Telegram.Bot.Types.Enums.ChatMemberStatus.Creator)
-            {
-                await this.Device.Send("You won't get kicked,...not this time.");
-                return;
-            }
-
-            await e.Device.DeleteMessage(e.MessageId);
-
-            var cp = new ChatPermissions();
-            cp.CanAddWebPagePreviews = false;
-            cp.CanChangeInfo = false;
-            cp.CanInviteUsers = false;
-            cp.CanPinMessages = false;
-            cp.CanSendMediaMessages = false;
-            cp.CanSendMessages = false;
-            cp.CanSendOtherMessages = false;
-            cp.CanSendPolls = false;
-
-            //Collect user "mistakes" with sending url, after 3 he gets kicked out.
-            if (Counter.ContainsKey(from))
-            {
-                Counter[from]++;
-            }
-            else
-            {
-                Counter[from] = 1;
-            }
-
-
-            if (Counter[from] >= 3)
-            {
-                await e.Device.KickUser(from);
-
-                await e.Device.Send(e.Message.From.FirstName + " " + e.Message.From.LastName + " has been removed from the group");
-            }
-            else
-            {
-                await e.Device.RestrictUser(from, cp, DateTime.UtcNow.AddSeconds(30));
-
-                await e.Device.Send(e.Message.From.FirstName + " " + e.Message.From.LastName + " has been blocked for 30 seconds");
-            }
-
-
-
+            await Device.Send("You won't get kicked,...not this time.");
+            return;
         }
 
-        /// <summary>
-        /// Call onmessage also on edited message, if someone want to spoof a failed message and insert a link.
-        /// </summary>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        public override async Task OnMessageEdit(MessageResult message)
+        await e.Device.DeleteMessage(e.MessageId);
+
+        var cp = new ChatPermissions
         {
-            await OnMessage(message);
+            CanAddWebPagePreviews = false,
+            CanChangeInfo = false,
+            CanInviteUsers = false,
+            CanPinMessages = false,
+            CanSendMediaMessages = false,
+            CanSendMessages = false,
+            CanSendOtherMessages = false,
+            CanSendPolls = false
+        };
+
+        //Collect user "mistakes" with sending url, after 3 he gets kicked out.
+        if (Counter.ContainsKey(from))
+        {
+            Counter[from]++;
         }
-
-        /// <summary>
-        /// https://stackoverflow.com/a/20651284
-        /// </summary>
-        /// <param name="str"></param>
-        /// <returns></returns>
-        private bool HasLinks(String str)
+        else
         {
-            var tmp = str;
-
-            var pattern = @"^(http|https|ftp|)\://|[a-zA-Z0-9\-\.]+\.[a-zA-Z](:[a-zA-Z0-9]*)?/?([a-zA-Z0-9\-\._\?\,\'/\\\+&amp;%\$#\=~])*[^\.\,\)\(\s]$";
-            Regex r = new Regex(pattern);
-
-            var matches = r.Matches(tmp);
-
-            return (matches.Count > 0);
+            Counter[from] = 1;
         }
 
 
+        if (Counter[from] >= 3)
+        {
+            await e.Device.BanUser(from);
+
+            await e.Device.Send(e.Message.From.FirstName + " " + e.Message.From.LastName +
+                                " has been removed from the group");
+        }
+        else
+        {
+            await e.Device.RestrictUser(from, cp, DateTime.UtcNow.AddSeconds(30));
+
+            await e.Device.Send(e.Message.From.FirstName + " " + e.Message.From.LastName +
+                                " has been blocked for 30 seconds");
+        }
+    }
+
+    /// <summary>
+    ///     Call onmessage also on edited message, if someone want to spoof a failed message and insert a link.
+    /// </summary>
+    /// <param name="message"></param>
+    /// <returns></returns>
+    public override async Task OnMessageEdit(MessageResult message)
+    {
+        await OnMessage(message);
+    }
+
+    /// <summary>
+    ///     https://stackoverflow.com/a/20651284
+    /// </summary>
+    /// <param name="str"></param>
+    /// <returns></returns>
+    private bool HasLinks(string str)
+    {
+        var tmp = str;
+
+        var pattern =
+            @"^(http|https|ftp|)\://|[a-zA-Z0-9\-\.]+\.[a-zA-Z](:[a-zA-Z0-9]*)?/?([a-zA-Z0-9\-\._\?\,\'/\\\+&amp;%\$#\=~])*[^\.\,\)\(\s]$";
+        var r = new Regex(pattern);
+
+        var matches = r.Matches(tmp);
+
+        return matches.Count > 0;
     }
 }

TelegramBotBase.Test/Tests/Groups/WelcomeUser.cs

@@ -1,92 +1,82 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Linq;
 using System.Threading.Tasks;
+using Telegram.Bot.Types.Enums;
+using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
-using TelegramBotBase.Args;
 
-namespace TelegramBotBaseTest.Tests.Groups
+namespace TelegramBotBase.Example.Tests.Groups;
+
+public class WelcomeUser : GroupForm
 {
-    public class WelcomeUser : TelegramBotBase.Form.GroupForm
+    public WelcomeUser()
     {
-
-        public WelcomeUser()
-        {
-            this.Opened += WelcomeUser_Opened;
-        }
-
-
-        private async Task WelcomeUser_Opened(object sender, EventArgs e)
-        {
-
-            ButtonForm bf = new ButtonForm();
-
-            bf.AddButtonRow(new ButtonBase("Open GroupChange Test", "groupchange"));
-            bf.AddButtonRow(new ButtonBase("Open WelcomeUser Test", "welcomeuser"));
-            bf.AddButtonRow(new ButtonBase("Open LinkReplace Test", "linkreplace"));
-
-            await this.Device.Send("WelcomeUser started, click to switch", bf);
-
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            if (message.Handled)
-                return;
-
-            var bn = message.RawData;
-
-            await message.ConfirmAction();
-            message.Handled = true;
-
-            switch (bn)
-            {
-                case "groupchange":
-
-                    var gc = new GroupChange();
-
-                    await this.NavigateTo(gc);
-
-                    break;
-                case "welcomeuser":
-
-                    var wu = new WelcomeUser();
-
-                    await this.NavigateTo(wu);
-
-                    break;
-                case "linkreplace":
-
-                    var lr = new LinkReplaceTest();
-
-                    await this.NavigateTo(lr);
-
-                    break;
-            }
-
-        }
-
-        public override async Task OnMemberChanges(MemberChangeEventArgs e)
-        {
-
-            if (e.Type == Telegram.Bot.Types.Enums.MessageType.ChatMembersAdded)
-            {
-
-                await this.Device.Send("Welcome you new members!\r\n\r\n" + e.Members.Select(a => a.FirstName + " " + a.LastName).Aggregate((a, b) => a + "\r\n" + b));
-
-            }
-            else if (e.Type == Telegram.Bot.Types.Enums.MessageType.ChatMemberLeft)
-            {
-                await this.Device.Send(e.Members.Select(a => a.FirstName + " " + a.LastName).Aggregate((a, b) => a + " and " + b) + " has left the group");
-
-            }
-
-        }
-
-
-
-
+        Opened += WelcomeUser_Opened;
     }
-}
+
+
+    private async Task WelcomeUser_Opened(object sender, EventArgs e)
+    {
+        var bf = new ButtonForm();
+
+        bf.AddButtonRow(new ButtonBase("Open GroupChange Test", "groupchange"));
+        bf.AddButtonRow(new ButtonBase("Open WelcomeUser Test", "welcomeuser"));
+        bf.AddButtonRow(new ButtonBase("Open LinkReplace Test", "linkreplace"));
+
+        await Device.Send("WelcomeUser started, click to switch", bf);
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        if (message.Handled)
+        {
+            return;
+        }
+
+        var bn = message.RawData;
+
+        await message.ConfirmAction();
+        message.Handled = true;
+
+        switch (bn)
+        {
+            case "groupchange":
+
+                var gc = new GroupChange();
+
+                await NavigateTo(gc);
+
+                break;
+            case "welcomeuser":
+
+                var wu = new WelcomeUser();
+
+                await NavigateTo(wu);
+
+                break;
+            case "linkreplace":
+
+                var lr = new LinkReplaceTest();
+
+                await NavigateTo(lr);
+
+                break;
+        }
+    }
+
+    public override async Task OnMemberChanges(MemberChangeEventArgs e)
+    {
+        if (e.Type == MessageType.ChatMembersAdded)
+        {
+            await Device.Send("Welcome you new members!\r\n\r\n" + e.Members.Select(a => a.FirstName + " " + a.LastName)
+                                                                    .Aggregate((a, b) => a + "\r\n" + b));
+        }
+        else if (e.Type == MessageType.ChatMemberLeft)
+        {
+            await Device.Send(
+                e.Members.Select(a => a.FirstName + " " + a.LastName).Aggregate((a, b) => a + " and " + b) +
+                " has left the group");
+        }
+    }
+}

TelegramBotBase.Test/Tests/Menu.cs

@@ -1,264 +1,265 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Telegram.Bot.Types.Enums;
 using TelegramBotBase.Base;
+using TelegramBotBase.Enums;
+using TelegramBotBase.Example.Tests.Controls;
+using TelegramBotBase.Example.Tests.DataSources;
+using TelegramBotBase.Example.Tests.Groups;
 using TelegramBotBase.Form;
-using TelegramBotBaseTest.Tests.Controls;
 
-namespace TelegramBotBaseTest.Tests
+namespace TelegramBotBase.Example.Tests;
+
+public class Menu : AutoCleanForm
 {
-    public class Menu : AutoCleanForm
+    public Menu()
     {
-        public Menu()
+        DeleteMode = EDeleteMode.OnLeavingForm;
+    }
+
+    public override async Task Load(MessageResult message)
+    {
+        if ((message.Message.Chat.Type == ChatType.Group) | (message.Message.Chat.Type == ChatType.Supergroup))
         {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-        }
+            var sf = new WelcomeUser();
 
-        public override async Task Load(MessageResult message)
-        {
-
-
-            if (message.Message.Chat.Type == Telegram.Bot.Types.Enums.ChatType.Group | message.Message.Chat.Type == Telegram.Bot.Types.Enums.ChatType.Supergroup)
-            {
-                var sf = new TelegramBotBaseTest.Tests.Groups.WelcomeUser();
-
-                await this.NavigateTo(sf);
-            }
-
-
-            await Device.HideReplyKeyboard();
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            var call = message.GetData<CallbackData>();
-
-            await message.ConfirmAction();
-
-
-            if (call == null)
-                return;
-
-            message.Handled = true;
-
-            switch (call.Value)
-            {
-                case "text":
-
-                    var sf = new SimpleForm();
-
-                    await this.NavigateTo(sf);
-
-                    break;
-
-                case "buttons":
-
-                    var bf = new ButtonTestForm();
-
-                    await this.NavigateTo(bf);
-
-                    break;
-
-                case "progress":
-
-                    var pf = new ProgressTest();
-
-                    await this.NavigateTo(pf);
-
-                    break;
-
-                case "registration":
-
-                    var reg = new Register.Start();
-
-                    await this.NavigateTo(reg);
-
-                    break;
-
-                case "form1":
-
-                    var form1 = new TestForm();
-
-                    await this.NavigateTo(form1);
-
-                    break;
-
-                case "form2":
-
-                    var form2 = new TestForm2();
-
-                    await this.NavigateTo(form2);
-
-                    break;
-
-                case "data":
-
-                    var data = new DataForm();
-
-                    await this.NavigateTo(data);
-
-                    break;
-
-                case "calendar":
-
-                    var calendar = new Controls.CalendarPickerForm();
-
-                    await this.NavigateTo(calendar);
-
-                    break;
-
-                case "month":
-
-                    var month = new Controls.MonthPickerForm();
-
-                    await this.NavigateTo(month);
-
-                    break;
-
-                case "treeview":
-
-                    var tree = new Controls.TreeViewForms();
-
-                    await this.NavigateTo(tree);
-
-                    break;
-
-                case "togglebuttons":
-
-                    var tb = new Controls.ToggleButtons();
-
-                    await this.NavigateTo(tb);
-
-                    break;
-
-                case "multitogglebuttons":
-
-                    var mtb = new Controls.MultiToggleButtons();
-
-                    await this.NavigateTo(mtb);
-
-                    break;
-
-                case "buttongrid":
-
-                    var bg = new Controls.ButtonGridForm();
-
-                    await this.NavigateTo(bg);
-
-                    break;
-
-                case "buttongridfilter":
-
-                    var bg2 = new Controls.ButtonGridPagingForm();
-
-                    await this.NavigateTo(bg2);
-
-                    break;
-
-                case "buttongridtags":
-
-                    var bg3 = new Controls.ButtonGridTagForm();
-
-                    await this.NavigateTo(bg3);
-
-                    break;
-
-                case "multiview":
-
-                    var mvf = new MultiViewForm();
-
-                    await NavigateTo(mvf);
-
-
-                    break;
-
-                case "checkedbuttonlist":
-
-                    var cbl = new CheckedButtonListForm();
-
-                    await NavigateTo(cbl);
-
-
-                    break;
-
-                case "navigationcontroller":
-
-                    var nc = new Navigation.Start();
-
-                    await NavigateTo(nc);
-
-
-                    break;
-
-                case "dynamicbuttongrid":
-
-                    var dg = new Datasources.List();
-
-                    await NavigateTo(dg);
-
-                    break;
-
-                case "notifications":
-
-                    var not = new Notifications.Start();
-                    await NavigateTo(not);
-
-                    break;
-
-                default:
-
-                    message.Handled = false;
-
-                    break;
-            }
-
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-
-            ButtonForm btn = new ButtonForm();
-
-            btn.AddButtonRow(new ButtonBase("#1 Simple Text", new CallbackData("a", "text").Serialize()), new ButtonBase("#2 Button Test", new CallbackData("a", "buttons").Serialize()));
-            btn.AddButtonRow(new ButtonBase("#3 Progress Bar", new CallbackData("a", "progress").Serialize()));
-            btn.AddButtonRow(new ButtonBase("#4 Registration Example", new CallbackData("a", "registration").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#5 Form1 Command", new CallbackData("a", "form1").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#6 Form2 Command", new CallbackData("a", "form2").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#7 Data Handling", new CallbackData("a", "data").Serialize()));
-            btn.AddButtonRow(new ButtonBase("#8 Calendar Picker", new CallbackData("a", "calendar").Serialize()));
-            btn.AddButtonRow(new ButtonBase("#9 Month Picker", new CallbackData("a", "month").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#10 TreeView", new CallbackData("a", "treeview").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#11 ToggleButtons", new CallbackData("a", "togglebuttons").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#11.2 MultiToggleButtons", new CallbackData("a", "multitogglebuttons").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#12 ButtonGrid", new CallbackData("a", "buttongrid").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#13 ButtonGrid Paging & Filter", new CallbackData("a", "buttongridfilter").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#14 ButtonGrid Tags (Filter)", new CallbackData("a", "buttongridtags").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#15 MultiView", new CallbackData("a", "multiview").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#16 CheckedButtonList", new CallbackData("a", "checkedbuttonlist").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#17 NavigationController (Push/Pop)", new CallbackData("a", "navigationcontroller").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#18 Dynamic ButtonGrid (DataSources)", new CallbackData("a", "dynamicbuttongrid").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("#19 Notifications", new CallbackData("a", "notifications").Serialize()));
-
-            await this.Device.Send("Choose your test:", btn);
+            await NavigateTo(sf);
         }
 
 
+        await Device.HideReplyKeyboard();
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        var call = message.GetData<CallbackData>();
+
+        await message.ConfirmAction();
+
+
+        if (call == null)
+        {
+            return;
+        }
+
+        message.Handled = true;
+
+        switch (call.Value)
+        {
+            case "text":
+
+                var sf = new SimpleForm();
+
+                await NavigateTo(sf);
+
+                break;
+
+            case "buttons":
+
+                var bf = new ButtonTestForm();
+
+                await NavigateTo(bf);
+
+                break;
+
+            case "progress":
+
+                var pf = new ProgressTest();
+
+                await NavigateTo(pf);
+
+                break;
+
+            case "registration":
+
+                var reg = new Register.Start();
+
+                await NavigateTo(reg);
+
+                break;
+
+            case "form1":
+
+                var form1 = new TestForm();
+
+                await NavigateTo(form1);
+
+                break;
+
+            case "form2":
+
+                var form2 = new TestForm2();
+
+                await NavigateTo(form2);
+
+                break;
+
+            case "data":
+
+                var data = new DataForm();
+
+                await NavigateTo(data);
+
+                break;
+
+            case "calendar":
+
+                var calendar = new CalendarPickerForm();
+
+                await NavigateTo(calendar);
+
+                break;
+
+            case "month":
+
+                var month = new MonthPickerForm();
+
+                await NavigateTo(month);
+
+                break;
+
+            case "treeview":
+
+                var tree = new TreeViewForms();
+
+                await NavigateTo(tree);
+
+                break;
+
+            case "togglebuttons":
+
+                var tb = new ToggleButtons();
+
+                await NavigateTo(tb);
+
+                break;
+
+            case "multitogglebuttons":
+
+                var mtb = new MultiToggleButtons();
+
+                await NavigateTo(mtb);
+
+                break;
+
+            case "buttongrid":
+
+                var bg = new ButtonGridForm();
+
+                await NavigateTo(bg);
+
+                break;
+
+            case "buttongridfilter":
+
+                var bg2 = new ButtonGridPagingForm();
+
+                await NavigateTo(bg2);
+
+                break;
+
+            case "buttongridtags":
+
+                var bg3 = new ButtonGridTagForm();
+
+                await NavigateTo(bg3);
+
+                break;
+
+            case "multiview":
+
+                var mvf = new MultiViewForm();
+
+                await NavigateTo(mvf);
+
+
+                break;
+
+            case "checkedbuttonlist":
+
+                var cbl = new CheckedButtonListForm();
+
+                await NavigateTo(cbl);
+
+
+                break;
+
+            case "navigationcontroller":
+
+                var nc = new Navigation.Start();
+
+                await NavigateTo(nc);
+
+
+                break;
+
+            case "dynamicbuttongrid":
+
+                var dg = new List();
+
+                await NavigateTo(dg);
+
+                break;
+
+            case "notifications":
+
+                var not = new Notifications.Start();
+                await NavigateTo(not);
+
+                break;
+
+            default:
+
+                message.Handled = false;
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var btn = new ButtonForm();
+
+        btn.AddButtonRow(new ButtonBase("#1 Simple Text", new CallbackData("a", "text").Serialize()),
+                         new ButtonBase("#2 Button Test", new CallbackData("a", "buttons").Serialize()));
+        btn.AddButtonRow(new ButtonBase("#3 Progress Bar", new CallbackData("a", "progress").Serialize()));
+        btn.AddButtonRow(new ButtonBase("#4 Registration Example", new CallbackData("a", "registration").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#5 Form1 Command", new CallbackData("a", "form1").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#6 Form2 Command", new CallbackData("a", "form2").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#7 Data Handling", new CallbackData("a", "data").Serialize()));
+        btn.AddButtonRow(new ButtonBase("#8 Calendar Picker", new CallbackData("a", "calendar").Serialize()));
+        btn.AddButtonRow(new ButtonBase("#9 Month Picker", new CallbackData("a", "month").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#10 TreeView", new CallbackData("a", "treeview").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#11 ToggleButtons", new CallbackData("a", "togglebuttons").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#11.2 MultiToggleButtons",
+                                        new CallbackData("a", "multitogglebuttons").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#12 ButtonGrid", new CallbackData("a", "buttongrid").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#13 ButtonGrid Paging & Filter",
+                                        new CallbackData("a", "buttongridfilter").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#14 ButtonGrid Tags (Filter)",
+                                        new CallbackData("a", "buttongridtags").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#15 MultiView", new CallbackData("a", "multiview").Serialize()));
+
+        btn.AddButtonRow(
+            new ButtonBase("#16 CheckedButtonList", new CallbackData("a", "checkedbuttonlist").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#17 NavigationController (Push/Pop)",
+                                        new CallbackData("a", "navigationcontroller").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#18 Dynamic ButtonGrid (DataSources)",
+                                        new CallbackData("a", "dynamicbuttongrid").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("#19 Notifications", new CallbackData("a", "notifications").Serialize()));
+
+        await Device.Send("Choose your test:", btn);
     }
 }

TelegramBotBase.Test/Tests/Navigation/CustomController.cs

@@ -1,44 +1,39 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using TelegramBotBase.Form;
 using TelegramBotBase.Form.Navigation;
 
-namespace TelegramBotBaseTest.Tests.Navigation
+namespace TelegramBotBase.Example.Tests.Navigation;
+
+internal class CustomController : NavigationController
 {
-    class CustomController : NavigationController
+    public CustomController(FormBase form) : base(form)
     {
-        public CustomController(FormBase form) : base(form)
-        {
-
-        }
-
-
-        public override Task PushAsync(FormBase form, params object[] args)
-        {
-            Console.WriteLine($"Pushes form (Count on stack {this.Index + 1})");
-            //Device.Send($"Pushes form (Count on stack {this.Index + 1})");
-
-            return base.PushAsync(form, args);
-        }
-
-
-        public override Task PopAsync()
-        {
-            Console.WriteLine($"Pops one form (Count on stack {this.Index + 1})");
-            //Device.Send($"Pops one form (Count on stack {this.Index + 1})");
-
-            return base.PopAsync();
-        }
-
-        public override Task PopToRootAsync()
-        {
-            Console.WriteLine($"Moved back to root (Count on stack {this.Index + 1})");
-            //Device.Send($"Moved back to root (Count on stack {this.Index + 1})");
-
-            return base.PopToRootAsync();
-        }
-
     }
-}
+
+
+    public override Task PushAsync(FormBase form, params object[] args)
+    {
+        Console.WriteLine($"Pushes form (Count on stack {Index + 1})");
+        //Device.Send($"Pushes form (Count on stack {this.Index + 1})");
+
+        return base.PushAsync(form, args);
+    }
+
+
+    public override Task PopAsync()
+    {
+        Console.WriteLine($"Pops one form (Count on stack {Index + 1})");
+        //Device.Send($"Pops one form (Count on stack {this.Index + 1})");
+
+        return base.PopAsync();
+    }
+
+    public override Task PopToRootAsync()
+    {
+        Console.WriteLine($"Moved back to root (Count on stack {Index + 1})");
+        //Device.Send($"Moved back to root (Count on stack {this.Index + 1})");
+
+        return base.PopToRootAsync();
+    }
+}

TelegramBotBase.Test/Tests/Navigation/Form1.cs

@@ -1,88 +1,83 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Telegram.Bot.Types;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Navigation
+namespace TelegramBotBase.Example.Tests.Navigation;
+
+public class Form1 : FormBase
 {
-    public class Form1 : FormBase
+    private Message _msg;
+
+    public Form1()
     {
-        Message msg = null;
-
-        public Form1()
-        {
-            this.Closed += Form1_Closed;
-        }
-
-        private async Task Form1_Closed(object sender, EventArgs e)
-        {
-            if (msg == null)
-                return;
-
-            await Device.DeleteMessage(msg);
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            if (message.Handled)
-                return;
-
-            await message.ConfirmAction();
-
-            switch (message.RawData)
-            {
-                case "next":
-
-                    message.Handled = true;
-
-                    var f1 = new Form1();
-
-                    await NavigationController.PushAsync(f1);
-
-
-                    break;
-
-                case "previous":
-
-                    message.Handled = true;
-
-                    //Pop's the current form and move the previous one. The root form will be the Start class.
-                    await NavigationController.PopAsync();
-
-                    break;
-
-                case "root":
-
-                    message.Handled = true;
-
-                    await NavigationController.PopToRootAsync();
-
-                    break;
-
-
-            }
-
-
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            if (msg != null)
-                return;
-
-            var bf = new ButtonForm();
-            bf.AddButtonRow("Next page", "next");
-            bf.AddButtonRow("Previous page", "previous");
-            bf.AddButtonRow("Back to root", "root");
-
-            msg = await Device.Send($"Choose your options (Count on stack {NavigationController.Index + 1})", bf);
-
-        }
-
-
+        Closed += Form1_Closed;
     }
-}
+
+    private async Task Form1_Closed(object sender, EventArgs e)
+    {
+        if (_msg == null)
+        {
+            return;
+        }
+
+        await Device.DeleteMessage(_msg);
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        if (message.Handled)
+        {
+            return;
+        }
+
+        await message.ConfirmAction();
+
+        switch (message.RawData)
+        {
+            case "next":
+
+                message.Handled = true;
+
+                var f1 = new Form1();
+
+                await NavigationController.PushAsync(f1);
+
+
+                break;
+
+            case "previous":
+
+                message.Handled = true;
+
+                //Pop's the current form and move the previous one. The root form will be the Start class.
+                await NavigationController.PopAsync();
+
+                break;
+
+            case "root":
+
+                message.Handled = true;
+
+                await NavigationController.PopToRootAsync();
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        if (_msg != null)
+        {
+            return;
+        }
+
+        var bf = new ButtonForm();
+        bf.AddButtonRow("Next page", "next");
+        bf.AddButtonRow("Previous page", "previous");
+        bf.AddButtonRow("Back to root", "root");
+
+        _msg = await Device.Send($"Choose your options (Count on stack {NavigationController.Index + 1})", bf);
+    }
+}

TelegramBotBase.Test/Tests/Navigation/Start.cs

@@ -1,91 +1,80 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Telegram.Bot.Types;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
-using TelegramBotBase.Form.Navigation;
 
-namespace TelegramBotBaseTest.Tests.Navigation
+namespace TelegramBotBase.Example.Tests.Navigation;
+
+public class Start : FormBase
 {
-    public class Start : FormBase
+    private Message _msg;
+
+
+    public override Task Load(MessageResult message)
     {
-
-        Message msg = null;
-
-        public Start()
-        {
-
-        }
-
-
-        public override async Task Load(MessageResult message)
-        {
-
-
-
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            if (message.Handled)
-                return;
-
-            await message.ConfirmAction();
-
-            switch (message.RawData)
-            {
-                case "yes":
-
-                    message.Handled = true;
-
-                    //Create navigation controller and navigate to it, keep the current form as root form so we can get back to here later
-                    var nc = new CustomController(this);
-                    nc.ForceCleanupOnLastPop = true;
-
-                    var f1 = new Form1();
-
-                    await nc.PushAsync(f1);
-
-                    await NavigateTo(nc);
-
-                    if (msg == null)
-                        return;
-
-                    await Device.DeleteMessage(msg);
-
-
-                    break;
-                case "no":
-
-                    message.Handled = true;
-
-                    var mn = new Menu();
-
-                    await NavigateTo(mn);
-
-                    if (msg == null)
-                        return;
-
-                    await Device.DeleteMessage(msg);
-
-                    break;
-            }
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            var bf = new ButtonForm();
-
-            bf.AddButtonRow("Yes", "yes");
-            bf.AddButtonRow("No", "no");
-
-            msg = await Device.Send("Open controller?", bf);
-
-
-        }
-
+        return Task.CompletedTask;
     }
-}
+
+    public override async Task Action(MessageResult message)
+    {
+        if (message.Handled)
+        {
+            return;
+        }
+
+        await message.ConfirmAction();
+
+        switch (message.RawData)
+        {
+            case "yes":
+
+                message.Handled = true;
+
+                //Create navigation controller and navigate to it, keep the current form as root form so we can get back to here later
+                var nc = new CustomController(this);
+                nc.ForceCleanupOnLastPop = true;
+
+                var f1 = new Form1();
+
+                await nc.PushAsync(f1);
+
+                await NavigateTo(nc);
+
+                if (_msg == null)
+                {
+                    return;
+                }
+
+                await Device.DeleteMessage(_msg);
+
+
+                break;
+            case "no":
+
+                message.Handled = true;
+
+                var mn = new Menu();
+
+                await NavigateTo(mn);
+
+                if (_msg == null)
+                {
+                    return;
+                }
+
+                await Device.DeleteMessage(_msg);
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var bf = new ButtonForm();
+
+        bf.AddButtonRow("Yes", "yes");
+        bf.AddButtonRow("No", "no");
+
+        _msg = await Device.Send("Open controller?", bf);
+    }
+}

TelegramBotBase.Test/Tests/Notifications/Start.cs

@@ -1,63 +1,61 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using TelegramBotBase.Base;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Notifications
+namespace TelegramBotBase.Example.Tests.Notifications;
+
+public class Start : AutoCleanForm
 {
-    public class Start : AutoCleanForm
+    private bool _sent;
+
+    public Start()
     {
-        bool sent = false;
-
-        public Start()
-        {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-        }
-
-        public override async Task Action(MessageResult message)
-        {
-            if (message.Handled)
-                return;
-
-            switch (message.RawData)
-            {
-                case "alert":
-
-                    await message.ConfirmAction("This is an alert.", true);
-
-                    break;
-                case "back":
-
-                    var mn = new Menu();
-                    await NavigateTo(mn);
-
-                    break;
-                default:
-
-                    await message.ConfirmAction("This is feedback");
-
-                    break;
-
-            }
-
-        }
-
-        public override async Task Render(MessageResult message)
-        {
-            if (sent)
-                return;
-
-            var bf = new ButtonForm();
-            bf.AddButtonRow("Normal feeback", "normal");
-            bf.AddButtonRow("Alert Box", "alert");
-            bf.AddButtonRow("Back", "back");
-
-            await Device.Send("Choose your test", bf);
-
-            sent = true;
-        }
-
+        DeleteMode = EDeleteMode.OnLeavingForm;
     }
-}
+
+    public override async Task Action(MessageResult message)
+    {
+        if (message.Handled)
+        {
+            return;
+        }
+
+        switch (message.RawData)
+        {
+            case "alert":
+
+                await message.ConfirmAction("This is an alert.", true);
+
+                break;
+            case "back":
+
+                var mn = new Menu();
+                await NavigateTo(mn);
+
+                break;
+            default:
+
+                await message.ConfirmAction("This is feedback");
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        if (_sent)
+        {
+            return;
+        }
+
+        var bf = new ButtonForm();
+        bf.AddButtonRow("Normal feeback", "normal");
+        bf.AddButtonRow("Alert Box", "alert");
+        bf.AddButtonRow("Back", "back");
+
+        await Device.Send("Choose your test", bf);
+
+        _sent = true;
+    }
+}

TelegramBotBase.Test/Tests/ProgressTest.cs

@@ -1,130 +1,136 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using TelegramBotBase.Base;
 using TelegramBotBase.Controls.Inline;
+using TelegramBotBase.Enums;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests
+namespace TelegramBotBase.Example.Tests;
+
+public class ProgressTest : AutoCleanForm
 {
-    public class ProgressTest : AutoCleanForm
+    public ProgressTest()
     {
+        DeleteMode = EDeleteMode.OnLeavingForm;
+        Opened += ProgressTest_Opened;
+        Closed += ProgressTest_Closed;
+    }
 
-        public ProgressTest()
+
+    private async Task ProgressTest_Opened(object sender, EventArgs e)
+    {
+        await Device.Send("Welcome to ProgressTest");
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        var call = message.GetData<CallbackData>();
+
+        await message.ConfirmAction();
+
+
+        if (call == null)
         {
-            this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
-            this.Opened += ProgressTest_Opened;
-            this.Closed += ProgressTest_Closed;
+            return;
         }
 
+        ProgressBar bar = null;
 
-        private async Task ProgressTest_Opened(object sender, EventArgs e)
+        switch (call.Value)
         {
-            await this.Device.Send("Welcome to ProgressTest");
-        }
+            case "standard":
 
-        public override async Task Action(MessageResult message)
-        {
-            var call = message.GetData<CallbackData>();
+                bar = new ProgressBar(0, 100, ProgressBar.EProgressStyle.standard)
+                {
+                    Device = Device
+                };
 
-            await message.ConfirmAction();
+                break;
 
+            case "squares":
+
+                bar = new ProgressBar(0, 100, ProgressBar.EProgressStyle.squares)
+                {
+                    Device = Device
+                };
+
+                break;
+
+            case "circles":
+
+                bar = new ProgressBar(0, 100, ProgressBar.EProgressStyle.circles)
+                {
+                    Device = Device
+                };
+
+                break;
+
+            case "lines":
+
+                bar = new ProgressBar(0, 100, ProgressBar.EProgressStyle.lines)
+                {
+                    Device = Device
+                };
+
+                break;
+
+            case "squaredlines":
+
+                bar = new ProgressBar(0, 100, ProgressBar.EProgressStyle.squaredLines)
+                {
+                    Device = Device
+                };
+
+                break;
+
+            case "start":
+
+                var sf = new Menu();
+
+                await NavigateTo(sf);
 
-            if (call == null)
                 return;
 
-            ProgressBar Bar = null;
-
-            switch (call.Value)
-            {
-                case "standard":
-
-                    Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.standard);
-                    Bar.Device = this.Device;
-
-                    break;
-
-                case "squares":
-
-                    Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.squares);
-                    Bar.Device = this.Device;
-
-                    break;
-
-                case "circles":
-
-                    Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.circles);
-                    Bar.Device = this.Device;
-
-                    break;
-
-                case "lines":
-
-                    Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.lines);
-                    Bar.Device = this.Device;
-
-                    break;
-
-                case "squaredlines":
-
-                    Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.squaredLines);
-                    Bar.Device = this.Device;
-
-                    break;
-
-                case "start":
-
-                    var sf = new Menu();
-
-                    await this.NavigateTo(sf);
-
-                    return;
-
-                default:
-
-                    return;
-
-            }
-
-
-            //Render Progress bar and show some "example" progress
-            await Bar.Render(message);
-
-            this.Controls.Add(Bar);
-
-            for (int i = 0; i <= 100; i++)
-            {
-                Bar.Value++;
-                await Bar.Render(message);
-
-                Thread.Sleep(250);
-            }
-
+            default:
 
+                return;
         }
 
 
-        public override async Task Render(MessageResult message)
+        //Render Progress bar and show some "example" progress
+        await bar.Render(message);
+
+        Controls.Add(bar);
+
+        for (var i = 0; i <= 100; i++)
         {
-            ButtonForm btn = new ButtonForm();
-            btn.AddButtonRow(new ButtonBase("Standard", new CallbackData("a", "standard").Serialize()), new ButtonBase("Squares", new CallbackData("a", "squares").Serialize()));
+            bar.Value++;
+            await bar.Render(message);
 
-            btn.AddButtonRow(new ButtonBase("Circles", new CallbackData("a", "circles").Serialize()), new ButtonBase("Lines", new CallbackData("a", "lines").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("Squared Line", new CallbackData("a", "squaredlines").Serialize()));
-
-            btn.AddButtonRow(new ButtonBase("Back to start", new CallbackData("a", "start").Serialize()));
-
-            await this.Device.Send("Choose your progress bar:", btn);
+            Thread.Sleep(250);
         }
-
-        private async Task ProgressTest_Closed(object sender, EventArgs e)
-        {
-            await this.Device.Send("Ciao from ProgressTest");
-        }
-
     }
-}
+
+
+    public override async Task Render(MessageResult message)
+    {
+        var btn = new ButtonForm();
+        btn.AddButtonRow(new ButtonBase("Standard", new CallbackData("a", "standard").Serialize()),
+                         new ButtonBase("Squares", new CallbackData("a", "squares").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("Circles", new CallbackData("a", "circles").Serialize()),
+                         new ButtonBase("Lines", new CallbackData("a", "lines").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("Squared Line", new CallbackData("a", "squaredlines").Serialize()));
+
+        btn.AddButtonRow(new ButtonBase("Back to start", new CallbackData("a", "start").Serialize()));
+
+        await Device.Send("Choose your progress bar:", btn);
+    }
+
+    private async Task ProgressTest_Closed(object sender, EventArgs e)
+    {
+        await Device.Send("Ciao from ProgressTest");
+    }
+}

TelegramBotBase.Test/Tests/Register/PerForm.cs

@@ -1,103 +1,98 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
 
-namespace TelegramBotBaseTest.Tests.Register
+namespace TelegramBotBase.Example.Tests.Register;
+
+public class PerForm : AutoCleanForm
 {
-    public class PerForm : AutoCleanForm
+    public string EMail { get; set; }
+
+    public string Firstname { get; set; }
+
+    public string Lastname { get; set; }
+
+    public override Task Load(MessageResult message)
     {
-        public String EMail { get; set; }
-
-        public String Firstname { get; set; }
-
-        public String Lastname { get; set; }
-
-        public async override Task Load(MessageResult message)
+        if (message.MessageText.Trim() == "")
         {
-            if (message.MessageText.Trim() == "")
-                return;
-
-            if (this.Firstname == null)
-            {
-                this.Firstname = message.MessageText;
-                return;
-            }
-
-            if (this.Lastname == null)
-            {
-                this.Lastname = message.MessageText;
-                return;
-            }
-
-            if (this.EMail == null)
-            {
-                this.EMail = message.MessageText;
-                return;
-            }
-
+            return Task.CompletedTask;
         }
 
-        public async override Task Action(MessageResult message)
+        if (Firstname == null)
         {
-            var call = message.GetData<CallbackData>();
-
-            await message.ConfirmAction();
-
-            if (call == null)
-                return;
-
-            switch (call.Value)
-            {
-                case "back":
-
-                    var start = new Start();
-
-                    await this.NavigateTo(start);
-
-                    break;
-
-            }
-
-
+            Firstname = message.MessageText;
+            return Task.CompletedTask;
         }
 
-        public async override Task Render(MessageResult message)
+        if (Lastname == null)
         {
-            if (this.Firstname == null)
-            {
-                await this.Device.Send("Please sent your firstname:");
-                return;
-            }
-
-            if (this.Lastname == null)
-            {
-                await this.Device.Send("Please sent your lastname:");
-                return;
-            }
-
-            if (this.EMail == null)
-            {
-                await this.Device.Send("Please sent your email address:");
-                return;
-            }
-
-
-            String s = "";
-
-            s += "Firstname: " + this.Firstname + "\r\n";
-            s += "Lastname: " + this.Lastname + "\r\n";
-            s += "E-Mail: " + this.EMail + "\r\n";
-
-            ButtonForm bf = new ButtonForm();
-            bf.AddButtonRow(new ButtonBase("Back", new CallbackData("a", "back").Serialize()));
-
-            await this.Device.Send("Your details:\r\n" + s, bf);
+            Lastname = message.MessageText;
+            return Task.CompletedTask;
         }
 
+        if (EMail == null)
+        {
+            EMail = message.MessageText;
+            return Task.CompletedTask;
+        }
 
+        return Task.CompletedTask;
     }
-}
+
+    public override async Task Action(MessageResult message)
+    {
+        var call = message.GetData<CallbackData>();
+
+        await message.ConfirmAction();
+
+        if (call == null)
+        {
+            return;
+        }
+
+        switch (call.Value)
+        {
+            case "back":
+
+                var start = new Start();
+
+                await NavigateTo(start);
+
+                break;
+        }
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        if (Firstname == null)
+        {
+            await Device.Send("Please sent your firstname:");
+            return;
+        }
+
+        if (Lastname == null)
+        {
+            await Device.Send("Please sent your lastname:");
+            return;
+        }
+
+        if (EMail == null)
+        {
+            await Device.Send("Please sent your email address:");
+            return;
+        }
+
+
+        var s = "";
+
+        s += "Firstname: " + Firstname + "\r\n";
+        s += "Lastname: " + Lastname + "\r\n";
+        s += "E-Mail: " + EMail + "\r\n";
+
+        var bf = new ButtonForm();
+        bf.AddButtonRow(new ButtonBase("Back", new CallbackData("a", "back").Serialize()));
+
+        await Device.Send("Your details:\r\n" + s, bf);
+    }
+}