Adding additional intellisense documentation to refurbished Json serialization

- and adding V21 version as well (as in alpha)

Examples/AsyncFormUpdates/AsyncFormUpdates.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
+      <PackageReference Include="TelegramBotBase" Version="6.4.1" />
     </ItemGroup>
 
 </Project>

Examples/BotAndWebApplication/BotAndWebApplication.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TelegramBotBase" Version="5.3.0" />
+    <PackageReference Include="TelegramBotBase" Version="6.4.1" />
   </ItemGroup>
 
   <ItemGroup>

Examples/BotAndWebApplication/BotStuff/Tasks/BotBackgroundTask.cs

@@ -16,6 +16,7 @@ namespace BotAndWebApplication.BotStuff.Tasks
                                 .DefaultCommands()
                                 .NoSerialization()
                                 .UseEnglish()
+                                .UseThreadPool()
                                 .Build();
         }
 

Examples/DependencyInjection/Database/BotDbContext.cs

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

Examples/DependencyInjection/Database/User.cs

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

Examples/DependencyInjection/DependencyInjection.csproj

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

Examples/DependencyInjection/Forms/ConfirmationForm.cs

@@ -0,0 +1,67 @@
+using DependencyInjection.Database;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+using TelegramBotBase.DependencyInjection;
+
+namespace DependencyInjection.Forms
+{
+    public class ConfirmationForm : FormBase
+    {
+        private readonly BotDbContext _dbContext;
+
+        public ConfirmationForm(BotDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public override async Task Load(MessageResult message)
+        {
+            var user = await _dbContext.Users.FindAsync(Device.DeviceId);
+
+            if (user == null)
+            {
+                await this.NavigateTo<StartForm>();
+                return;
+            }
+        }
+
+        public override async Task Action(MessageResult message)
+        {
+            await message.ConfirmAction("Go back");
+
+            switch (message.RawData)
+            {
+
+                case "back":
+
+                    await this.NavigateTo<StartForm>();
+
+                    break;
+
+            }
+
+
+        }
+
+        public override async Task Render(MessageResult message)
+        {
+            var user = await _dbContext.Users.FindAsync(Device.DeviceId);
+            if (user == null)
+                return;
+
+            var bf = new ButtonForm();
+            bf.AddButtonRow("Back", "back");
+
+            await Device.Send($"ConfirmationForm: Your last message was: {user.LastMessage}. Click \"Back\" to get back.", bf);
+        }
+
+
+
+
+    }
+}

Examples/DependencyInjection/Program.cs

@@ -0,0 +1,36 @@
+using DependencyInjection.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using TelegramBotBase.Builder;
+
+namespace DependencyInjection
+{
+    internal class Program
+    {
+        static async Task Main(string[] args)
+        {
+
+
+            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()
+                                    .UseSingleThread()
+                                    .Build();
+
+            await bot.Start();
+            await Task.Delay(-1);
+
+        }
+    }
+}

Examples/DependencyInjection/StartForm.cs

@@ -0,0 +1,79 @@
+using DependencyInjection.Database;
+using DependencyInjection.Forms;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+using TelegramBotBase.DependencyInjection;
+
+namespace DependencyInjection;
+
+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();
+        }
+
+        if (message.IsAction)
+            return;
+
+
+        user.LastMessage = string.IsNullOrWhiteSpace(message.MessageText) ? "<unknown>" : message.MessageText;
+        await _dbContext.SaveChangesAsync();
+    }
+
+    public override async Task Action(MessageResult message)
+    {
+        await message.ConfirmAction("Ok");
+
+        switch(message.RawData)
+        {
+
+            case "open":
+
+                await this.NavigateTo(typeof(ConfirmationForm));
+
+                var new_form = await this.NavigateTo<ConfirmationForm>();
+
+                if (new_form == null)
+                {
+                    await Device.Send("Cant open ConfirmationForm");
+                }
+
+                break;
+
+        }
+
+
+    }
+
+    public override async Task Render(MessageResult message)
+    {
+        var user = await _dbContext.Users.FindAsync(Device.DeviceId);
+        if (user == null)
+            return;
+
+        var bf = new ButtonForm();
+
+        bf.AddButtonRow("Open confirmation", "open");
+
+        await Device.Send($"Your last message's text was: `{user.LastMessage}`", bf);
+    }
+
+}

Examples/EFCoreBot/EFCoreBot.csproj

@@ -8,12 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.11" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
+        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" />
     </ItemGroup>
 
 </Project>

Examples/EFCoreBot/Program.cs

@@ -18,6 +18,7 @@ var bot = BotBaseBuilder.Create()
                         .NoCommands()
                         .NoSerialization()
                         .DefaultLanguage()
+                        .UseSingleThread()
                         .Build();
 
 await bot.Start();

Examples/InlineAndReplyCombination/InlineAndReplyCombination.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" />
+    <PackageReference Include="TelegramBotBase" Version="6.4.1" />
   </ItemGroup>
 
 </Project>

Examples/InlineAndReplyCombination/Program.cs

@@ -21,12 +21,15 @@ namespace InlineAndReplyCombination
                     .DefaultCommands()
                     .UseJSON(Path.Combine(Directory.GetCurrentDirectory(), "states.json"))
                     .UseEnglish()
+                    .UseSingleThread()
                     .Build();
 
 
 
             await BotBaseInstance.UploadBotCommands();
 
+            BotBaseInstance.BotCommand += BotBaseInstance_BotCommand;
+
 
             await BotBaseInstance.Start();
 
@@ -37,5 +40,28 @@ namespace InlineAndReplyCombination
 
             await BotBaseInstance.Stop();
         }
+
+        private static async Task BotBaseInstance_BotCommand(object sender, TelegramBotBase.Args.BotCommandEventArgs e)
+        {
+            
+            switch(e.Command)
+            {
+                case "/start":
+
+
+                    var start = new StartForm();
+
+                    await e.Device.ActiveForm.NavigateTo(start);
+
+
+                    break;
+
+
+
+            }
+
+
+
+        }
     }
 }

Examples/JoinHiderBot/JoinHiderBot.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
+      <PackageReference Include="TelegramBotBase" Version="6.4.1" />
     </ItemGroup>
 
 </Project>

README.md

@@ -10,12 +10,14 @@
 
 **Support group: [@tgbotbase](https://t.me/tgbotbase)**
 
-**Discord Server: [https://discord.gg/p3PPhYbTf](https://discord.gg/p3PPhYbTf)**
+**Discord Server: [https://discord.gg/V3PxreDYfE](https://discord.gg/V3PxreDYfE)**
 
 **Releases: [GitHub](https://github.com/MajMcCloud/TelegramBotFramework/releases)**
 
 ## Donate
 
+Paypal: [https://paypal.me/majmccloud](https://paypal.me/majmccloud)
+
 Bitcoin: `1GoUJYMwAvBipQTfw2FKydAz12J8RDyeJs` / `bc1qqwlp0p5ley29lsu6jhe0qv7s7963kfc7d0m53d`
 
 Etherium: `0xAf3835104c2C3E5b3e721FA2c7365955e87DB931`
@@ -57,6 +59,7 @@ BitTorrent: `TYVZSykaVT1nKZnz9hjDgBRNB9VavU1bpW`
     * [TaggedButtonGrid](#tagged-button-grid)
     * [CheckedButtonList](#checked-button-list)
     * [MultiToggleButton](#multi-toggle-button)
+- [Localizations](#localizations)
 - [Groups](#groups)
     * [SplitterForm](#splitter-form)
     * [GroupForm](#group-form)
@@ -641,7 +644,7 @@ await this.NavigateTo(cd);
 
 A minimal control which allows to manage a classic "text" message and update its later without having to keep track of the message id.
 
-<img src=".github/images/label.gif?raw=true" />
+<img src=".github/images/label.gif?raw=true" style="width:500px" />
 
 Check the example project [TelegramBotBase.Test/Tests/Controls/LabelForm.cs](TelegramBotBase.Test/Tests/Controls/LabelForm.cs)
 
@@ -712,6 +715,20 @@ Check the example project [TelegramBotBase.Test/Tests/Controls/CheckedButtonList
 
 Check the example project [TelegramBotBase.Test/Tests/Controls/MultiToggleButtonForm.cs](TelegramBotBase.Test/Tests/Controls/MultiToggleButtonForm.cs)
 
+
+## Localizations
+
+The current available languages for controls are:
+
+- English
+- German
+- Persian
+- Russian
+
+You can add other languages easily by creating a subclass of the [TelegramBotBase/Localizations/Localization.cs](TelegramBotBase/Localizations/Localization.cs) class.
+
+To set the default language set the *Language* property on the static [TelegramBotBase/Localizations/Default.cs](TelegramBotBase/Localizations/Default.cs) instance.
+
 ## Groups
 
 For groups, there are multiple different tools which help to work with and allows bot also to manage
@@ -1023,6 +1040,8 @@ again at 1 (due to `PopAsync` or `PopToRootAsync` calls) it will replace the con
 you
 have given to the constructor at the beginning.*
 
+---
+
 ## Extensions
 
 ### TelegramBotBase.Extensions.Images
@@ -1032,7 +1051,43 @@ Extends the base package with some additional image methods like SendPhoto (usin
 [![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Images.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
 [![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)
 
-[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
+Source code: [TelegramBotBase.Extensions.Images/](/TelegramBotBase.Extensions.Images/)
+
+Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
+
+---
+
+### TelegramBotBase.Extensions.Images.IronSoftware
+
+Extends the base package with some additional image methods like SendPhoto (using Bitmap)
+
+Important: This extension uses the IronSoftware drawing library.
+
+[![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Images.IronSoftware.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
+[![Downloads](https://img.shields.io/nuget/dt/TelegramBotBase.Extensions.Images.IronSoftware.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware)
+
+[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
+
+Source code: [TelegramBotBase.Extensions.Images.IronSoftware/](TelegramBotBase.Extensions.Images.IronSoftware/)
+
+Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.IronSoftware/)
+
+---
+
+Project: [open source](TelegramBotBase.Extensions.Images/)
+
+### TelegramBotBase.Extensions.Images.IronSoftware
+
+Extends the base package with some additional image methods like SendPhoto (using Bitmap)
+
+Important: This extension uses the IronSoftware drawing library.
+
+[![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Images.IronSoftware.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
+[![Downloads](https://img.shields.io/nuget/dt/TelegramBotBase.Extensions.Images.IronSoftware.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware)
+
+[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
+
+Project: [open source](TelegramBotBase.Extensions.Images.IronSoftware/)
 
 ### TelegramBotBase.Extensions.Serializer.Database.MSSQL
 
@@ -1041,7 +1096,28 @@ A session serializer for Microsoft SQL Server.
 [![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/)
 [![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)
 
-[https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
+Source code: [TelegramBotBase.Extensions.Serializer.Database.MSSQL/](/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
+
+Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
+
+---
+
+### TelegramBotBase.Extensions.Serializer.Database.PostgreSql
+
+A session serializer for PostgreSql Server.
+
+[![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Serializer.Database.PostgreSql.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
+[![Downloads](https://img.shields.io/nuget/dt/TelegramBotBase.Extensions.Serializer.Database.PostgreSql.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql)
+
+Source code: [TelegramBotBase.Extensions.Serializer.Database.PostgreSql/](/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
+
+Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
+
+Credits: [@Kataane](https://github.com/Kataane)
+
+---
+
+Project: [open source](TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
 
 ## Test Project
 
@@ -1080,4 +1156,9 @@ Having already a web application and want to add a TelegramBot side-by-side with
 
 Want to use Inline- and ReplyMarkup at the same time ? Here is an example how you can do that:
 
-- [Examples/InlineAndReplyCombination](Examples/InlineAndReplyCombination)
+- [Examples/InlineAndReplyCombination](Examples/InlineAndReplyCombination)
+
+
+Alpha: Full Dependency Injection example within this framework.
+
+- [Examples/DependencyInjection](Examples/DependencyInjection)

TelegramBotBase.Extensions.Images.IronSoftware/ImageExtensions.cs

@@ -0,0 +1,74 @@
+using IronSoftware.Drawing;
+using SixLabors.ImageSharp;
+using System.IO;
+using System.Threading.Tasks;
+using Telegram.Bot.Types;
+using TelegramBotBase.Form;
+using TelegramBotBase.Interfaces;
+using TelegramBotBase.Sessions;
+using static IronSoftware.Drawing.AnyBitmap;
+using SKImage = SixLabors.ImageSharp.Image;
+
+namespace TelegramBotBase.Extensions.Images.IronSoftware
+{
+    public static class ImageExtensions
+    {
+        public static Stream ToStream(this AnyBitmap image, ImageFormat format)
+        {
+            var stream = new MemoryStream();
+            image.ExportStream(stream, format);
+            stream.Position = 0;
+            return stream;
+        }
+
+        public static async Task<Stream> ToStream(this SKImage image)
+        {
+            var stream = new MemoryStream();
+            await image.SaveAsPngAsync(stream);
+            stream.Position = 0;
+            return stream;
+        }
+
+        /// <summary>
+        ///     Sends an image
+        /// </summary>
+        /// <param name="image"></param>
+        /// <param name="name"></param>
+        /// <param name="buttons"></param>
+        /// <param name="replyTo"></param>
+        /// <param name="disableNotification"></param>
+        /// <returns></returns>
+        public static async Task<Message> SendPhoto(this IDeviceSession session, AnyBitmap image, string name,
+                                                    string caption, ButtonForm buttons = null, int replyTo = 0,
+                                                    bool disableNotification = false)
+        {
+            using (var fileStream = ToStream(image, ImageFormat.Png))
+            {
+                var fts = InputFile.FromStream(fileStream, name);
+                
+                return await session.SendPhoto(fts, caption, buttons, replyTo, disableNotification);
+            }
+        }
+
+        /// <summary>
+        ///     Sends an image
+        /// </summary>
+        /// <param name="image"></param>
+        /// <param name="name"></param>
+        /// <param name="buttons"></param>
+        /// <param name="replyTo"></param>
+        /// <param name="disableNotification"></param>
+        /// <returns></returns>
+        public static async Task<Message> SendPhoto(this IDeviceSession session, SKImage image, string name,
+                                                    string caption, ButtonForm buttons = null, int replyTo = 0,
+                                                    bool disableNotification = false)
+        {
+            using (var fileStream = await ToStream(image))
+            {
+                var fts = InputFile.FromStream(fileStream, name);
+
+                return await session.SendPhoto(fts, caption, buttons, replyTo, disableNotification);
+            }
+        }
+    }
+}

TelegramBotBase.Extensions.Images.IronSoftware/README.md

@@ -0,0 +1,12 @@
+# TelegramBotBase.Extensions.Images.IronSoftware
+
+[![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Images.IronSoftware.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
+[![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.Images.IronSoftware.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware)
+
+
+This extension uses the [IronSoftware](https://ironsoftware.com/open-source/csharp/drawing/docs/) drawing library.
+
+Check [https://ironsoftware.com/open-source/csharp/drawing/docs/](https://ironsoftware.com/open-source/csharp/drawing/docs/) for more details on this library.

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

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>netcoreapp3.1;net6</TargetFrameworks>
+        <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images.IronSoftware</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images.IronSoftware</PackageProjectUrl>
+        <Copyright>MIT</Copyright>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <AssemblyVersion>1.0.1</AssemblyVersion>
+        <FileVersion>1.0.1</FileVersion>
+        <Description>This is an extension for sending Bitmap/Images platform independent by using IronSoftware's drawing library via TelegramBotBase.</Description>
+        <Version>1.0.1</Version>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="IronSoftware.System.Drawing" Version="2024.5.1" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Properties\" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
+    </ItemGroup>
+
+</Project>

TelegramBotBase.Extensions.Images/ImageExtensions.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Threading.Tasks;
 using Telegram.Bot.Types;
 using TelegramBotBase.Form;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Extensions.Images
 {
@@ -27,7 +27,7 @@ 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,
+        public static async Task<Message> SendPhoto(this IDeviceSession session, Image image, string name,
                                                     string caption, ButtonForm buttons = null, int replyTo = 0,
                                                     bool disableNotification = false)
         {
@@ -48,7 +48,7 @@ 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,
+        public static async Task<Message> SendPhoto(this IDeviceSession session, Bitmap image, string name,
                                                     string caption, ButtonForm buttons = null, int replyTo = 0,
                                                     bool disableNotification = false)
         {

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

@@ -1,12 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6;net7;net8</TargetFrameworks>
-        <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
+        <RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images</RepositoryUrl>
-        <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images</PackageProjectUrl>
         <Copyright>MIT</Copyright>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+        <Authors>$(AssemblyName)</Authors>
+        <Description>This is an extension for sending Bitmap/Images via TelegramBotBase.</Description>
+        <FileVersion>1.1.1</FileVersion>
+        <AssemblyVersion>1.1.1</AssemblyVersion>
+        <Version>1.1.1</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,12 +23,12 @@
         <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
-    </ItemGroup>
-
     <ItemGroup>
       <Folder Include="Properties\" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
+    </ItemGroup>
+
 </Project>

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

@@ -31,7 +31,7 @@ namespace TelegramBotBase.Extensions.Serializer.Database.MSSQL
 
             if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
             {
-                throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
+                throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
             }
         }
 

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

@@ -16,15 +16,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0"/>
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-    </ItemGroup>
+        <PackageReference Include="TelegramBotBase" Version="6.0.0" />
-
-    <ItemGroup>
-        <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj"/>
     </ItemGroup>
 
 </Project>

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

@@ -0,0 +1,92 @@
+using System;
+using TelegramBotBase.Builder;
+using TelegramBotBase.Builder.Interfaces;
+
+namespace TelegramBotBase.Extensions.Serializer.Database.PostgreSql
+{
+    /// <summary>
+    /// Provides extension methods for configuring the use of PostgreSQL Server Database for session serialization.
+    /// </summary>
+    public static class BotBaseBuilderExtensions
+    {
+        /// <summary>
+        ///     Uses an PostgreSQL Server Database to save and restore sessions.
+        /// </summary>
+        /// <param name="builder">The session serialization stage builder.</param>
+        /// <param name="connectionString">The connection string to the PostgreSQL database.</param>
+        /// <param name="fallbackForm">The fallback form type.</param>
+        /// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
+        /// <returns>The language selection stage builder.</returns>
+        public static ILanguageSelectionStage UsePostgreSqlDatabase(
+            this ISessionSerializationStage builder,
+            string connectionString, Type fallbackForm = null, 
+            string tablePrefix = "tgb_")
+        {
+            var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
+
+            builder.UseSerialization(serializer);
+
+            return builder as BotBaseBuilder;
+        }
+
+
+        /// <summary>
+        ///     Uses an PostgreSQL Server Database to save and restore sessions.
+        /// </summary>
+        /// <param name="builder">The session serialization stage builder.</param>
+        /// <param name="hostOrIp">The host or IP address of the PostgreSQL server.</param>
+        /// <param name="port">The port number for the PostgreSQL server.</param>
+        /// <param name="databaseName">The name of the PostgreSQL database.</param>
+        /// <param name="userId">The user ID for connecting to the PostgreSQL server.</param>
+        /// <param name="password">The password for connecting to the PostgreSQL server.</param>
+        /// <param name="fallbackForm">The fallback form type.</param>
+        /// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
+        /// <returns>The language selection stage builder.</returns>
+        public static ILanguageSelectionStage UsePostgreSqlDatabase(
+            this ISessionSerializationStage builder,
+            string hostOrIp, int port, 
+            string databaseName, string userId, 
+            string password, Type fallbackForm = null,
+            string tablePrefix = "tgb_")
+        {
+            var connectionString = $"Host={hostOrIp};Port={port};Database={databaseName};Username={userId};Password={password}";
+
+            var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
+
+            builder.UseSerialization(serializer);
+
+            return builder as BotBaseBuilder;
+        }
+
+        /// <summary>
+        ///     Uses an PostgreSQL Server Database with Windows Authentication to save and restore sessions.
+        /// </summary>
+        /// <param name="builder">The session serialization stage builder.</param>
+        /// <param name="hostOrIp">The host or IP address of the PostgreSQL server.</param>
+        /// <param name="port">The port number for the PostgreSQL server.</param>
+        /// <param name="databaseName">The name of the PostgreSQL database.</param>
+        /// <param name="integratedSecurity">A flag indicating whether to use Windows Authentication (true) or not (false).</param>
+        /// <param name="fallbackForm">The fallback form type.</param>
+        /// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
+        /// <returns>The language selection stage builder.</returns>
+        public static ILanguageSelectionStage UsePostgreSqlDatabase(
+            this ISessionSerializationStage builder,
+            string hostOrIp, int port, 
+            string databaseName, bool integratedSecurity = true, 
+            Type fallbackForm = null, string tablePrefix = "tgb_")
+        {
+            if (!integratedSecurity)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+
+            var connectionString = $"Host={hostOrIp};Port={port};Database={databaseName};Integrated Security=true;";
+
+            var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
+
+            builder.UseSerialization(serializer);
+
+            return builder as BotBaseBuilder;
+        }
+    }
+}

TelegramBotBase.Extensions.Serializer.Database.PostgreSql/PostgreSqlSerializer.cs

@@ -0,0 +1,252 @@
+using Npgsql;
+using System;
+using System.Data;
+using NpgsqlTypes;
+using TelegramBotBase.Args;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+using TelegramBotBase.Interfaces;
+
+namespace TelegramBotBase.Extensions.Serializer.Database.PostgreSql
+{
+    /// <summary>
+    /// Represents a PostgreSQL implementation of the <see cref="IStateMachine"/> for saving and loading form states.
+    /// </summary>
+    public class PostgreSqlSerializer : IStateMachine
+    {
+        private readonly string insertIntoSessionSql;
+        private readonly string insertIntoSessionsDataSql;
+        private readonly string selectAllDevicesSessionsSql;
+        private readonly string selectAllDevicesSessionsDataSql;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PostgreSqlSerializer"/> class.
+        /// </summary>
+        /// <param name="connectionString">The connection string to the PostgreSQL database.</param>
+        /// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
+        /// <param name="fallbackStateForm">The fallback state form type.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="connectionString"/> is null.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="fallbackStateForm"/> is not a subclass of <see cref="FormBase"/>.</exception>
+        public PostgreSqlSerializer(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($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
+            }
+
+            insertIntoSessionSql = "INSERT INTO " + TablePrefix +
+                                   "devices_sessions (deviceId, deviceTitle, \"FormUri\", \"QualifiedName\") VALUES (@deviceId, @deviceTitle, @FormUri, @QualifiedName)";
+            insertIntoSessionsDataSql = "INSERT INTO " + TablePrefix + "devices_sessions_data (deviceId, key, value, type) VALUES (@deviceId, @key, @value, @type)";
+
+            selectAllDevicesSessionsSql = "SELECT * FROM " + TablePrefix + "devices_sessions";
+            selectAllDevicesSessionsDataSql = "SELECT * FROM " + TablePrefix + "devices_sessions_data WHERE deviceId = @deviceId";
+        }
+
+        /// <summary>
+        /// Gets the connection string to the PostgreSQL database.
+        /// </summary>
+        public string ConnectionString { get; }
+
+        /// <summary>
+        /// Gets or sets the table name prefix for database tables.
+        /// </summary>
+        public string TablePrefix { get; set; }
+
+        /// <summary>
+        /// Gets or sets the fallback state form type.
+        /// </summary>
+        public Type FallbackStateForm { get; set; }
+
+        /// <inheritdoc/>
+        /// <summary>
+        /// Saves form states to the PostgreSQL database.
+        /// </summary>
+        /// <param name="e">The <see cref="SaveStatesEventArgs"/> containing the states to be saved.</param>
+        public void SaveFormStates(SaveStatesEventArgs e)
+        {
+            var container = e.States;
+
+            //Cleanup old Session data
+            Cleanup();
+
+            using (var connection = new NpgsqlConnection(ConnectionString))
+            {
+                connection.Open();
+
+                //Store session data in database
+                foreach (var state in container.States)
+                {
+                    using (var sessionCommand = connection.CreateCommand())
+                    {
+                        sessionCommand.CommandText = insertIntoSessionSql;
+
+                        sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceId", NpgsqlDbType.Bigint){Value = state.DeviceId });
+                        sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceTitle", DbType.StringFixedLength){Value = state.ChatTitle ?? string.Empty});
+                        sessionCommand.Parameters.Add(new NpgsqlParameter("@FormUri", DbType.StringFixedLength) {Value = state.FormUri});
+                        sessionCommand.Parameters.Add(new NpgsqlParameter("@QualifiedName", DbType.StringFixedLength){Value = state.QualifiedName });
+
+                        sessionCommand.ExecuteNonQuery();
+                    }
+                }
+            }
+
+            using (var connection = new NpgsqlConnection(ConnectionString))
+            {
+                connection.Open();
+
+                foreach (var state in container.States)
+                {
+                    SaveSessionsData(state, connection);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        /// <summary>
+        /// Loads form states from the PostgreSQL database.
+        /// </summary>
+        /// <returns>A <see cref="StateContainer"/> containing the loaded form states.</returns>
+        public StateContainer LoadFormStates()
+        {
+            var stateContainer = new StateContainer();
+
+            using (var connection = new NpgsqlConnection(ConnectionString))
+            {
+                connection.Open();
+
+                using (var sessionCommand = connection.CreateCommand())
+                {
+                    sessionCommand.CommandText = selectAllDevicesSessionsSql;
+
+                    var sessionTable = new DataTable();
+                    using (var dataAdapter = new NpgsqlDataAdapter(sessionCommand))
+                    {
+                        dataAdapter.Fill(sessionTable);
+
+                        foreach (DataRow row in sessionTable.Rows)
+                        {
+                            var stateEntry = new StateEntry
+                            {
+                                DeviceId = (long)row["deviceId"],
+                                ChatTitle = row["deviceTitle"].ToString(),
+                                FormUri = row["FormUri"].ToString(),
+                                QualifiedName = row["QualifiedName"].ToString()
+                            };
+
+                            stateContainer.States.Add(stateEntry);
+
+                            if (stateEntry.DeviceId > 0)
+                            {
+                                stateContainer.ChatIds.Add(stateEntry.DeviceId);
+                            }
+                            else
+                            {
+                                stateContainer.GroupIds.Add(stateEntry.DeviceId);
+                            }
+
+                            LoadDataTable(connection, row, stateEntry);
+                        }
+                    }
+                }
+            }
+
+            return stateContainer;
+        }
+
+        /// <summary>
+        /// Cleans up old session data in the PostgreSQL database.
+        /// </summary>
+        private void Cleanup()
+        {
+            using (var connection = new NpgsqlConnection(ConnectionString))
+            {
+                connection.Open();
+
+                using (var clearCommand = connection.CreateCommand())
+                {
+                    clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions_data";
+                    clearCommand.ExecuteNonQuery();
+                }
+
+                using (var clearCommand = connection.CreateCommand())
+                {
+                    clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions";
+                    clearCommand.ExecuteNonQuery();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves session data to the PostgreSQL database.
+        /// </summary>
+        /// <param name="state">The state entry containing session data to be saved.</param>
+        /// <param name="connection">The NpgsqlConnection used for the database interaction.</param>
+        private void SaveSessionsData(StateEntry state, NpgsqlConnection connection)
+        {
+            foreach (var data in state.Values)
+            {
+                using (var dataCommand = connection.CreateCommand())
+                {
+                    dataCommand.CommandText = insertIntoSessionsDataSql;
+
+                    dataCommand.Parameters.Add(new NpgsqlParameter("@deviceId", NpgsqlDbType.Bigint) { Value = state.DeviceId });
+                    dataCommand.Parameters.Add(new NpgsqlParameter("@key", DbType.StringFixedLength) { Value = data.Key });
+
+                    var type = data.Value.GetType();
+
+                    if (type.IsPrimitive || type == typeof(string))
+                    {
+                        dataCommand.Parameters.Add(new NpgsqlParameter("@value", NpgsqlDbType.Text) { Value = data.Value });
+                    }
+                    else
+                    {
+                        var json = System.Text.Json.JsonSerializer.Serialize(data.Value);
+                        dataCommand.Parameters.Add(new NpgsqlParameter("@value", NpgsqlDbType.Text) { Value = json });
+                    }
+
+                    dataCommand.Parameters.Add(new NpgsqlParameter("@type", DbType.StringFixedLength) { Value = type.AssemblyQualifiedName });
+
+                    dataCommand.ExecuteNonQuery();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Loads session data from the PostgreSQL database.
+        /// </summary>
+        /// <param name="connection">The NpgsqlConnection used for the database interaction.</param>
+        /// <param name="row">The DataRow representing a session entry in the main sessions table.</param>
+        /// <param name="stateEntry">The StateEntry object to which session data will be loaded.</param>
+        private void LoadDataTable(NpgsqlConnection connection, DataRow row, StateEntry stateEntry)
+        {
+            using (var sessionCommand = connection.CreateCommand())
+            {
+                sessionCommand.CommandText = selectAllDevicesSessionsDataSql;
+                sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceId", row["deviceId"]));
+
+                var dataCommandTable = new DataTable();
+                using (var npgSqlDataAdapter = new NpgsqlDataAdapter(sessionCommand))
+                {
+                    npgSqlDataAdapter.Fill(dataCommandTable);
+
+                    foreach (DataRow dataRow in dataCommandTable.Rows)
+                    {
+                        var key = dataRow["key"].ToString();
+                        var type = Type.GetType(dataRow["type"].ToString());
+
+                        var value = System.Text.Json.JsonSerializer.Deserialize(dataRow["value"].ToString(), type);
+
+                        stateEntry.Values.Add(key, value);
+                    }
+                }
+
+            }
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+# TelegramBotBase.Extensions.Serializer.Database.PostgreSQL
+
+[![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Serializer.Database.PostgreSQL.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSQL/)
+[![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.PostgreSQL.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSQL)
+
+## How to use
+
+```csharp
+using TelegramBotBase.Extensions.Serializer.Database.PostgreSQL;
+
+
+var bot = BotBaseBuilder
+            .Create()
+            .WithAPIKey(APIKey)
+            .DefaultMessageLoop()
+            .WithStartForm<Start>()
+            .NoProxy()
+            .OnlyStart()
+            .UsePostgreSqlDatabase("localhost",  "8181", "telegram_bot")
+            .UseEnglish()
+            .Build();
+
+bot.Start();
+```

TelegramBotBase.Extensions.Serializer.Database.PostgreSql/TelegramBotBase.Extensions.Serializer.Database.PostgreSql.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	  <TargetFrameworks>netstandard2.0;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 PostgreSQL Server.
+	  </Description>
+  </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="TelegramBotBase" Version="6.0.0" />
+	    <PackageReference Include="Npgsql" Version="8.0.3" />
+    </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,25 @@
+-- Enable uuid-ossp extension
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+-- Create table tgb_devices_sessions
+CREATE TABLE tgb_devices_sessions (
+    deviceId bigint NOT NULL,
+    deviceTitle character varying(512) NOT NULL,
+    "FormUri" character varying(512) NOT NULL,
+    "QualifiedName" character varying(512) NOT NULL,
+    CONSTRAINT PK_tgb_devices_sessions_1 PRIMARY KEY (deviceId)
+);
+
+-- Create table tgb_devices_sessions_data
+CREATE TABLE tgb_devices_sessions_data (
+    Id uuid DEFAULT uuid_generate_v4() NOT NULL,
+    deviceId bigint NOT NULL,
+    key character varying(512) NOT NULL,
+    "value" text NOT NULL,
+    "type" character varying(512) NOT NULL,
+    CONSTRAINT PK_tgb_devices_session_data PRIMARY KEY (Id)
+);
+
+-- Add default constraint for Id column in tgb_devices_sessions_data
+ALTER TABLE tgb_devices_sessions_data
+    ALTER COLUMN Id SET DEFAULT uuid_generate_v4();

TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson/BotBaseBuilderExtensions.cs

@@ -0,0 +1,41 @@
+using System;
+using System.IO;
+using TelegramBotBase.Builder;
+using TelegramBotBase.Builder.Interfaces;
+
+namespace TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson
+{
+    public static class BotBaseBuilderExtensions
+    {
+
+        /// <summary>
+        ///     Using the complex version of .Net JSON, which can serialize all objects.
+        ///     Saves in application directory.
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static ILanguageSelectionStage UseNewtonsoftJson(this ISessionSerializationStage builder)
+        {
+            var path = Path.Combine(Directory.GetCurrentDirectory(), "states.json");
+            
+            builder.UseNewtonsoftJson(path);
+
+            return builder as BotBaseBuilder;
+        }
+
+        /// <summary>
+        ///     Using the complex version of .Net JSON, which can serialize all objects.
+        ///     Saves in application directory.
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static ILanguageSelectionStage UseNewtonsoftJson(this ISessionSerializationStage builder, String path)
+        {
+            var _stateMachine = new NewtonsoftJsonStateMachine(path);
+
+            builder.UseSerialization(_stateMachine);
+
+            return builder as BotBaseBuilder;
+        }
+    }
+}

TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson/NewtonsoftJsonStateMachine.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Data;
+using System.IO;
+using Newtonsoft.Json;
+using TelegramBotBase.Args;
+using TelegramBotBase.Base;
+using TelegramBotBase.Form;
+using TelegramBotBase.Interfaces;
+
+namespace TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson
+{
+    /// <summary>
+    ///     Is used for all complex data types. Use if other default machines are not working.
+    /// </summary>
+    public class NewtonsoftJsonStateMachine : 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 NewtonsoftJsonStateMachine(string file, Type fallbackStateForm = null, bool overwrite = true)
+        {
+            FallbackStateForm = fallbackStateForm;
+
+            if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
+            {
+                throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
+            }
+
+            FilePath = file ?? throw new ArgumentNullException(nameof(file));
+            Overwrite = overwrite;
+        }
+
+        public string FilePath { get; set; }
+
+        public bool Overwrite { get; set; }
+
+        public Type FallbackStateForm { get; }
+
+        public StateContainer LoadFormStates()
+        {
+            try
+            {
+                var content = File.ReadAllText(FilePath);
+
+                var sc = JsonConvert.DeserializeObject<StateContainer>(content, new JsonSerializerSettings
+                {
+                    TypeNameHandling = TypeNameHandling.All,
+                    TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
+                });
+
+                return sc;
+            }
+            catch
+            {
+            }
+
+            return new StateContainer();
+        }
+
+        public void SaveFormStates(SaveStatesEventArgs e)
+        {
+            if (File.Exists(FilePath))
+            {
+                if (!Overwrite)
+                {
+                    throw new Exception("File exists already.");
+                }
+
+                File.Delete(FilePath);
+            }
+
+            try
+            {
+                var content = JsonConvert.SerializeObject(e.States, Formatting.Indented, new JsonSerializerSettings
+                {
+                    TypeNameHandling = TypeNameHandling.All,
+                    TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
+                });
+
+                File.WriteAllText(FilePath, content);
+            }
+            catch
+            {
+            }
+        }
+    }
+}

TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson/README.md

@@ -0,0 +1,31 @@
+# TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson
+
+[![NuGet version (TelegramBotBase)](https://img.shields.io/nuget/v/TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson.svg?style=flat-square)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson/)
+[![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.Legacy.NewtonsoftJson.svg?style=flat-square&label=Package%20Downloads)](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson)
+
+
+### Legacy version to recover with old dependencies using Newtonsoft.Json for session serialization
+
+
+## How to use
+
+```csharp
+using TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson;
+
+
+var bot = BotBaseBuilder
+            .Create()
+            .WithAPIKey(APIKey)
+            .DefaultMessageLoop()
+            .WithStartForm<Start>()
+            .NoProxy()
+            .OnlyStart()
+            .UseNewtonsoftJson()
+            .UseEnglish()
+            .Build();
+
+bot.Start();
+```

TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson/TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6;net7;net8;net9</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 Newtonsoft Json.
+        </Description>
+    </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="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="TelegramBotBase" Version="6.0.0" />
+    </ItemGroup>
+
+</Project>

TelegramBotBase.SourceGenerators/TelegramBotBase.SourceGenerators.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+	<ImplicitUsings>disable</ImplicitUsings>
+	<Nullable>enable</Nullable>
+	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+	<OutputItemType>Analyzer</OutputItemType>
+	<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+	<LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Telegram.Bot.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+  </ItemGroup>
+
+</Project>

TelegramBotBase.SourceGenerators/TelegramDeviceExtensionGenerator.cs

@@ -0,0 +1,251 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Resources;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using TelegramBotBase.SourceGenerators;
+
+namespace TelegramBotBase
+{
+
+    [Generator(LanguageNames.CSharp)]
+    public class TelegramDeviceExtensionGenerator : IIncrementalGenerator
+    {
+        static XmlDocumentationLoader xml;
+
+
+        public void Initialize(IncrementalGeneratorInitializationContext context)
+        {
+            var provider = context.SyntaxProvider.CreateSyntaxProvider(
+                predicate: (c, _) => c is ClassDeclarationSyntax,
+                transform: (n, _) => (ClassDeclarationSyntax)n.Node)
+                .Where(a => a is not null);
+
+
+            var compilation = context.CompilationProvider;
+
+            context.RegisterSourceOutput(compilation, (spc, source) => Execute(spc, source));
+
+
+
+        }
+
+
+        private void Execute(SourceProductionContext context, Compilation compilation)
+        {
+            //if (!Debugger.IsAttached) Debugger.Launch();
+
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine();
+
+            //Search for reference library
+            var telegram_package = compilation.References.FirstOrDefault(a => a.Display != null && a.Display.Contains("Telegram.Bot"));
+            if (telegram_package == null)
+                return;
+
+
+
+            //Load only once
+            if (xml == null)
+            {
+                xml = new XmlDocumentationLoader();
+                xml.ReadEmbeddedXml("Telegram.Bot.xml");
+            }
+
+            var assemblySymbol = compilation.GetAssemblyOrModuleSymbol(telegram_package) as IAssemblySymbol;
+
+            if (assemblySymbol == null)
+                return;
+
+            if (assemblySymbol.Name != "Telegram.Bot")
+                return;
+
+            //Get class which includes the existing methods
+            var apiClass = assemblySymbol.GetTypeByMetadataName("Telegram.Bot.TelegramBotClientExtensions");
+            if (apiClass == null)
+                return;
+
+            //Get existing list of methods
+            var methods = apiClass.GetMembers().OfType<IMethodSymbol>().ToList();
+
+
+            foreach (var method in methods)
+            {
+                if (!method.Parameters.Any(a => a.Type.Name == "ITelegramBotClient"))
+                    continue;
+
+                if (!method.Parameters.Any(a => a.Type.Name == "ChatId"))
+                    continue;
+
+                if (method.Name == ".ctor")
+                    continue;
+
+                String parameters = "";
+                String subCallParameters = "";
+                foreach (var par in method.Parameters)
+                {
+                    if (par.Name == "botClient")
+                        continue;
+
+                    if (!string.IsNullOrEmpty(parameters))
+                    {
+                        parameters += ", ";
+                    }
+
+                    if (!string.IsNullOrEmpty(subCallParameters))
+                    {
+                        subCallParameters += ", ";
+                    }
+
+                    if (par.Name == "chatId")
+                    {
+                        subCallParameters += $"device.DeviceId";
+                        continue;
+                    }
+
+                    subCallParameters += $"{par.Name}";
+                    parameters += $"{par.Type.ToDisplayString()} {par.Name}";
+
+                    if (par.HasExplicitDefaultValue)
+                    {
+                        var defaultValue = par.ExplicitDefaultValue;
+
+                        // Handle specific default value cases
+                        if (defaultValue == null)
+                        {
+                            if(par.Name == "cancellationToken")
+                            {
+                                parameters += " = default";
+                            }
+                            else
+                            {
+                                parameters += " = null";
+                            }
+
+                            
+                        }
+                        else if (defaultValue is string)
+                        {
+                            parameters += $" = \"{defaultValue}\""; // Add quotes around string default values
+                        }
+                        else if (defaultValue is bool)
+                        {
+                            parameters += $" = {defaultValue.ToString().ToLower()}"; // Use lower case for booleans (true/false)
+                        }
+                        else if (defaultValue is char)
+                        {
+                            parameters += $" = '{defaultValue}'"; // Use single quotes for char
+                        }
+                        else
+                        {
+                            parameters += $" = {defaultValue}"; // General case for other types (numbers, enums, etc.)
+                        }
+                    }
+
+
+                }
+
+
+                var returnStatement = "";
+
+                if (method.ReturnType is INamedTypeSymbol namedType && namedType.IsGenericType && namedType.ConstructedFrom.Name == "Task" && namedType.ContainingNamespace.ToDisplayString() == "System.Threading.Tasks")
+                {
+                    returnStatement = "return await";
+                }
+                else if (method.ReturnType.Name == "Task" && method.ReturnType.ContainingNamespace.ToDisplayString() == "System.Threading.Tasks")
+                {
+                    returnStatement = "await";
+                }
+                else if (method.ReturnsVoid)
+                {
+                    returnStatement = "";
+                }
+                else
+                {
+                    returnStatement = "return ";
+                }
+
+                String tmp = GenerateMethod(method, parameters, subCallParameters, returnStatement);
+
+                sb.Append(tmp);
+
+            }
+
+
+
+
+            //The generated source
+            var sourceCode = $$"""
+            using System;
+            using System.Threading.Tasks;
+            using TelegramBotBase.Interfaces;
+            using TelegramBotBase.Sessions;
+            using Telegram.Bot;
+            using Telegram.Bot.Extensions;
+            using Telegram.Bot.Requests;
+            using Telegram.Bot.Types.Enums;
+            using Telegram.Bot.Types.InlineQueryResults;
+            using Telegram.Bot.Types.Payments;
+            using Telegram.Bot.Types.ReplyMarkups;
+            using File = Telegram.Bot.Types.File;
+
+            #nullable enable
+            namespace TelegramBotBase;
+        
+            public static class DeviceExtensions
+            {
+                {{sb.ToString()}}
+            }
+            
+            """;
+
+            //Cleanup
+            sourceCode = sourceCode.Replace("System.Threading.Tasks.", "");
+
+
+            context.AddSource("DeviceExtensions.g.cs", SourceText.From(sourceCode, Encoding.UTF8));
+
+        }
+
+        /// <summary>
+        /// Test
+        /// </summary>
+        /// <param name="method"></param>
+        /// <param name="parameters"></param>
+        /// <param name="subCallParameters"></param>
+        /// <param name="returnStatement"></param>
+        /// <returns></returns>
+        private String GenerateMethod(IMethodSymbol? method, string parameters, string subCallParameters, string returnStatement)
+        {
+            //Adding xml comments from embedded xml file (Workaround)
+            String xml_comments = xml?.GetDocumentationLinesForSymbol(method);
+
+            StringBuilder sb = new StringBuilder();
+
+            sb.AppendLine(xml_comments);
+
+            sb.AppendLine($"    public static async {method.ReturnType.ToDisplayString()} {method.Name}(this IDeviceSession device, {parameters})");
+
+            sb.AppendLine($"    {{");
+
+            sb.AppendLine($"        {returnStatement} device.Client.TelegramClient.{method.Name}({subCallParameters});");
+
+            sb.AppendLine($"    }}");
+
+            sb.AppendLine();
+
+            sb.AppendLine();
+
+            return sb.ToString();
+        }
+    }
+}

TelegramBotBase.SourceGenerators/XmlDocumentationLoader.cs

@@ -0,0 +1,89 @@
+using Microsoft.CodeAnalysis;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Xml.Linq;
+using System.Xml.XPath;
+
+namespace TelegramBotBase.SourceGenerators
+{
+    public class XmlDocumentationLoader
+    {
+        XDocument xDocument;
+
+        public string GetDocumentationLinesForSymbol(ISymbol symbol)
+        {
+            var docElement = xDocument?.Descendants("member")
+                .FirstOrDefault(e => e.Attribute("name")?.Value == GetDocumentationCommentId(symbol));
+
+
+            StringBuilder sb = new StringBuilder();
+
+            XNode first = docElement.FirstNode;
+            do
+            {
+                sb.AppendLine(first.ToString());
+
+
+
+                first = first.NextNode;
+
+            } 
+            while (first.NextNode != null);
+
+            var lines = sb.ToString().Split('\n');
+
+            sb = new StringBuilder();
+
+            foreach (var line in lines)
+            {
+                if (line == "")
+                    continue;
+
+                sb.AppendLine($"    /// {line.Trim()}");
+
+
+            }
+
+
+            return sb.ToString().Trim();
+        }
+
+        private string GetDocumentationCommentId(ISymbol symbol)
+        {
+            // Returns the documentation comment ID for a symbol
+            return symbol.GetDocumentationCommentId();
+        }
+
+        public XDocument ReadEmbeddedXml(string resourceName)
+        {
+            // Get the assembly where the resource is embedded
+            Assembly assembly = Assembly.GetExecutingAssembly();
+
+            // Construct the full resource name
+            string fullResourceName = $"{assembly.GetName().Name}.Resources.{resourceName}";
+
+            var names = assembly.GetManifestResourceNames();
+
+            if (!names.Contains(fullResourceName))
+                return null;
+
+            // Open a stream to the embedded resource
+            using (Stream stream = assembly.GetManifestResourceStream(fullResourceName))
+            {
+                if (stream == null)
+                {
+                    //throw new FileNotFoundException("Resource not found", fullResourceName);
+                    return null;
+                }
+
+                xDocument = XDocument.Load(stream);
+                // Load the stream into an XDocument
+                return xDocument;
+            }
+        }
+    }
+}

TelegramBotBase.Test/Program.cs

@@ -32,6 +32,7 @@ internal class Program
                  })
                  .NoSerialization()
                  .UseEnglish()
+                 .UseThreadPool()
                  .Build();
 
 

TelegramBotBase.Test/TelegramBotBase.Example.csproj

@@ -8,7 +8,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\TelegramBotBase.Extensions.Images\TelegramBotBase.Extensions.Images.csproj" />
+      <PackageReference Include="TelegramBotBase.Extensions.Images" Version="1.1.2" />
+    </ItemGroup>
+
+    <ItemGroup>
       <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
     </ItemGroup>
 

TelegramBotBase.Test/Tests/Controls/LabelForm.cs

@@ -11,7 +11,7 @@ namespace TelegramBotBase.Example.Tests.Controls;
 public class LabelForm : AutoCleanForm
 {
 
-    TelegramBotBase.Controls.Inline.LabelControl _label;
+    TelegramBotBase.Controls.Inline.Label _label;
 
     ButtonGrid _buttonGrid;
 
@@ -27,7 +27,7 @@ public class LabelForm : AutoCleanForm
     private Task LabelForm_Init(object sender, InitEventArgs e)
     {
         //The "label" control
-        _label = new LabelControl("My test label");
+        _label = new Label("My test label");
 
         AddControl(_label);
 

TelegramBotBase.Test/Tests/DataSources/CustomDataSource.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Newtonsoft.Json;
+using System.Text.Json;
 using TelegramBotBase.Controls.Hybrid;
 using TelegramBotBase.DataSources;
 using TelegramBotBase.Form;
@@ -36,7 +36,7 @@ public class CustomDataSource : ButtonFormDataSource
         {
             try
             {
-                var list = JsonConvert.DeserializeObject<List<string>>(File.ReadAllText("countries.json"));
+                var list = JsonSerializer.Deserialize<List<string>>(File.ReadAllText("countries.json"));
 
 
                 Countries = list;
@@ -56,7 +56,7 @@ public class CustomDataSource : ButtonFormDataSource
 
             Countries = countries;
 
-            var tmp = JsonConvert.SerializeObject(countries);
+            var tmp = JsonSerializer.Serialize(countries);
 
             File.WriteAllText(AppContext.BaseDirectory + "countries.json", tmp);
         }

TelegramBotBase/Args/BotCommandEventArgs.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Telegram.Bot.Types;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Args;
 
@@ -15,7 +15,7 @@ public class BotCommandEventArgs : EventArgs
     }
 
     public BotCommandEventArgs(string command, List<string> parameters, Message message, long deviceId,
-                               DeviceSession device)
+                               IDeviceSession device)
     {
         Command = command;
         Parameters = parameters;
@@ -30,7 +30,7 @@ public class BotCommandEventArgs : EventArgs
 
     public long DeviceId { get; set; }
 
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 
     public bool Handled { get; set; } = false;
 

TelegramBotBase/Args/MessageIncomeEventArgs.cs

@@ -1,11 +1,11 @@
 using System;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Base;
 
 public class MessageIncomeEventArgs : EventArgs
 {
-    public MessageIncomeEventArgs(long deviceId, DeviceSession device, MessageResult message)
+    public MessageIncomeEventArgs(long deviceId, IDeviceSession device, MessageResult message)
     {
         DeviceId = deviceId;
         Device = device;
@@ -14,7 +14,7 @@ public class MessageIncomeEventArgs : EventArgs
 
     public long DeviceId { get; set; }
 
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 
     public MessageResult Message { get; set; }
 }

TelegramBotBase/Args/SessionBeginEventArgs.cs

@@ -1,11 +1,11 @@
 using System;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Base;
 
 public class SessionBeginEventArgs : EventArgs
 {
-    public SessionBeginEventArgs(long deviceId, DeviceSession device)
+    public SessionBeginEventArgs(long deviceId, IDeviceSession device)
     {
         DeviceId = deviceId;
         Device = device;
@@ -13,5 +13,5 @@ public class SessionBeginEventArgs : EventArgs
 
     public long DeviceId { get; set; }
 
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 }

TelegramBotBase/Args/SystemExceptionEventArgs.cs

@@ -1,5 +1,5 @@
 using System;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Args;
 
@@ -9,7 +9,7 @@ public class SystemExceptionEventArgs : EventArgs
     {
     }
 
-    public SystemExceptionEventArgs(string command, long deviceId, DeviceSession device, Exception error)
+    public SystemExceptionEventArgs(string command, long deviceId, IDeviceSession device, Exception error)
     {
         Command = command;
         DeviceId = deviceId;
@@ -21,7 +21,7 @@ public class SystemExceptionEventArgs : EventArgs
 
     public long DeviceId { get; set; }
 
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 
     public Exception Error { get; set; }
 }

TelegramBotBase/Args/UnhandledCallEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 using Telegram.Bot.Types;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Args;
 
@@ -12,7 +12,7 @@ public class UnhandledCallEventArgs : EventArgs
     }
 
     public UnhandledCallEventArgs(string command, string rawData, long deviceId, int messageId, Message message,
-                                  DeviceSession device) : this()
+                                  IDeviceSession device) : this()
     {
         Command = command;
         RawData = rawData;
@@ -26,7 +26,7 @@ public class UnhandledCallEventArgs : EventArgs
 
     public long DeviceId { get; set; }
 
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 
     public string RawData { get; set; }
 

TelegramBotBase/Base/ControlBase.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Base;
 
@@ -8,7 +8,7 @@ namespace TelegramBotBase.Base;
 /// </summary>
 public class ControlBase
 {
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 
     public int Id { get; set; }
 

TelegramBotBase/Base/ErrorResult.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace TelegramBotBase.Base
+{
+    public class ErrorResult : EventArgs
+    {
+        public ErrorResult(Exception exception)
+        {
+            Exception = exception;
+        }
+
+        public Exception Exception { get; }
+    }
+}

TelegramBotBase/Base/FormBase.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form.Navigation;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 using static TelegramBotBase.Base.Async;
 
 namespace TelegramBotBase.Form;
@@ -28,10 +28,12 @@ public class FormBase : IDisposable
 
     public NavigationController NavigationController { get; set; }
 
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 
     public MessageClient Client { get; set; }
 
+    IServiceProvider _serviceProvider = null;
+
     /// <summary>
     ///     has this formular already been disposed ?
     /// </summary>

TelegramBotBase/Base/MessageClient.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Net;
 using System.Net.Http;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Telegram.Bot;
@@ -10,6 +11,7 @@ using Telegram.Bot.Exceptions;
 using Telegram.Bot.Polling;
 using Telegram.Bot.Types;
 
+
 namespace TelegramBotBase.Base;
 
 /// <summary>
@@ -17,31 +19,38 @@ namespace TelegramBotBase.Base;
 /// </summary>
 public class MessageClient
 {
+    private EventHandlerList Events { get; } = new();
+
     private static readonly object EvOnMessageLoop = new();
+    private static readonly object EvOnReceiveError = new();
 
-    private static object __evOnMessage = new();
+    protected CancellationTokenSource _cancellationTokenSource;
 
-    private static object __evOnMessageEdit = new();
+    public string ApiKey { get; }
 
-    private static object __evCallbackQuery = new();
+    public ITelegramBotClient TelegramClient { get; set; }
 
-    private CancellationTokenSource _cancellationTokenSource;
+
+
+    /// <summary>
+    ///    Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before
+    //     start polling. If set to true Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
+    //     should be set to not null, otherwise Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
+    //     will effectively be set to receive all Telegram.Bot.Types.Updates.
+    /// </summary>
+    public bool ThrowPendingUpdates { get; set; }
 
 
     public MessageClient(string apiKey)
     {
         ApiKey = apiKey;
         TelegramClient = new TelegramBotClient(apiKey);
-
-        Prepare();
     }
 
     public MessageClient(string apiKey, HttpClient proxy)
     {
         ApiKey = apiKey;
         TelegramClient = new TelegramBotClient(apiKey, proxy);
-
-        Prepare();
     }
 
 
@@ -59,8 +68,6 @@ public class MessageClient
         );
 
         TelegramClient = new TelegramBotClient(apiKey, httpClient);
-
-        Prepare();
     }
 
     /// <summary>
@@ -80,8 +87,6 @@ public class MessageClient
         );
 
         TelegramClient = new TelegramBotClient(apiKey, httpClient);
-
-        Prepare();
     }
 
 
@@ -89,61 +94,41 @@ public class MessageClient
     {
         ApiKey = apiKey;
         TelegramClient = client;
-
-        Prepare();
     }
 
 
-    public string ApiKey { get; }
+    public virtual void StartReceiving()
-
-    public ITelegramBotClient TelegramClient { get; set; }
-
-    private EventHandlerList Events { get; } = new();
-
-
-    public void Prepare()
-    {
-        TelegramClient.Timeout = new TimeSpan(0, 0, 30);
-    }
-
-
-    public void StartReceiving()
     {
         _cancellationTokenSource = new CancellationTokenSource();
 
         var receiverOptions = new ReceiverOptions();
 
-        TelegramClient.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions,
+        receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
-                                      _cancellationTokenSource.Token);
+
+        TelegramClient.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, _cancellationTokenSource.Token);
     }
 
-    public void StopReceiving()
+
+    public virtual void StopReceiving()
     {
-        _cancellationTokenSource.Cancel();
+        _cancellationTokenSource?.Cancel();
     }
 
 
-    public async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
+    private async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
     {
         await OnMessageLoop(new UpdateResult(update, null));
     }
 
-    public Task HandleErrorAsync(ITelegramBotClient botClient, Exception exception,
+
+    private async Task HandleErrorAsync(ITelegramBotClient botClient, Exception exception,
                                  CancellationToken cancellationToken)
     {
-        if (exception is ApiRequestException exApi)
+        await OnReceiveError(new ErrorResult(exception));
-        {
-            Console.WriteLine($"Telegram API Error:\n[{exApi.ErrorCode}]\n{exApi.Message}");
-        }
-        else
-        {
-            Console.WriteLine(exception.ToString());
-        }
-
-        return Task.CompletedTask;
     }
 
 
+    #region "BotCommands"
     /// <summary>
     ///     This will return the current list of bot commands.
     /// </summary>
@@ -175,6 +160,8 @@ public class MessageClient
         await TelegramClient.DeleteMyCommandsAsync(scope, languageCode);
     }
 
+    #endregion
+
 
     #region "Events"
 
@@ -184,10 +171,47 @@ public class MessageClient
         remove => Events.RemoveHandler(EvOnMessageLoop, value);
     }
 
+
     public async Task OnMessageLoop(UpdateResult update)
     {
-        await (Events[EvOnMessageLoop] as Async.AsyncEventHandler<UpdateResult>)?.Invoke(this, update);
+        var eventHandlers = (Events[EvOnMessageLoop] as Async.AsyncEventHandler<UpdateResult>)?.Invoke(this, update);
+
+        if (eventHandlers != null)
+        {
+            await eventHandlers;
+        }
+    }
+
+
+    public event Async.AsyncEventHandler<ErrorResult> ReceiveError
+    {
+        add => Events.AddHandler(EvOnReceiveError, value);
+        remove => Events.RemoveHandler(EvOnReceiveError, value);
+    }
+
+
+    public async Task OnReceiveError(ErrorResult update)
+    {
+        var eventHandlers = (Events[EvOnReceiveError] as Async.AsyncEventHandler<ErrorResult>)?.Invoke(this, update);
+
+        if (eventHandlers != null)
+        {
+            await eventHandlers;
+            return;
+        }
+
+        //Fallback when no event handler is used.
+        if (update.Exception is ApiRequestException exApi)
+        {
+            Console.WriteLine($"Telegram API Error:\n[{exApi.ErrorCode}]\n{exApi.Message}");
+        }
+        else
+        {
+            Console.WriteLine(update.Exception.ToString());
+        }
+
     }
 
     #endregion
+
 }

TelegramBotBase/Base/MessageResult.cs

@@ -1,7 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
 
@@ -9,16 +10,36 @@ namespace TelegramBotBase.Base;
 
 public class MessageResult : ResultBase
 {
-    internal MessageResult()
-    {
-    }
-
     public MessageResult(Update update)
     {
         UpdateData = update;
+
+        init();
     }
 
-    public Update UpdateData { get; set; }
+    void init()
+    {
+        IsAction = UpdateData.CallbackQuery != null;
+
+        if (Message == null)
+            return;
+
+        IsBotCommand = Message.Entities?.Any(a => a.Type == MessageEntityType.BotCommand) ?? false;
+
+        if (!IsBotCommand)
+            return;
+
+        BotCommand = MessageText.Split(' ')[0];
+
+        IsBotGroupCommand = BotCommand.Contains("@");
+
+        if (IsBotGroupCommand)
+        {
+            BotCommand = BotCommand.Substring(0, BotCommand.LastIndexOf('@'));
+        }
+    }
+
+    public Update UpdateData { get; private set; }
 
     /// <summary>
     ///     Returns the Device/ChatId
@@ -55,12 +76,17 @@ public class MessageResult : ResultBase
     /// <summary>
     ///     Is this an action ? (i.e. button click)
     /// </summary>
-    public bool IsAction => UpdateData.CallbackQuery != null;
+    public bool IsAction { get; private set; }
 
     /// <summary>
     ///     Is this a command ? Starts with a slash '/' and a command
     /// </summary>
-    public bool IsBotCommand => MessageText.StartsWith("/");
+    public bool IsBotCommand { get; private set; }
+
+    /// <summary>
+    /// Is this a bot command sent from a group via @BotId ?
+    /// </summary>
+    public bool IsBotGroupCommand { get; private set; }
 
     /// <summary>
     ///     Returns a List of all parameters which has been sent with the command itself (i.e. /start 123 456 789 =>
@@ -83,18 +109,7 @@ public class MessageResult : ResultBase
     /// <summary>
     ///     Returns just the command (i.e. /start 1 2 3 => /start)
     /// </summary>
-    public string BotCommand
+    public string BotCommand { get; private set; }
-    {
-        get
-        {
-            if (!IsBotCommand)
-            {
-                return null;
-            }
-
-            return MessageText.Split(' ')[0];
-        }
-    }
 
     /// <summary>
     ///     Returns if this message will be used on the first form or not.
@@ -111,7 +126,7 @@ public class MessageResult : ResultBase
         T cd = null;
         try
         {
-            cd = JsonConvert.DeserializeObject<T>(RawData);
+            cd = JsonSerializer.Deserialize<T>(RawData);
 
             return cd;
         }

TelegramBotBase/Base/ResultBase.cs

@@ -2,13 +2,13 @@
 using System.Threading.Tasks;
 using Telegram.Bot;
 using Telegram.Bot.Types;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Base;
 
 public class ResultBase : EventArgs
 {
-    public DeviceSession Device { get; set; }
+    public IDeviceSession Device { get; set; }
 
     public virtual long DeviceId { get; set; }
 

TelegramBotBase/Base/ThreadPoolMessageClient.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Telegram.Bot;
+using Telegram.Bot.Exceptions;
+using Telegram.Bot.Polling;
+using Telegram.Bot.Types;
+using TelegramBotBase.Interfaces;
+
+namespace TelegramBotBase.Base;
+
+/// <summary>
+///     Base class for message handling
+/// </summary>
+public class ThreadPoolMessageClient : MessageClient
+{
+
+    /// <summary>
+    ///    Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before
+    //     start polling. If set to true Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
+    //     should be set to not null, otherwise Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
+    //     will effectively be set to receive all Telegram.Bot.Types.Updates.
+    /// </summary>
+
+    public int ThreadPool_WorkerThreads { get; set; } = 1;
+
+    public int ThreadPool_IOThreads { get; set; } = 1;
+
+
+    public ThreadPoolMessageClient(string apiKey) : base(apiKey)
+    {
+
+    }
+
+    public ThreadPoolMessageClient(string apiKey, HttpClient proxy) : base(apiKey, proxy)
+    {
+
+    }
+
+
+    public ThreadPoolMessageClient(string apiKey, Uri proxyUrl, NetworkCredential credential = null) : base(apiKey, proxyUrl, credential)
+    {
+
+    }
+
+    /// <summary>
+    ///     Initializes the client with a proxy
+    /// </summary>
+    /// <param name="apiKey"></param>
+    /// <param name="proxyHost">i.e. 127.0.0.1</param>
+    /// <param name="proxyPort">i.e. 10000</param>
+    public ThreadPoolMessageClient(string apiKey, string proxyHost, int proxyPort) : base(apiKey, proxyHost, proxyPort)
+    {
+
+    }
+
+
+    public ThreadPoolMessageClient(string apiKey, TelegramBotClient client) : base(apiKey, client)
+    {
+
+    }
+
+
+
+    public override void StartReceiving()
+    {
+        _cancellationTokenSource = new CancellationTokenSource();
+
+        var receiverOptions = new ReceiverOptions();
+
+        receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
+
+        ThreadPool.SetMaxThreads(ThreadPool_WorkerThreads, ThreadPool_IOThreads);
+        
+        TelegramClient.StartReceiving(HandleUpdateAsyncThreadPool, HandleErrorAsyncThreadPool, receiverOptions, _cancellationTokenSource.Token);
+    }
+
+    public override void StopReceiving()
+    {
+        _cancellationTokenSource?.Cancel();
+    }
+
+
+    public Task HandleUpdateAsyncThreadPool(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
+    {
+        ThreadPool.QueueUserWorkItem(async a =>
+        {
+            await OnMessageLoop(new UpdateResult(update, null));
+        });
+
+        return Task.CompletedTask;
+    }
+
+    public Task HandleErrorAsyncThreadPool(ITelegramBotClient botClient, Exception exception,
+                             CancellationToken cancellationToken)
+    {
+        ThreadPool.QueueUserWorkItem(async a =>
+        {
+            await OnReceiveError(new ErrorResult(exception));
+        });
+
+        return Task.CompletedTask;
+    }
+
+}

TelegramBotBase/Base/UpdateResult.cs

@@ -1,11 +1,11 @@
 using Telegram.Bot.Types;
-using TelegramBotBase.Sessions;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Base;
 
 public class UpdateResult : ResultBase
 {
-    public UpdateResult(Update rawData, DeviceSession device)
+    public UpdateResult(Update rawData, IDeviceSession device)
     {
         RawData = rawData;
         Device = device;
@@ -16,6 +16,7 @@ public class UpdateResult : ResultBase
     /// </summary>
     public override long DeviceId =>
         RawData?.Message?.Chat?.Id
+        ?? RawData?.EditedMessage?.Chat?.Id
         ?? RawData?.CallbackQuery?.Message?.Chat?.Id
         ?? Device?.DeviceId
         ?? 0;

TelegramBotBase/BotBase.cs

@@ -8,6 +8,7 @@ using Telegram.Bot.Types;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Enums;
+using TelegramBotBase.Exceptions;
 using TelegramBotBase.Interfaces;
 using TelegramBotBase.Sessions;
 using Console = TelegramBotBase.Tools.Console;
@@ -115,12 +116,13 @@ public sealed class BotBase
             if (ds == null)
             {
                 ds = await Sessions.StartSession(e.DeviceId);
-                e.Device = ds;
+                ds.LastMessage = e.Message;
-                ds.LastMessage = e.RawData.Message;
 
                 OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
             }
 
+            e.Device = ds;
+
             var mr = new MessageResult(e.RawData);
 
             var i = 0;
@@ -138,6 +140,13 @@ public sealed class BotBase
                 mr.IsFirstHandler = false;
             } while (ds.FormSwitched && i < GetSetting(ESettings.NavigationMaximum, 10));
         }
+        catch (InvalidServiceProviderConfiguration ex)
+        {
+            var ds = Sessions.GetSession(e.DeviceId);
+            OnException(new SystemExceptionEventArgs(e.Message.Text, e.DeviceId, ds, ex));
+
+            throw;
+        }
         catch (Exception ex)
         {
             var ds = Sessions.GetSession(e.DeviceId);
@@ -188,13 +197,10 @@ public sealed class BotBase
     /// <param name="deviceId">Contains the device/chat id of the device to update.</param>
     public async Task InvokeMessageLoop(long deviceId)
     {
-        var mr = new MessageResult
+        var mr = new MessageResult(new Update
         {
-            UpdateData = new Update
+            Message = new Message()
-            {
+        });
-                Message = new Message()
-            }
-        };
 
         await InvokeMessageLoop(deviceId, mr);
     }
@@ -259,7 +265,7 @@ public sealed class BotBase
     {
         foreach (var scope in BotCommandScopes)
         {
-            if (scope.Value.Any(a => "/" + a.Command == command))
+            if (scope.Value.Any(a => Constants.Telegram.BotCommandIndicator + a.Command == command))
             {
                 return true;
             }

TelegramBotBase/Builder/BotBaseBuilder.cs

@@ -18,7 +18,7 @@ namespace TelegramBotBase.Builder;
 
 public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage, IStartFormSelectionStage,
                               IBuildingStage, INetworkingSelectionStage, IBotCommandsStage, ISessionSerializationStage,
-                              ILanguageSelectionStage
+                              ILanguageSelectionStage, IThreadingStage
 {
     private string _apiKey;
 
@@ -32,6 +32,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
     private BotBaseBuilder()
     {
+
     }
 
     /// <summary>
@@ -39,7 +40,10 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
     /// </summary>
     private Dictionary<BotCommandScope, List<BotCommand>> BotCommandScopes { get; } = new();
 
-
+    /// <summary>
+    /// Creates a full BotBase instance with all parameters previously set.
+    /// </summary>
+    /// <returns></returns>
     public BotBase Build()
     {
         var bot = new BotBase(_apiKey, _client)
@@ -69,14 +73,14 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
     }
 
 
-    public IBuildingStage QuickStart(string apiKey, Type startForm)
+    public IBuildingStage QuickStart(string apiKey, Type startForm, bool throwPendingUpdates = false)
     {
         _apiKey = apiKey;
         _factory = new DefaultStartFormFactory(startForm);
 
         DefaultMessageLoop();
 
-        NoProxy();
+        NoProxy(throwPendingUpdates);
 
         OnlyStart();
 
@@ -84,11 +88,13 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
         DefaultLanguage();
 
+        UseSingleThread();
+
         return this;
     }
 
 
-    public IBuildingStage QuickStart<T>(string apiKey)
+    public IBuildingStage QuickStart<T>(string apiKey, bool throwPendingUpdates = false)
         where T : FormBase
     {
         _apiKey = apiKey;
@@ -96,7 +102,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
         DefaultMessageLoop();
 
-        NoProxy();
+        NoProxy(throwPendingUpdates);
 
         OnlyStart();
 
@@ -104,17 +110,19 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
         DefaultLanguage();
 
+        UseSingleThread();
+
         return this;
     }
 
-    public IBuildingStage QuickStart(string apiKey, IStartFormFactory startFormFactory)
+    public IBuildingStage QuickStart(string apiKey, IStartFormFactory startFormFactory, bool throwPendingUpdates = false)
     {
         _apiKey = apiKey;
         _factory = startFormFactory;
 
         DefaultMessageLoop();
 
-        NoProxy();
+        NoProxy(throwPendingUpdates);
 
         OnlyStart();
 
@@ -122,6 +130,8 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
         DefaultLanguage();
 
+        UseSingleThread();
+
         return this;
     }
 
@@ -204,67 +214,72 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
     #region "Step 4 (Network Settings)"
 
-    public IBotCommandsStage WithProxy(string proxyAddress)
+    public IBotCommandsStage WithProxy(string proxyAddress, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
     {
         var url = new Uri(proxyAddress);
         _client = new MessageClient(_apiKey, url)
         {
             TelegramClient =
             {
-                Timeout = new TimeSpan(0, 1, 0)
+                Timeout = TimeSpan.FromSeconds(timeoutInSeconds)
             },
         };
+        _client.ThrowPendingUpdates = throwPendingUpdates;
         return this;
     }
 
 
-    public IBotCommandsStage NoProxy()
+    public IBotCommandsStage NoProxy(bool throwPendingUpdates = false, int timeoutInSeconds = 60)
     {
         _client = new MessageClient(_apiKey)
         {
             TelegramClient =
             {
-                Timeout = new TimeSpan(0, 1, 0)
+                Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
             }
         };
+        _client.ThrowPendingUpdates = throwPendingUpdates;
         return this;
     }
 
 
-    public IBotCommandsStage WithBotClient(TelegramBotClient tgclient)
+    public IBotCommandsStage WithBotClient(TelegramBotClient tgclient, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
     {
         _client = new MessageClient(_apiKey, tgclient)
         {
             TelegramClient =
             {
-                Timeout = new TimeSpan(0, 1, 0)
+                Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
             }
         };
+        _client.ThrowPendingUpdates = throwPendingUpdates;
         return this;
     }
 
 
-    public IBotCommandsStage WithHostAndPort(string proxyHost, int proxyPort)
+    public IBotCommandsStage WithHostAndPort(string proxyHost, int proxyPort, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
     {
         _client = new MessageClient(_apiKey, proxyHost, proxyPort)
         {
             TelegramClient =
             {
-                Timeout = new TimeSpan(0, 1, 0)
+                Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
             }
         };
+        _client.ThrowPendingUpdates = throwPendingUpdates;
         return this;
     }
 
-    public IBotCommandsStage WithHttpClient(HttpClient tgclient)
+    public IBotCommandsStage WithHttpClient(HttpClient tgclient, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
     {
         _client = new MessageClient(_apiKey, tgclient)
         {
             TelegramClient =
             {
-                Timeout = new TimeSpan(0, 1, 0)
+                Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
             }
         };
+        _client.ThrowPendingUpdates = throwPendingUpdates;
         return this;
     }
 
@@ -383,28 +398,71 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
     #region "Step 7 (Language)"
 
-    public IBuildingStage DefaultLanguage()
+    /// <inheritdoc cref="ILanguageSelectionStage.DefaultLanguage"/>
+    public IThreadingStage DefaultLanguage()
     {
         return this;
     }
 
-    public IBuildingStage UseEnglish()
+    /// <inheritdoc cref="ILanguageSelectionStage.UseEnglish"/>
+    public IThreadingStage UseEnglish()
     {
         Default.Language = new English();
         return this;
     }
 
-    public IBuildingStage UseGerman()
+    /// <inheritdoc cref="ILanguageSelectionStage.UseGerman"/>
+    public IThreadingStage UseGerman()
     {
         Default.Language = new German();
         return this;
     }
 
-    public IBuildingStage Custom(Localization language)
+    /// <inheritdoc cref="ILanguageSelectionStage.UsePersian"/>
+    public IThreadingStage UsePersian()
+    {
+        Default.Language = new Persian();
+        return this;
+    }
+
+    /// <inheritdoc cref="ILanguageSelectionStage.UseRussian"/>
+    public IThreadingStage UseRussian()
+    {
+        Default.Language = new Russian();
+        return this;
+    }
+
+    /// <inheritdoc cref="ILanguageSelectionStage.Custom"/>
+    public IThreadingStage Custom(Localization language)
     {
         Default.Language = language;
         return this;
     }
 
+
     #endregion
+
+
+    #region "Step 8 (Threading)"
+
+    public IBuildingStage UseSingleThread()
+    {
+        return this;
+    }
+
+    public IBuildingStage UseThreadPool(int workerThreads = 2, int ioThreads = 1)
+    {
+        var c = new ThreadPoolMessageClient(_apiKey, (TelegramBotClient)_client.TelegramClient);
+
+        c.ThreadPool_WorkerThreads = workerThreads;
+        c.ThreadPool_IOThreads = ioThreads;
+        c.ThrowPendingUpdates = _client.ThrowPendingUpdates;
+
+        _client = c;
+
+        return this;
+    }
+
+    #endregion
+
 }

TelegramBotBase/Builder/Interfaces/IAPIKeySelectionStage.cs

@@ -20,16 +20,18 @@ public interface IAPIKeySelectionStage
     /// </summary>
     /// <param name="apiKey"></param>
     /// <param name="StartForm"></param>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBuildingStage QuickStart(string apiKey, Type StartForm);
+    IBuildingStage QuickStart(string apiKey, Type StartForm, bool throwPendingUpdates = false);
 
     /// <summary>
     ///     Quick and easy way to create a BotBase instance.
     ///     Uses: DefaultMessageLoop, NoProxy, OnlyStart, NoSerialization, DefaultLanguage
     /// </summary>
     /// <param name="apiKey"></param>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBuildingStage QuickStart<T>(string apiKey) where T : FormBase;
+    IBuildingStage QuickStart<T>(string apiKey , bool throwPendingUpdates = false) where T : FormBase;
 
     /// <summary>
     ///     Quick and easy way to create a BotBase instance.
@@ -37,6 +39,7 @@ public interface IAPIKeySelectionStage
     /// </summary>
     /// <param name="apiKey"></param>
     /// <param name="StartFormFactory"></param>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBuildingStage QuickStart(string apiKey, IStartFormFactory StartFormFactory);
+    IBuildingStage QuickStart(string apiKey, IStartFormFactory StartFormFactory, bool throwPendingUpdates = false);
 }

TelegramBotBase/Builder/Interfaces/IBuildingStage.cs

@@ -2,5 +2,9 @@
 
 public interface IBuildingStage
 {
+    /// <summary>
+    /// Creates a full BotBase instance with all parameters previously set.
+    /// </summary>
+    /// <returns></returns>
     BotBase Build();
 }

TelegramBotBase/Builder/Interfaces/ILanguageSelectionStage.cs

@@ -2,29 +2,44 @@
 
 namespace TelegramBotBase.Builder.Interfaces;
 
+/// <summary>
+/// Represents the language selection stage in the localization process.
+/// </summary>
 public interface ILanguageSelectionStage
 {
     /// <summary>
     ///     Selects the default language for control usage. (English)
     /// </summary>
-    /// <returns></returns>
+    /// <returns>The next stage in the building process.</returns>
-    IBuildingStage DefaultLanguage();
+    IThreadingStage DefaultLanguage();
 
     /// <summary>
     ///     Selects english as the default language for control labels.
     /// </summary>
-    /// <returns></returns>
+    /// <returns>The next stage in the building process.</returns>
-    IBuildingStage UseEnglish();
+    IThreadingStage UseEnglish();
 
     /// <summary>
     ///     Selects german as the default language for control labels.
     /// </summary>
-    /// <returns></returns>
+    /// <returns>The next stage in the building process.</returns>
-    IBuildingStage UseGerman();
+    IThreadingStage UseGerman();
+
+    /// <summary>
+    ///     Selects persian as the default language for control labels.
+    /// </summary>
+    /// <returns>The next stage in the building process.</returns>
+    IThreadingStage UsePersian();
+
+    /// <summary>
+    ///     Selects russian as the default language for control labels.
+    /// </summary>
+    /// <returns>The next stage in the building process.</returns>
+    IThreadingStage UseRussian();
 
     /// <summary>
     ///     Selects a custom language as the default language for control labels.
     /// </summary>
-    /// <returns></returns>
+    /// <returns>The next stage in the building process.</returns>
-    IBuildingStage Custom(Localization language);
+    IThreadingStage Custom(Localization language);
 }

TelegramBotBase/Builder/Interfaces/INetworkingSelectionStage.cs

@@ -9,22 +9,25 @@ public interface INetworkingSelectionStage
     ///     Chooses a proxy as network configuration.
     /// </summary>
     /// <param name="proxyAddress"></param>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBotCommandsStage WithProxy(string proxyAddress);
+    IBotCommandsStage WithProxy(string proxyAddress, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
 
     /// <summary>
     ///     Do not choose a proxy as network configuration.
     /// </summary>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBotCommandsStage NoProxy();
+    IBotCommandsStage NoProxy(bool throwPendingUpdates = false, int timeoutInSeconds = 60);
 
 
     /// <summary>
     ///     Chooses a custom instance of TelegramBotClient.
     /// </summary>
     /// <param name="client"></param>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBotCommandsStage WithBotClient(TelegramBotClient client);
+    IBotCommandsStage WithBotClient(TelegramBotClient client, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
 
 
     /// <summary>
@@ -32,13 +35,15 @@ public interface INetworkingSelectionStage
     /// </summary>
     /// <param name="proxyHost"></param>
     /// <param name="Port"></param>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBotCommandsStage WithHostAndPort(string proxyHost, int Port);
+    IBotCommandsStage WithHostAndPort(string proxyHost, int Port, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
 
     /// <summary>
     ///     Uses a custom http client.
     /// </summary>
     /// <param name="client"></param>
+    /// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
     /// <returns></returns>
-    IBotCommandsStage WithHttpClient(HttpClient client);
+    IBotCommandsStage WithHttpClient(HttpClient client, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
 }

TelegramBotBase/Builder/Interfaces/ISessionSerializationStage.cs

@@ -1,4 +1,5 @@
-using TelegramBotBase.Interfaces;
+using System;
+using TelegramBotBase.Interfaces;
 
 namespace TelegramBotBase.Builder.Interfaces;
 
@@ -22,15 +23,32 @@ public interface ISessionSerializationStage
     ///     Using the complex version of .Net JSON, which can serialize all objects.
     ///     Saves in application directory.
     /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///     Has been changed lately to not use Newtonsoft.Json anymore.
+    ///     For the legacy version add the nuget package below and use the <seealso cref="UseNewtonsoftJson"></seealso> method.
+    ///     </para>
+    ///     <seealso href="https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson/">TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson</seealso>
+    /// </remarks>
     /// <param name="path"></param>
     /// <returns></returns>
+    /// <seealso cref="UseNewtonsoftJson"/>
     ILanguageSelectionStage UseJSON();
 
     /// <summary>
     ///     Using the complex version of .Net JSON, which can serialize all objects.
+    ///     Saves in application directory.
     /// </summary>
+    /// <remarks>
+    ///     <para>
+    ///     Has been changed lately to not use Newtonsoft.Json anymore.
+    ///     For the legacy version add the nuget package below and use the <seealso cref="UseNewtonsoftJson"></seealso> method.
+    ///     </para>
+    ///     <seealso href="https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson/">TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson</seealso>
+    /// </remarks>
     /// <param name="path"></param>
     /// <returns></returns>
+    /// <seealso cref="UseNewtonsoftJson"/>
     ILanguageSelectionStage UseJSON(string path);
 
     /// <summary>
@@ -39,6 +57,7 @@ public interface ISessionSerializationStage
     /// </summary>
     /// <param name="path"></param>
     /// <returns></returns>
+    [Obsolete("Use UseJSON instead.")]
     ILanguageSelectionStage UseSimpleJSON();
 
     /// <summary>
@@ -46,6 +65,7 @@ public interface ISessionSerializationStage
     /// </summary>
     /// <param name="path"></param>
     /// <returns></returns>
+    [Obsolete("Use UseJSON instead.")]
     ILanguageSelectionStage UseSimpleJSON(string path);
 
     /// <summary>

TelegramBotBase/Builder/Interfaces/IThreadingStage.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TelegramBotBase.Builder.Interfaces
+{
+    public interface IThreadingStage
+    {
+        /// <summary>
+        /// Uses one single thread for message loop. (Default)
+        /// </summary>
+        /// <returns></returns>
+        public IBuildingStage UseSingleThread();
+
+        /// <summary>
+        /// Using the threadpool for managing requests.
+        /// </summary>
+        /// <param name="workerThreads">Number of concurrent working threads.</param>
+        /// <param name="ioThreads">Number of concurrent I/O threads.</param>
+        /// <returns></returns>
+        public IBuildingStage UseThreadPool(int workerThreads = 2, int ioThreads = 1);
+
+    }
+}

TelegramBotBase/Commands/Extensions.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Telegram.Bot.Types;
 
@@ -20,6 +21,16 @@ public static class Extensions
             scope = BotCommandScope.Default();
         }
 
+        if (string.IsNullOrEmpty(command))
+        {
+            throw new ArgumentNullException(nameof(command), $"{nameof(command)} parameter can not be null or empty");
+        }
+
+        if(command.StartsWith(Constants.Telegram.BotCommandIndicator))
+        {
+            throw new ArgumentException($"{nameof(command)} parameter does not have to start with a slash, please remove.", $"{nameof(command)}");
+        }
+
         var item = cmds.FirstOrDefault(a => a.Key.Type == scope.Type);
 
         if (item.Value != null)

TelegramBotBase/Constants/Telegram.cs

@@ -16,4 +16,15 @@ public static class Telegram
     public const int MaxReplyKeyboardCols = 12;
 
     public const int MessageDeletionsPerSecond = 30;
+
+    /// <summary>
+    /// The maximum length of callback data. Will raise an exception of it exceeds it.
+    /// </summary>
+    public const int MaxCallBackDataBytes = 64;
+
+
+    /// <summary>
+    /// The slash constant which indicates a bot command.
+    /// </summary>
+    public const string BotCommandIndicator = "/";
 }

TelegramBotBase/Controls/Hybrid/ButtonGrid.cs

@@ -51,7 +51,24 @@ public class ButtonGrid : ControlBase
         DataSource = new ButtonFormDataSource(form);
     }
 
-    public string Title { get; set; } = Default.Language["ButtonGrid_Title"];
+    string m_Title = Default.Language["ButtonGrid_Title"];
+
+    public string Title
+    {
+        get
+        {
+            return m_Title;
+        }
+        set
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
+            }
+
+            m_Title = value;
+        }
+    }
 
     public string ConfirmationText { get; set; } = "";
 
@@ -340,14 +357,14 @@ public class ButtonGrid : ControlBase
         }
 
 
-        //var button = HeadLayoutButtonRow?. .FirstOrDefault(a => a.Text.Trim() == result.MessageText)
+    //var button = HeadLayoutButtonRow?. .FirstOrDefault(a => a.Text.Trim() == result.MessageText)
-        //            ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText);
+    //            ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText);
 
-        // bf.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText)
+    // bf.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText)
 
-        //var index = bf.FindRowByButton(button);
+    //var index = bf.FindRowByButton(button);
 
-        check:
+    check:
 
         //Remove button click message
         if (DeleteReplyMessage)
@@ -426,8 +443,6 @@ public class ButtonGrid : ControlBase
             return;
         }
 
-        await result.ConfirmAction(ConfirmationText ?? "");
-
         ButtonRow match = null;
         var index = -1;
 
@@ -451,17 +466,19 @@ public class ButtonGrid : ControlBase
         }
 
 
-        //var bf = DataSource.ButtonForm;
+    //var bf = DataSource.ButtonForm;
 
-        //var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
+    //var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
-        //            ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
+    //            ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
-        //            ?? bf.ToList().FirstOrDefault(a => a.Value == result.RawData);
+    //            ?? bf.ToList().FirstOrDefault(a => a.Value == result.RawData);
 
-        //var index = bf.FindRowByButton(button);
+    //var index = bf.FindRowByButton(button);
 
-        check:
+    check:
         if (match != null)
         {
+            await result.ConfirmAction(ConfirmationText ?? "");
+
             await OnButtonClicked(new ButtonClickedEventArgs(match.GetButtonMatch(result.RawData, false), index,
                                                              match));
 
@@ -506,13 +523,13 @@ public class ButtonGrid : ControlBase
                 if (DataSource.RowCount > Constants.Telegram.MaxInlineKeyBoardRows && !EnablePaging)
                 {
                     throw new MaximumRowsReachedException
-                        { Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxInlineKeyBoardRows };
+                    { Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxInlineKeyBoardRows };
                 }
 
                 if (DataSource.ColumnCount > Constants.Telegram.MaxInlineKeyBoardCols)
                 {
                     throw new MaximumColsException
-                        { Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxInlineKeyBoardCols };
+                    { Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxInlineKeyBoardCols };
                 }
 
                 break;
@@ -522,13 +539,13 @@ public class ButtonGrid : ControlBase
                 if (DataSource.RowCount > Constants.Telegram.MaxReplyKeyboardRows && !EnablePaging)
                 {
                     throw new MaximumRowsReachedException
-                        { Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxReplyKeyboardRows };
+                    { Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxReplyKeyboardRows };
                 }
 
                 if (DataSource.ColumnCount > Constants.Telegram.MaxReplyKeyboardCols)
                 {
                     throw new MaximumColsException
-                        { Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxReplyKeyboardCols };
+                    { Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxReplyKeyboardCols };
                 }
 
                 break;
@@ -693,7 +710,7 @@ public class ButtonGrid : ControlBase
             Updated();
         }
         else
-            //Remove event handler
+        //Remove event handler
         {
             Device.MessageDeleted -= Device_MessageDeleted;
         }

TelegramBotBase/Controls/Hybrid/CheckedButtonList.cs

@@ -13,6 +13,7 @@ using TelegramBotBase.Enums;
 using TelegramBotBase.Exceptions;
 using TelegramBotBase.Form;
 using TelegramBotBase.Localizations;
+using static System.Net.Mime.MediaTypeNames;
 using static TelegramBotBase.Base.Async;
 
 namespace TelegramBotBase.Controls.Hybrid;
@@ -51,7 +52,24 @@ public class CheckedButtonList : ControlBase
         DataSource = new ButtonFormDataSource(form);
     }
 
-    public string Title { get; set; } = Default.Language["ButtonGrid_Title"];
+    string m_Title = Default.Language["ButtonGrid_Title"];
+
+    public string Title
+    {
+        get
+        {
+            return m_Title;
+        }
+        set
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
+            }
+
+            m_Title = value;
+        }
+    }
 
     public string ConfirmationText { get; set; } = "";
 

TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs

@@ -29,8 +29,6 @@ public class TaggedButtonGrid : MultiView
 
     public string BackLabel = Default.Language["ButtonGrid_Back"];
 
-    public string CheckAllLabel = Default.Language["ButtonGrid_CheckAll"];
-
     public string NextPageLabel = Default.Language["ButtonGrid_NextPage"];
 
     public string NoItemsLabel = Default.Language["ButtonGrid_NoItems"];
@@ -39,11 +37,17 @@ public class TaggedButtonGrid : MultiView
 
     public string SearchLabel = Default.Language["ButtonGrid_SearchFeature"];
 
-    public string UncheckAllLabel = Default.Language["ButtonGrid_UncheckAll"];
+    public string TotalTagsLabel = Default.Language["TaggedButtonGrid_TotalTags"];
+
+    public string CheckedTagsLabel = Default.Language["TaggedButtonGrid_CheckedTags"];
+
+    public string CheckAllLabel = Default.Language["TaggedButtonGrid_CheckAll"];
+
+    public string UncheckAllLabel = Default.Language["TaggedButtonGrid_UncheckAll"];
 
     public string SearchIcon = Default.Language["ButtonGrid_SearchIcon"];
 
-    public string TagIcon = Default.Language["ButtonGrid_TagIcon"];
+    public string TagIcon = Default.Language["TaggedButtonGrid_TagIcon"];
 
     public TaggedButtonGrid()
     {
@@ -63,7 +67,24 @@ public class TaggedButtonGrid : MultiView
         DataSource = new ButtonFormDataSource(form);
     }
 
-    public string Title { get; set; } = Default.Language["ButtonGrid_Title"];
+    string m_Title = Default.Language["ButtonGrid_Title"];
+
+    public string Title
+    {
+        get
+        {
+            return m_Title;
+        }
+        set
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
+            }
+
+            m_Title = value;
+        }
+    }
 
     public string ConfirmationText { get; set; }
 
@@ -379,14 +400,6 @@ public class TaggedButtonGrid : MultiView
             index = br.Item2;
         }
 
-
-        //var button = HeadLayoutButtonRow?. .FirstOrDefault(a => a.Text.Trim() == result.MessageText)
-        //            ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText);
-
-        // bf.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText)
-
-        //var index = bf.FindRowByButton(button);
-
         check:
 
 
@@ -490,10 +503,16 @@ public class TaggedButtonGrid : MultiView
                 if (result.MessageText == CheckAllLabel)
                 {
                     CheckAllTags();
+                    Updated();
+                    result.Handled = true;
+                    return;
                 }
                 else if (result.MessageText == UncheckAllLabel)
                 {
                     UncheckAllTags();
+                    Updated();
+                    result.Handled = true;
+                    return;
                 }
 
                 var i = result.MessageText.LastIndexOf(" ");
@@ -569,15 +588,6 @@ public class TaggedButtonGrid : MultiView
             index = br.Item2;
         }
 
-
-        //var bf = DataSource.ButtonForm;
-
-        //var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
-        //            ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
-        //            ?? bf.ToList().FirstOrDefault(a => a.Value == result.RawData);
-
-        //var index = bf.FindRowByButton(button);
-
         check:
         if (match != null)
         {
@@ -619,22 +629,47 @@ public class TaggedButtonGrid : MultiView
 
                 break;
 
-            case "$back$":
 
-                SelectedViewIndex = 0;
+            default:
+
+                if (SelectedViewIndex != 1)
+                    return;
+
+
+                switch (result.RawData)
+                {
+                    case "$back$":
+
+                        SelectedViewIndex = 0;
+                        Updated();
+
+                        return;
+
+                    case "$checkall$":
+
+                        CheckAllTags();
+
+                        return;
+
+                    case "$uncheckall$":
+
+                        UncheckAllTags();
+
+                        return;
+
+                }
+
+                if (SelectedTags.Contains(result.RawData))
+                {
+                    SelectedTags.Remove(result.RawData);
+                }
+                else
+                {
+                    SelectedTags.Add(result.RawData);
+                }
+
                 Updated();
 
-                break;
-
-            case "$checkall$":
-
-                CheckAllTags();
-
-                break;
-
-            case "$uncheckall$":
-
-                UncheckAllTags();
 
                 break;
         }
@@ -723,8 +758,10 @@ public class TaggedButtonGrid : MultiView
 
         if (EnableCheckAllTools)
         {
-            TagsSubHeadLayoutButtonRow = new ButtonRow(new ButtonBase(CheckAllLabel, "$checkall$"),
+            TagsSubHeadLayoutButtonRow = new ButtonRow(new ButtonBase(string.Format(TotalTagsLabel, Tags.Count), "$total$"),
-                                                       new ButtonBase(UncheckAllLabel, "$uncheckall$"));
+                                                        new ButtonBase(CheckAllLabel, "$checkall$"),
+                                                        new ButtonBase(UncheckAllLabel, "$uncheckall$"),
+                                                        new ButtonBase(string.Format(CheckedTagsLabel, SelectedTags.Count), "checked$"));
             bf.AddButtonRow(TagsSubHeadLayoutButtonRow);
         }
 
@@ -756,10 +793,6 @@ public class TaggedButtonGrid : MultiView
                     return;
                 }
 
-                //if (bf.Count == 0)
-                //    return;
-
-
                 var rkm = (ReplyKeyboardMarkup)bf;
                 rkm.ResizeKeyboard = ResizeKeyboard;
                 rkm.OneTimeKeyboard = OneTimeKeyboard;
@@ -881,21 +914,20 @@ public class TaggedButtonGrid : MultiView
     {
         Message m = null;
 
-        var form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
+        ButtonForm form = null;
-                                        EnableSearch ? SearchQuery : null);
-
-        //if (this.EnableSearch && this.SearchQuery != null && this.SearchQuery != "")
-        //{
-        //    form = form.FilterDuplicate(this.SearchQuery, true);
-        //}
-        //else
-        //{
-        //    form = form.Duplicate();
-        //}
 
         if (Tags != null && SelectedTags != null)
         {
+            form = DataSource.PickAllItems(EnableSearch ? SearchQuery : null); //CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
+
             form = form.TagDuplicate(SelectedTags);
+
+            form = new ButtonForm(form.ToRowList().Skip(CurrentPageIndex * ItemRowsPerPage).Take(ItemRowsPerPage));
+        }
+        else
+        {
+            form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
+                                        EnableSearch ? SearchQuery : null);
         }
 
         if (EnablePaging)

TelegramBotBase/Controls/Inline/Label.cs

@@ -16,7 +16,7 @@ public class Label : ControlBase
 {
     private bool _renderNecessary = true;
 
-    private string _text = string.Empty;
+    private string _text = Default.Language["Label_Text"];
 
     public String Text
     {
@@ -29,6 +29,10 @@ public class Label : ControlBase
             if (_text == value)
                 return;
 
+            if (string.IsNullOrEmpty(value))
+            {
+                throw new ArgumentNullException($"{nameof(Text)}", $"{nameof(Text)} property must have been a value unequal to null/empty");
+            }
 
             _text = value;
             _renderNecessary = true;
@@ -36,6 +40,8 @@ public class Label : ControlBase
         }
     }
 
+
+
     private ParseMode _parseMode = ParseMode.Markdown;
 
     public ParseMode ParseMode

TelegramBotBase/Controls/Inline/MultiToggleButton.cs

@@ -32,10 +32,32 @@ public class MultiToggleButton : ControlBase
     /// </summary>
     public string ChangedString { get; set; } = Default.Language["MultiToggleButton_Changed"];
 
+    private string _title = Default.Language["MultiToggleButton_Title"];
+
     /// <summary>
     ///     This holds the title of the control.
     /// </summary>
-    public string Title { get; set; } = Default.Language["MultiToggleButton_Title"];
+    public String Title
+    {
+        get
+        {
+            return _title;
+        }
+        set
+        {
+            if (_title == value)
+                return;
+
+            if (string.IsNullOrEmpty(value))
+            {
+                throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} must have been a value unequal to null/empty");
+            }
+
+            _title = value;
+            _renderNecessary = true;
+
+        }
+    }
 
     public int? MessageId { get; set; }
 

TelegramBotBase/Controls/Inline/ToggleButton.cs

@@ -36,7 +36,31 @@ public class ToggleButton : ControlBase
 
     public string ChangedString { get; set; } = Default.Language["ToggleButton_Changed"];
 
-    public string Title { get; set; } = Default.Language["ToggleButton_Title"];
+    private string _title = Default.Language["ToggleButton_Title"];
+
+    public String Title
+    {
+        get
+        {
+            return _title;
+        }
+        set
+        {
+            if (_title == value)
+                return;
+
+            if (string.IsNullOrEmpty(value))
+            {
+                throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
+            }
+
+            _title = value;
+            _renderNecessary = true;
+
+        }
+    }
+
+
 
     public int? MessageId { get; set; }
 

TelegramBotBase/DependencyInjection/Extensions.cs

@@ -0,0 +1,86 @@
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using TelegramBotBase.Form;
+
+namespace TelegramBotBase.DependencyInjection
+{
+    public static class Extensions
+    {
+        internal static FieldInfo _ServiceProviderField = typeof(FormBase).GetField("_serviceProvider", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+
+        /// <summary>
+        /// Use Dependency Injection to create new form and inject parameters. (Main variant)
+        /// </summary>
+        /// <typeparam name="NewForm"></typeparam>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        public static async Task<NewForm> NavigateTo<NewForm>(this FormBase current_form, params object[] args)
+            where NewForm : FormBase
+        {
+            var _serviceProvider = current_form.GetServiceProvider();
+
+            var instance = ActivatorUtilities.CreateInstance(_serviceProvider, typeof(NewForm)) as NewForm;
+
+            if (instance == null)
+                return null; //throw new Exception("Could not instantiate new form via DI.");
+
+            instance.SetServiceProvider(_serviceProvider);
+
+            await current_form.NavigateTo(instance, args);
+
+            return instance;
+        }
+
+        /// <summary>
+        /// Use Dependency Injection to create new form and inject parameters. (Alternative variant)
+        /// </summary>
+        /// <param name="current_form"></param>
+        /// <param name="formBaseType"></param>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentException"></exception>
+        public static async Task<FormBase> NavigateTo(this FormBase current_form, Type formBaseType, params object[] args)
+        {
+            if (!typeof(FormBase).IsAssignableFrom(formBaseType))
+                throw new ArgumentException($"{nameof(formBaseType)} argument must be a {nameof(FormBase)} type");
+
+            var _serviceProvider = current_form.GetServiceProvider();
+
+            var instance = ActivatorUtilities.CreateInstance(_serviceProvider, formBaseType) as FormBase;
+
+            if (instance == null)
+                return null; //throw new Exception("Could not instantiate new form via DI.");
+
+            instance.SetServiceProvider(_serviceProvider);
+
+            await current_form.NavigateTo(instance, args);
+
+            return instance;
+        }
+
+        /// <summary>
+        /// Sets the internal service provider field.
+        /// </summary>
+        /// <param name="form"></param>
+        /// <param name="serviceProvider"></param>
+        public static void SetServiceProvider(this FormBase form, IServiceProvider serviceProvider)
+        {
+            _ServiceProviderField?.SetValue(form, serviceProvider);
+        }
+
+        /// <summary>
+        /// Gets the internal service provider field value.
+        /// </summary>
+        /// <param name="form"></param>
+        /// <returns></returns>
+        public static IServiceProvider GetServiceProvider(this FormBase form)
+        {
+            var sp = _ServiceProviderField?.GetValue(form) as IServiceProvider;
+            return sp;
+        }
+    }
+}

TelegramBotBase/Exceptions/CallbackDataTooLongException.cs

@@ -0,0 +1,35 @@
+using System;
+using Telegram.Bot.Exceptions;
+
+namespace TelegramBotBase.Exceptions;
+
+public sealed class CallbackDataTooLongException : Exception
+{
+    static ApiRequestException _innerException = new Telegram.Bot.Exceptions.ApiRequestException("Bad Request: BUTTON_DATA_INVALID", 400);
+
+    static String _message = $"You have exceeded the maximum {Constants.Telegram.MaxCallBackDataBytes} bytes of callback data.\r\nThis is a pre-sending message from the TelegramBotBase framework.\r\nread more: https://core.telegram.org/bots/api#inlinekeyboardbutton";
+
+    static String _message_with_bytes = $"You have exceeded the maximum {Constants.Telegram.MaxCallBackDataBytes} bytes of callback data with @current_callback_bytes@ bytes.\r\nThis is a pre-sending message from the TelegramBotBase framework.\r\nread more: https://core.telegram.org/bots/api#inlinekeyboardbutton";
+
+    public CallbackDataTooLongException() : base(_message, _innerException)
+    {
+
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="current_callback_bytes">The amount of callback bytes generated.</param>
+    public CallbackDataTooLongException(int current_callback_bytes) : base(getMessage(current_callback_bytes), _innerException)
+    {
+
+    }
+
+    static String getMessage(int current_callback_bytes = -1)
+    {
+        if (current_callback_bytes == -1)
+            return _message;
+
+        return _message_with_bytes.Replace("@current_callback_bytes@", current_callback_bytes.ToString());
+    }
+}

TelegramBotBase/Exceptions/InvalidServiceProviderConfiguration.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TelegramBotBase.Exceptions
+{
+    public sealed class InvalidServiceProviderConfiguration : Exception
+    {
+        public InvalidServiceProviderConfiguration(string message, Exception innerException) : base(message, innerException) { }
+
+    }
+}

TelegramBotBase/Factories/DefaultStartFormFactory.cs

@@ -12,7 +12,7 @@ public class DefaultStartFormFactory : IStartFormFactory
     {
         if (!typeof(FormBase).IsAssignableFrom(startFormClass))
         {
-            throw new ArgumentException("startFormClass argument must be a FormBase type");
+            throw new ArgumentException($"{nameof(startFormClass)} argument must be a {nameof(FormBase)} type");
         }
 
         _startFormClass = startFormClass;

TelegramBotBase/Factories/ServiceProviderStartFormFactory.cs

@@ -1,5 +1,7 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using TelegramBotBase.DependencyInjection;
+using TelegramBotBase.Exceptions;
 using TelegramBotBase.Form;
 using TelegramBotBase.Interfaces;
 
@@ -14,16 +16,30 @@ public class ServiceProviderStartFormFactory : IStartFormFactory
     {
         if (!typeof(FormBase).IsAssignableFrom(startFormClass))
         {
-            throw new ArgumentException("startFormClass argument must be a FormBase type");
+            throw new ArgumentException($"{nameof(startFormClass)} argument must be a {nameof(FormBase)} type");
         }
-
+        
         _startFormClass = startFormClass;
         _serviceProvider = serviceProvider;
     }
 
     public FormBase CreateForm()
     {
-        return (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
+        FormBase fb = null;
+
+        try
+        {
+            fb = (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
+        }
+        catch(InvalidOperationException ex)
+        {
+            throw new InvalidServiceProviderConfiguration(ex.Message, ex);
+        }
+
+        //Sets an internal field for future ServiceProvider navigation
+        fb.SetServiceProvider(_serviceProvider);
+
+        return fb;
     }
 }
 

TelegramBotBase/Form/ButtonForm.cs

@@ -23,6 +23,11 @@ public class ButtonForm
         DependencyControl = control;
     }
 
+    public ButtonForm(IEnumerable<ButtonRow> rows)
+    {
+        _buttons = rows.ToList();
+    }
+
 
     public IReplyMarkup Markup { get; set; }
 
@@ -149,6 +154,11 @@ public class ButtonForm
                        .Aggregate((a, b) => a.Union(b).ToList());
     }
 
+    public List<ButtonRow> ToRowList()
+    {
+        return _buttons;
+    }
+
     public InlineKeyboardButton[][] ToInlineButtonArray()
     {
         var ikb = _buttons.Select(a => a.ToArray().Select(b => b.ToInlineButton(this)).ToArray()).ToArray();

TelegramBotBase/Form/CallbackData.cs

@@ -1,14 +1,18 @@
-using Newtonsoft.Json;
+using System.Text.Json;
+using System.Text;
+using TelegramBotBase.Exceptions;
+using System.Text.Json.Serialization;
 
 namespace TelegramBotBase.Form;
 
 /// <summary>
-///     Base class for serializing buttons and data
+/// Base class for serializing buttons and data
 /// </summary>
 public class CallbackData
 {
     public CallbackData()
     {
+
     }
 
     public CallbackData(string method, string value)
@@ -17,28 +21,30 @@ public class CallbackData
         Value = value;
     }
 
-    [JsonProperty("m")] public string Method { get; set; }
+    [JsonPropertyName("m")] public string Method { get; set; }
 
-    [JsonProperty("v")] public string Value { get; set; }
+    [JsonPropertyName("v")] public string Value { get; set; }
 
     public static string Create(string method, string value)
     {
-        return new CallbackData(method, value).Serialize();
+        return new CallbackData(method, value).Serialize(true);
     }
 
     /// <summary>
     ///     Serializes data to json string
     /// </summary>
     /// <returns></returns>
-    public string Serialize()
+    public string Serialize(bool throwExceptionOnOverflow = false)
     {
-        var s = "";
+        var s = string.Empty;
-        try
+
-        {
+        s = JsonSerializer.Serialize(this);
-            s = JsonConvert.SerializeObject(this);
+
-        }
+        //Is data over 64 bytes ?
-        catch
+        int byte_count = Encoding.UTF8.GetByteCount(s);
+        if (throwExceptionOnOverflow && byte_count > Constants.Telegram.MaxCallBackDataBytes)
         {
+            throw new CallbackDataTooLongException(byte_count);
         }
 
         return s;
@@ -51,19 +57,8 @@ public class CallbackData
     /// <returns></returns>
     public static CallbackData Deserialize(string data)
     {
-        CallbackData cd = null;
+        return JsonSerializer.Deserialize<CallbackData>(data);
-        try
-        {
-            cd = JsonConvert.DeserializeObject<CallbackData>(data);
-
-            return cd;
-        }
-        catch
-        {
-        }
-
-        return null;
     }
 
-    public static implicit operator string(CallbackData callbackData) => callbackData.Serialize();
+    public static implicit operator string(CallbackData callbackData) => callbackData.Serialize(true);
 }

TelegramBotBase/Form/GroupForm.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Telegram.Bot.Types.Enums;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
@@ -7,6 +8,8 @@ namespace TelegramBotBase.Form;
 
 public class GroupForm : FormBase
 {
+    //Prior V21
+    [Obsolete("Check Telegram.Bot nuget package changes.")]
     public override async Task Load(MessageResult message)
     {
         switch (message.MessageType)
@@ -46,6 +49,46 @@ public class GroupForm : FormBase
         }
     }
 
+    //Past V21
+    //public override async Task Load(MessageResult message)
+    //{
+    //    switch (message.MessageType)
+    //    {
+    //        case MessageType.NewChatMembers:
+
+    //            await OnMemberChanges(new MemberChangeEventArgs(MessageType.NewChatMembers, message,
+    //                                                            message.Message.NewChatMembers));
+
+    //            break;
+    //        case MessageType.LeftChatMember:
+
+    //            await OnMemberChanges(new MemberChangeEventArgs(MessageType.LeftChatMember, message,
+    //                                                            message.Message.LeftChatMember));
+
+    //            break;
+
+    //        case MessageType.NewChatPhoto:
+    //        case MessageType.DeleteChatPhoto:
+    //        case MessageType.NewChatTitle:
+    //        case MessageType.MigrateFromChatId:
+    //        case MessageType.MigrateToChatId:
+    //        case MessageType.PinnedMessage:
+    //        case MessageType.GroupChatCreated:
+    //        case MessageType.SupergroupChatCreated:
+    //        case MessageType.ChannelChatCreated:
+
+    //            await OnGroupChanged(new GroupChangedEventArgs(message.MessageType, message));
+
+    //            break;
+
+    //        default:
+
+    //            await OnMessage(message);
+
+    //            break;
+    //    }
+    //}
+
     public override async Task Edited(MessageResult message)
     {
         await OnMessageEdit(message);

TelegramBotBase/Form/PromptDialog.cs

@@ -82,7 +82,7 @@ public class PromptDialog : ModalDialog
             {
                 var bf = new ButtonForm();
                 bf.AddButtonRow(new ButtonBase(BackLabel, "back"));
-                await Device.Send(Message, (ReplyMarkupBase)bf);
+                await Device.Send(Message, (IReplyMarkup)bf);
                 return;
             }
 

TelegramBotBase/Interfaces/IDeviceSession.cs

@@ -1,10 +1,24 @@
 using System;
+using System.Threading.Tasks;
+using Telegram.Bot.Types.Enums;
+using Telegram.Bot.Types;
 using TelegramBotBase.Form;
+using Telegram.Bot.Types.ReplyMarkups;
+using TelegramBotBase.Args;
+using TelegramBotBase.Base;
+using Telegram.Bot;
+using TelegramBotBase.Sessions;
 
 namespace TelegramBotBase.Interfaces;
 
-internal interface IDeviceSession
+public interface IDeviceSession : IDeviceSessionMethods
 {
+    MessageClient Client => ActiveForm.Client;
+
+    int LastMessageId => LastMessage?.MessageId ?? -1;
+
+    Message LastMessage { get; set; }
+
     /// <summary>
     ///     Device or chat id
     /// </summary>
@@ -35,4 +49,6 @@ internal interface IDeviceSession
     ///     contains if the form has been switched (navigated)
     /// </summary>
     bool FormSwitched { get; set; }
+
+
 }

TelegramBotBase/Interfaces/IDeviceSessionMethods.cs

@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Telegram.Bot.Types.Enums;
+using Telegram.Bot.Types.ReplyMarkups;
+using Telegram.Bot.Types;
+using TelegramBotBase.Form;
+using Telegram.Bot;
+using TelegramBotBase.Base;
+using TelegramBotBase.Args;
+
+namespace TelegramBotBase.Interfaces
+{
+    public interface IDeviceSessionMethods
+    {
+
+        string GetChatTitle();
+
+        Task BanUser(long userId, DateTime until = default);
+
+        Task UnbanUser(long userId);
+
+        Task ChangeChatPermissions(ChatPermissions permissions);
+
+        Task RestrictUser(long userId, ChatPermissions permissions, bool? useIndependentGroupPermission = null, DateTime until = default);
+
+        Task ConfirmAction(string callbackQueryId, string message = "", bool showAlert = false,
+                                    string urlToOpen = null);
+
+        Task<bool> DeleteMessage(int messageId = -1);
+
+        Task<bool> DeleteMessage(Message message);
+
+        Task<Message> HideReplyKeyboard(string closedMsg = "Closed", bool autoDeleteResponse = true);
+
+        Task<Message> Send(string text, ButtonForm buttons = null, int replyTo = 0,
+                                        bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown,
+                                        bool markdownV2AutoEscape = true);
+
+        Task<Message> Send(string text, IReplyMarkup markup, int replyTo = 0,
+                                        bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown,
+                                        bool markdownV2AutoEscape = true);
+
+        Task<Message> Send(string text, InlineKeyboardMarkup markup, int replyTo = 0,
+                                    bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown,
+                                    bool markdownV2AutoEscape = true);
+
+        Task SetAction(ChatAction action);
+
+        Task<Message> SendTextFile(string filename, string textcontent, Encoding encoding = null,
+                                            string caption = "", ButtonForm buttons = null, int replyTo = 0,
+                                            bool disableNotification = false);
+
+        Task<Message> SendDocument(InputFile document, string caption = "",
+                                            ButtonForm buttons = null, int replyTo = 0,
+                                            bool disableNotification = false);
+
+
+        Task<Message> SendPhoto(InputFile file, string caption = null, ButtonForm buttons = null,
+                                         int replyTo = 0, bool disableNotification = false,
+                                         ParseMode parseMode = ParseMode.Markdown);
+
+        Task<Message> SendVideo(InputFile file, string caption = null, ButtonForm buttons = null,
+                                         int replyTo = 0, bool disableNotification = false,
+                                         ParseMode parseMode = ParseMode.Markdown);
+
+
+        Task<Message> SendVideo(string url, ButtonForm buttons = null, int replyTo = 0,
+                                         bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown);
+
+        Task<Message> SendVideo(string filename, byte[] video, ButtonForm buttons = null, int replyTo = 0,
+                                         bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown);
+
+        Task<Message> SendLocalVideo(string filepath, ButtonForm buttons = null, int replyTo = 0,
+                                              bool disableNotification = false,
+                                              ParseMode parseMode = ParseMode.Markdown);
+
+        Task<Message> Edit(int messageId, string text, ButtonForm buttons = null,
+                                    ParseMode parseMode = ParseMode.Markdown);
+
+
+
+        Task<Message> Edit(int messageId, string text, InlineKeyboardMarkup markup,
+                                    ParseMode parseMode = ParseMode.Markdown);
+
+        Task<Message> Edit(Message message, ButtonForm buttons = null,
+                                    ParseMode parseMode = ParseMode.Markdown);
+
+        Task<Message> EditReplyMarkup(int messageId, ButtonForm bf);
+
+        Task<Message> RequestContact(string buttonText = "Send your contact",
+                                              string requestMessage = "Give me your phone number!",
+                                              bool oneTimeOnly = true);
+
+        Task<Message> RequestLocation(string buttonText = "Send your location",
+                                               string requestMessage = "Give me your location!",
+                                               bool oneTimeOnly = true);
+
+
+        Task<ChatMember> GetChatUser(long userId);
+
+
+        event Async.AsyncEventHandler<MessageSentEventArgs> MessageSent;
+
+        event EventHandler<MessageReceivedEventArgs> MessageReceived;
+
+        event EventHandler<MessageDeletedEventArgs> MessageDeleted;
+
+        Task Api(Func<ITelegramBotClient, Task> call);
+
+        Task<T> Api<T>(Func<ITelegramBotClient, Task<T>> call);
+
+        T Raw<T>(Func<ITelegramBotClient, T> call);
+
+    }
+}

TelegramBotBase/Interfaces/IMessageLoopFactory.cs

@@ -2,13 +2,12 @@
 using System.Threading.Tasks;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
-using TelegramBotBase.Sessions;
 
 namespace TelegramBotBase.Interfaces;
 
 public interface IMessageLoopFactory
 {
-    Task MessageLoop(BotBase bot, DeviceSession session, UpdateResult ur, MessageResult e);
+    Task MessageLoop(BotBase bot, IDeviceSession session, UpdateResult ur, MessageResult e);
 
     event EventHandler<UnhandledCallEventArgs> UnhandledCall;
 }

TelegramBotBase/Localizations/English.cs

@@ -1,6 +1,6 @@
 namespace TelegramBotBase.Localizations;
 
-public class English : Localization
+public sealed class English : Localization
 {
     public English()
     {
@@ -12,8 +12,10 @@ public class English : Localization
         Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}";
         Values["ButtonGrid_SearchFeature"] = "💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
         Values["ButtonGrid_Back"] = "Back";
-        Values["ButtonGrid_CheckAll"] = "Check all";
+        Values["TaggedButtonGrid_TotalTags"] = "Total: {0}";
-        Values["ButtonGrid_UncheckAll"] = "Uncheck all";
+        Values["TaggedButtonGrid_CheckedTags"] = "Checked: {0}";
+        Values["TaggedButtonGrid_CheckAll"] = "Check all";
+        Values["TaggedButtonGrid_UncheckAll"] = "Uncheck all";
         Values["CalendarPicker_Title"] = "Pick date";
         Values["CalendarPicker_PreviousPage"] = "◀️";
         Values["CalendarPicker_NextPage"] = "▶️";
@@ -31,6 +33,7 @@ public class English : Localization
         Values["PromptDialog_Back"] = "Back";
         Values["ToggleButton_Changed"] = "Setting changed";
         Values["ButtonGrid_SearchIcon"] = "🔍";
-        Values["ButtonGrid_TagIcon"] = "📁";
+        Values["TaggedButtonGrid_TagIcon"] = "📁";
+        Values["Label_Text"] = "Default label text";
     }
 }

TelegramBotBase/Localizations/German.cs

@@ -1,6 +1,6 @@
 namespace TelegramBotBase.Localizations;
 
-public class German : Localization
+public sealed class German : Localization
 {
     public German()
     {
@@ -10,11 +10,12 @@ public class German : Localization
         Values["ButtonGrid_PreviousPage"] = "◀️";
         Values["ButtonGrid_NextPage"] = "▶️";
         Values["ButtonGrid_CurrentPage"] = "Seite {0} von {1}";
-        Values["ButtonGrid_SearchFeature"] =
+        Values["ButtonGrid_SearchFeature"] = "💡 Sende eine Nachricht um die Liste zu filtern. Klicke die 🔍 um den Filter zurückzusetzen.";
-            "💡 Sende eine Nachricht um die Liste zu filtern. Klicke die 🔍 um den Filter zurückzusetzen.";
         Values["ButtonGrid_Back"] = "Zurück";
-        Values["ButtonGrid_CheckAll"] = "Alle auswählen";
+        Values["TaggedButtonGrid_TotalTags"] = "Gesamt: {0}";
-        Values["ButtonGrid_UncheckAll"] = "Keine auswählen";
+        Values["TaggedButtonGrid_CheckedTags"] = "Ausgewählt: {0}";
+        Values["TaggedButtonGrid_CheckAll"] = "Alle auswählen";
+        Values["TaggedButtonGrid_UncheckAll"] = "Keine auswählen";
         Values["CalendarPicker_Title"] = "Datum auswählen";
         Values["CalendarPicker_PreviousPage"] = "◀️";
         Values["CalendarPicker_NextPage"] = "▶️";
@@ -31,5 +32,8 @@ public class German : Localization
         Values["MultiToggleButton_Changed"] = "Ausgewählt";
         Values["PromptDialog_Back"] = "Zurück";
         Values["ToggleButton_Changed"] = "Einstellung geändert";
+        Values["ButtonGrid_SearchIcon"] = "🔍";
+        Values["TaggedButtonGrid_TagIcon"] = "📁";
+        Values["Label_Text"] = "Standard Label Text";
     }
 }

TelegramBotBase/Localizations/Persian.cs

@@ -0,0 +1,40 @@
+namespace TelegramBotBase.Localizations;
+
+public sealed class Persian : Localization
+{
+    public Persian()
+    {
+        Values["Language"] = "فارسی";
+        Values["ButtonGrid_Title"] = "منو";
+        Values["ButtonGrid_NoItems"] = "هیچ آیتمی وجود ندارد.";
+        Values["ButtonGrid_PreviousPage"] = "◀️";
+        Values["ButtonGrid_NextPage"] = "▶️";
+        Values["ButtonGrid_CurrentPage"] = "صفحه ی {0} از {1}";
+        Values["ButtonGrid_SearchFeature"] = "💡 برای فیلتر کردن لیست پیام ارسال کنید. برای بازنشانی فیلتر روی 🔍 کلیک کنید.";
+        Values["ButtonGrid_Back"] = "بازگشت";
+        Values["TaggedButtonGrid_TotalTags"] = "Total: {0}";
+        Values["TaggedButtonGrid_CheckedTags"] = "Checked: {0}";
+        Values["TaggedButtonGrid_CheckAll"] = "بررسی کردن همه";
+        Values["TaggedButtonGrid_UncheckAll"] = "بررسی نکردن همه";
+        Values["CalendarPicker_Title"] = "تاریخ را انتخاب کنید";
+        Values["CalendarPicker_PreviousPage"] = "◀️";
+        Values["CalendarPicker_NextPage"] = "▶️";
+        Values["TreeView_Title"] = "گره را انتخاب کنید";
+        Values["TreeView_LevelUp"] = "🔼 سطح بالا";
+        Values["ToggleButton_On"] = "روشن";
+        Values["ToggleButton_Off"] = "خاموش";
+        Values["ToggleButton_OnIcon"] = "⚫";
+        Values["ToggleButton_OffIcon"] = "⚪";
+        Values["ToggleButton_Title"] = "تغییر وضعیت";
+        Values["ToggleButton_Changed"] = "انتخاب شده";
+        Values["MultiToggleButton_SelectedIcon"] = "✅";
+        Values["MultiToggleButton_Title"] = "چند تعویض";
+        Values["MultiToggleButton_Changed"] = "انتخاب شده";
+        Values["PromptDialog_Back"] = "بازگشت";
+        Values["ToggleButton_Changed"] = "تنظیمات تغییر کرد";
+        Values["ButtonGrid_SearchIcon"] = "🔍";
+        Values["TaggedButtonGrid_TagIcon"] = "📁";
+        Values["Label_Text"] = "متن برچسب پیش‌فرض";
+    }
+}
+

TelegramBotBase/Localizations/Russian.cs

@@ -0,0 +1,39 @@
+namespace TelegramBotBase.Localizations;
+
+public sealed class Russian : Localization
+{
+    public Russian()
+    {
+        Values["Language"] = "Русский (Russian)";
+        Values["ButtonGrid_Title"] = "Меню";
+        Values["ButtonGrid_NoItems"] = "Нет доступных элементов.";
+        Values["ButtonGrid_PreviousPage"] = "◀️";
+        Values["ButtonGrid_NextPage"] = "▶️";
+        Values["ButtonGrid_CurrentPage"] = "Страница {0} из {1}";
+        Values["ButtonGrid_SearchFeature"] = "💡 Отправьте сообщение, чтобы отфильтровать список. Нажмите на 🔍, чтобы сбросить фильтр.";
+        Values["ButtonGrid_Back"] = "Назад";
+        Values["TaggedButtonGrid_TotalTags"] = "Всего: {0}";
+        Values["TaggedButtonGrid_CheckedTags"] = "Отмечено: {0}";
+        Values["TaggedButtonGrid_CheckAll"] = "Выделить все";
+        Values["TaggedButtonGrid_UncheckAll"] = "Отменить выбор";
+        Values["CalendarPicker_Title"] = "Календарь / Выберите дату";
+        Values["CalendarPicker_PreviousPage"] = "◀️";
+        Values["CalendarPicker_NextPage"] = "▶️";
+        Values["TreeView_Title"] = "Выберите пункт";
+        Values["TreeView_LevelUp"] = "🔼 Обратно";
+        Values["ToggleButton_On"] = "Вкл";
+        Values["ToggleButton_Off"] = "Выкл";
+        Values["ToggleButton_OnIcon"] = "⚫";
+        Values["ToggleButton_OffIcon"] = "⚪";
+        Values["ToggleButton_Title"] = "Переключить";
+        Values["ToggleButton_Changed"] = "Выбрано";
+        Values["MultiToggleButton_SelectedIcon"] = "✅";
+        Values["MultiToggleButton_Title"] = "Множественный выбор";
+        Values["MultiToggleButton_Changed"] = "Выбрано";
+        Values["PromptDialog_Back"] = "Назад";
+        Values["ToggleButton_Changed"] = "Настройки изменены";
+        Values["ButtonGrid_SearchIcon"] = "🔍";
+        Values["TaggedButtonGrid_TagIcon"] = "📁";
+        Values["Label_Text"] = "Текст метки по умолчанию";
+    }
+}

TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs

@@ -5,7 +5,6 @@ using Telegram.Bot.Types.Enums;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Interfaces;
-using TelegramBotBase.Sessions;
 
 namespace TelegramBotBase.MessageLoops;
 
@@ -18,7 +17,7 @@ public class FormBaseMessageLoop : IMessageLoopFactory
 
     private readonly EventHandlerList _events = new();
 
-    public async Task MessageLoop(BotBase bot, DeviceSession session, UpdateResult ur, MessageResult mr)
+    public async Task MessageLoop(BotBase bot, IDeviceSession session, UpdateResult ur, MessageResult mr)
     {
         var update = ur.RawData;
 
@@ -72,14 +71,23 @@ public class FormBaseMessageLoop : IMessageLoopFactory
             }
         }
 
+        //Message edited ?
+        if(update.Type == UpdateType.EditedMessage)
+        {
+            await activeForm.Edited(mr);
+        }
+
         //Action Event
-        if (!session.FormSwitched && mr.IsAction)
+        if (!session.FormSwitched && mr.IsAction && !mr.Handled)
         {
             //Send Action event to controls
             await activeForm.ActionControls(mr);
 
-            //Send Action event to form itself
+            if (!mr.Handled)
-            await activeForm.Action(mr);
+            {
+                //Send Action event to form itself, if not already handled by a control
+                await activeForm.Action(mr);
+            }
 
             if (!mr.Handled)
             {

TelegramBotBase/MessageLoops/FullMessageLoop.cs

@@ -5,7 +5,6 @@ using Telegram.Bot.Types.Enums;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Interfaces;
-using TelegramBotBase.Sessions;
 
 namespace TelegramBotBase.MessageLoops;
 
@@ -18,7 +17,7 @@ public class FullMessageLoop : IMessageLoopFactory
 
     private readonly EventHandlerList _events = new();
 
-    public async Task MessageLoop(BotBase bot, DeviceSession session, UpdateResult ur, MessageResult mr)
+    public async Task MessageLoop(BotBase bot, IDeviceSession session, UpdateResult ur, MessageResult mr)
     {
         var update = ur.RawData;
 
@@ -65,14 +64,23 @@ public class FullMessageLoop : IMessageLoopFactory
             }
         }
 
+        //Message edited ?
+        if (update.Type == UpdateType.EditedMessage)
+        {
+            await activeForm.Edited(mr);
+        }
+
         //Action Event
-        if (!session.FormSwitched && mr.IsAction)
+        if (!session.FormSwitched && mr.IsAction && !mr.Handled)
         {
             //Send Action event to controls
             await activeForm.ActionControls(mr);
 
-            //Send Action event to form itself
+            if (!mr.Handled)
-            await activeForm.Action(mr);
+            {
+                //Send Action event to form itself, if not already handled by a control
+                await activeForm.Action(mr);
+            }
 
             if (!mr.Handled)
             {

TelegramBotBase/MessageLoops/MinimalMessageLoop.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Interfaces;
-using TelegramBotBase.Sessions;
 
 namespace TelegramBotBase.MessageLoops;
 
@@ -17,7 +16,7 @@ public class MinimalMessageLoop : IMessageLoopFactory
 
     private readonly EventHandlerList _events = new();
 
-    public async Task MessageLoop(BotBase bot, DeviceSession session, UpdateResult ur, MessageResult mr)
+    public async Task MessageLoop(BotBase bot, IDeviceSession session, UpdateResult ur, MessageResult mr)
     {
         var update = ur.RawData;
 

TelegramBotBase/SessionManager.cs

@@ -21,7 +21,7 @@ public class SessionManager
     public SessionManager(BotBase botBase)
     {
         BotBase = botBase;
-        SessionList = new Dictionary<long, DeviceSession>();
+        SessionList = new Dictionary<long, IDeviceSession>();
     }
 
     /// <summary>
@@ -32,7 +32,7 @@ public class SessionManager
     /// <summary>
     ///     A list of all active sessions.
     /// </summary>
-    public Dictionary<long, DeviceSession> SessionList { get; set; }
+    public Dictionary<long, IDeviceSession> SessionList { get; set; }
 
 
     /// <summary>
@@ -45,7 +45,7 @@ public class SessionManager
     /// </summary>
     /// <param name="deviceId"></param>
     /// <returns></returns>
-    public DeviceSession GetSession(long deviceId)
+    public IDeviceSession GetSession(long deviceId)
     {
         var ds = SessionList.FirstOrDefault(a => a.Key == deviceId).Value ?? null;
         return ds;
@@ -57,7 +57,7 @@ public class SessionManager
     /// <typeparam name="T"></typeparam>
     /// <param name="deviceId"></param>
     /// <returns></returns>
-    public async Task<DeviceSession> StartSession(long deviceId)
+    public async Task<IDeviceSession> StartSession(long deviceId)
     {
         var start = BotBase.StartFormFactory.CreateForm();
 
@@ -91,7 +91,7 @@ public class SessionManager
     ///     Returns all active User Sessions.
     /// </summary>
     /// <returns></returns>
-    public List<DeviceSession> GetUserSessions()
+    public List<IDeviceSession> GetUserSessions()
     {
         return SessionList.Where(a => a.Key > 0).Select(a => a.Value).ToList();
     }
@@ -100,7 +100,7 @@ public class SessionManager
     ///     Returns all active Group Sessions.
     /// </summary>
     /// <returns></returns>
-    public List<DeviceSession> GetGroupSessions()
+    public List<IDeviceSession> GetGroupSessions()
     {
         return SessionList.Where(a => a.Key < 0).Select(a => a.Value).ToList();
     }

TelegramBotBase/Sessions/DeviceSession.cs

@@ -131,13 +131,9 @@ public class DeviceSession : IDeviceSession
     public async Task ConfirmAction(string callbackQueryId, string message = "", bool showAlert = false,
                                     string urlToOpen = null)
     {
-        try
+
-        {
+        await Client.TelegramClient.AnswerCallbackQueryAsync(callbackQueryId, message, showAlert, urlToOpen);
-            await Client.TelegramClient.AnswerCallbackQueryAsync(callbackQueryId, message, showAlert, urlToOpen);
+
-        }
-        catch
-        {
-        }
     }
 
     /// <summary>
@@ -157,17 +153,8 @@ public class DeviceSession : IDeviceSession
             throw new MessageTooLongException(text.Length);
         }
 
-        try
-        {
-            return await Api(a =>
-                                 a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
-        }
-        catch
-        {
-        }
 
-
+        return await Api(a => a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
-        return null;
     }
 
     /// <summary>
@@ -185,17 +172,9 @@ public class DeviceSession : IDeviceSession
             throw new MessageTooLongException(text.Length);
         }
 
-        try
-        {
-            return await Api(a =>
-                                 a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
-        }
-        catch
-        {
-        }
 
+        return await Api(a => a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
 
-        return null;
     }
 
     /// <summary>
@@ -215,18 +194,8 @@ public class DeviceSession : IDeviceSession
             throw new MessageTooLongException(message.Text.Length);
         }
 
-        try
+        return await Api(a => a.EditMessageTextAsync(DeviceId, message.MessageId, message.Text, parseMode,
-        {
+                                                    replyMarkup: markup));
-            return await Api(a =>
-                                 a.EditMessageTextAsync(DeviceId, message.MessageId, message.Text, parseMode,
-                                                        replyMarkup: markup));
-        }
-        catch
-        {
-        }
-
-
-        return null;
     }
 
     /// <summary>
@@ -237,15 +206,8 @@ public class DeviceSession : IDeviceSession
     /// <returns></returns>
     public async Task<Message> EditReplyMarkup(int messageId, ButtonForm bf)
     {
-        try
-        {
-            return await Api(a => a.EditMessageReplyMarkupAsync(DeviceId, messageId, bf));
-        }
-        catch
-        {
-        }
 
-        return null;
+        return await Api(a => a.EditMessageReplyMarkupAsync(DeviceId, messageId, bf));
     }
 
     /// <summary>
@@ -277,21 +239,16 @@ public class DeviceSession : IDeviceSession
             text = text.MarkdownV2Escape();
         }
 
-        try
-        {
-            var t = Api(a => a.SendTextMessageAsync(deviceId, text, null, parseMode, replyToMessageId: replyTo,
-                                                    replyMarkup: markup, disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendTextMessageAsync(deviceId, text, null, parseMode, replyToMessageId: replyTo,
+                                                replyMarkup: markup, disableNotification: disableNotification));
 
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+        var o = GetOrigin(new StackTrace());
+
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -336,20 +293,15 @@ public class DeviceSession : IDeviceSession
             text = text.MarkdownV2Escape();
         }
 
-        try
-        {
-            var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
-                                                    replyMarkup: markup, disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                                replyMarkup: markup, disableNotification: disableNotification));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -360,7 +312,7 @@ public class DeviceSession : IDeviceSession
     /// <param name="replyTo"></param>
     /// <param name="disableNotification"></param>
     /// <returns></returns>
-    public async Task<Message> Send(string text, ReplyMarkupBase markup, int replyTo = 0,
+    public async Task<Message> Send(string text, IReplyMarkup markup, int replyTo = 0,
                                     bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown,
                                     bool markdownV2AutoEscape = true)
     {
@@ -379,20 +331,15 @@ public class DeviceSession : IDeviceSession
             text = text.MarkdownV2Escape();
         }
 
-        try
-        {
-            var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
-                                                    replyMarkup: markup, disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                                replyMarkup: markup, disableNotification: disableNotification));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -414,20 +361,15 @@ public class DeviceSession : IDeviceSession
 
         InlineKeyboardMarkup markup = buttons;
 
-        try
-        {
-            var t = Api(a => a.SendPhotoAsync(DeviceId, file, null, caption, parseMode, replyToMessageId: replyTo,
-                                              replyMarkup: markup, disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendPhotoAsync(DeviceId, file, null, caption, parseMode, replyToMessageId: replyTo,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                          replyMarkup: markup, disableNotification: disableNotification));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -449,21 +391,16 @@ public class DeviceSession : IDeviceSession
 
         InlineKeyboardMarkup markup = buttons;
 
-        try
-        {
-            var t = Api(a => a.SendVideoAsync(DeviceId, file, caption: caption, parseMode: parseMode,
-                                              replyToMessageId: replyTo, replyMarkup: markup,
-                                              disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendVideoAsync(DeviceId, file, caption: caption, parseMode: parseMode,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                          replyToMessageId: replyTo, replyMarkup: markup,
+                                          disableNotification: disableNotification));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -484,21 +421,16 @@ public class DeviceSession : IDeviceSession
 
         InlineKeyboardMarkup markup = buttons;
 
-        try
-        {
-            var t = Api(a => a.SendVideoAsync(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
-                                              replyToMessageId: replyTo, replyMarkup: markup,
-                                              disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendVideoAsync(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                          replyToMessageId: replyTo, replyMarkup: markup,
+                                          disableNotification: disableNotification));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -520,24 +452,19 @@ public class DeviceSession : IDeviceSession
 
         InlineKeyboardMarkup markup = buttons;
 
-        try
-        {
-            var ms = new MemoryStream(video);
 
-            var fts = InputFile.FromStream(ms, filename);
+        var ms = new MemoryStream(video);
 
-            var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
+        var fts = InputFile.FromStream(ms, filename);
-                                              replyMarkup: markup, disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                          replyMarkup: markup, disableNotification: disableNotification));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -560,26 +487,21 @@ public class DeviceSession : IDeviceSession
 
         InlineKeyboardMarkup markup = buttons;
 
-        try
-        {
-            var fs = new FileStream(filepath, FileMode.Open);
 
-            var filename = Path.GetFileName(filepath);
+        var fs = new FileStream(filepath, FileMode.Open);
 
-            var fts = InputFile.FromStream(fs, filename);
+        var filename = Path.GetFileName(filepath);
 
-            var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
+        var fts = InputFile.FromStream(fs, filename);
-                                              replyMarkup: markup, disableNotification: disableNotification));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                          replyMarkup: markup, disableNotification: disableNotification));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -650,20 +572,15 @@ public class DeviceSession : IDeviceSession
             markup = buttons;
         }
 
-        try
-        {
-            var t = Api(a => a.SendDocumentAsync(DeviceId, document, null, null, caption, replyMarkup: markup,
-                                                 disableNotification: disableNotification, replyToMessageId: replyTo));
 
-            var o = GetOrigin(new StackTrace());
+        var t = Api(a => a.SendDocumentAsync(DeviceId, document, null, null, caption, replyMarkup: markup,
-            await OnMessageSent(new MessageSentEventArgs(await t, o));
+                                             disableNotification: disableNotification, replyToMessageId: replyTo));
+
+        var o = GetOrigin(new StackTrace());
+        await OnMessageSent(new MessageSentEventArgs(await t, o));
+
+        return await t;
 
-            return await t;
-        }
-        catch
-        {
-            return null;
-        }
     }
 
     /// <summary>
@@ -714,22 +631,16 @@ public class DeviceSession : IDeviceSession
 
     public async Task<Message> HideReplyKeyboard(string closedMsg = "Closed", bool autoDeleteResponse = true)
     {
-        try
-        {
-            var m = await Send(closedMsg, new ReplyKeyboardRemove());
 
-            if (autoDeleteResponse && m != null)
+        var m = await Send(closedMsg, new ReplyKeyboardRemove());
-            {
-                await DeleteMessage(m);
-            }
 
-            return m;
+        if (autoDeleteResponse && m != null)
-        }
-        catch
         {
+            await DeleteMessage(m);
         }
 
-        return null;
+        return m;
+
     }
 
     /// <summary>
@@ -759,13 +670,9 @@ public class DeviceSession : IDeviceSession
 
     public virtual async Task ChangeChatPermissions(ChatPermissions permissions)
     {
-        try
+
-        {
+        await Api(a => a.SetChatPermissionsAsync(DeviceId, permissions));
-            await Api(a => a.SetChatPermissionsAsync(DeviceId, permissions));
+
-        }
-        catch
-        {
-        }
     }
 
     private Type GetOrigin(StackTrace stackTrace)
@@ -878,49 +785,31 @@ public class DeviceSession : IDeviceSession
 
     public virtual async Task<ChatMember> GetChatUser(long userId)
     {
-        try
-        {
-            return await Api(a => a.GetChatMemberAsync(DeviceId, userId));
-        }
-        catch
-        {
-        }
 
-        return null;
+        return await Api(a => a.GetChatMemberAsync(DeviceId, userId));
+
     }
 
     [Obsolete("User BanUser instead.")]
     public virtual async Task KickUser(long userId, DateTime until = default)
     {
-        try
+
-        {
+        await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
-            await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
+
-        }
-        catch
-        {
-        }
     }
 
     public virtual async Task BanUser(long userId, DateTime until = default)
     {
-        try
+
-        {
+        await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
-            await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
+
-        }
-        catch
-        {
-        }
     }
 
     public virtual async Task UnbanUser(long userId)
     {
-        try
+
-        {
+        await Api(a => a.UnbanChatMemberAsync(DeviceId, userId));
-            await Api(a => a.UnbanChatMemberAsync(DeviceId, userId));
+
-        }
-        catch
-        {
-        }
     }
 
     #endregion

TelegramBotBase/States/Converter/DictionaryTypeConverter.cs

@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace TelegramBotBase.States.Converter
+{
+    public class DictionaryObjectJsonConverter : JsonConverter<Dictionary<string, object>>
+    {
+        public override Dictionary<string, object> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var dictionary = new Dictionary<string, object>();
+            var jsonDocument = JsonDocument.ParseValue(ref reader);
+
+            foreach (var element in jsonDocument.RootElement.EnumerateObject())
+            {
+                switch (element.Value.ValueKind)
+                {
+                    case JsonValueKind.String:
+                        dictionary[element.Name] = element.Value.GetString();
+                        break;
+                    case JsonValueKind.Number:
+
+                        if (element.Value.TryGetInt32(out var number))
+                        {
+                            dictionary[element.Name] = number;
+                            continue;
+                        }
+
+                        if (element.Value.TryGetInt64(out long l))
+                            dictionary[element.Name] = l;
+                        else
+                            dictionary[element.Name] = element.Value.GetDouble();
+                        break;
+                    case JsonValueKind.True:
+                    case JsonValueKind.False:
+                        dictionary[element.Name] = element.Value.GetBoolean();
+                        break;
+                    case JsonValueKind.Object:
+                        dictionary[element.Name] = JsonSerializer.Deserialize<Dictionary<string, object>>(element.Value.GetRawText(), options);
+                        break;
+                    case JsonValueKind.Array:
+
+                        dictionary[element.Name] = HandleArray(element.Value);
+
+                        break;
+                    default:
+                        dictionary[element.Name] = element.Value.GetRawText();
+                        break;
+                }
+            }
+
+            return dictionary;
+        }
+
+
+
+        private object HandleArray(JsonElement jsonArray)
+        {
+            // Hier wird geprüft, ob alle Elemente einer bestimmten Art angehören (z. B. int, string)
+            if (jsonArray.GetArrayLength() > 0)
+            {
+                var firstElement = jsonArray[0];
+                switch (firstElement.ValueKind)
+                {
+                    case JsonValueKind.Number:
+                        // Prüfen, ob alle Elemente ganze Zahlen sind
+                        var isIntArray = true;
+                        var isLongArray = false;
+
+                        foreach (var element in jsonArray.EnumerateArray())
+                        {
+                            if (!element.TryGetInt32(out _))
+                            {
+                                isIntArray = false;
+                                isLongArray = true;
+                                if (!element.TryGetInt64(out _))
+                                {
+                                    isLongArray = false;
+                                    break;
+                                }
+                            }
+                        }
+                        if (isIntArray)
+                        {
+                            var list = new List<int>();
+                            foreach (var element in jsonArray.EnumerateArray())
+                            {
+                                list.Add(element.GetInt32());
+                            }
+                            return list;
+                        }
+                        else if (isLongArray)
+                        {
+                            var list = new List<long>();
+                            foreach (var element in jsonArray.EnumerateArray())
+                            {
+                                list.Add(element.GetInt64());
+                            }
+                            return list;
+                        }
+                        else
+                        {
+                            var list = new List<double>();
+                            foreach (var element in jsonArray.EnumerateArray())
+                            {
+                                list.Add(element.GetDouble());
+                            }
+                            return list;
+                        }
+                    case JsonValueKind.String:
+                        var stringList = new List<string>();
+                        foreach (var element in jsonArray.EnumerateArray())
+                        {
+                            stringList.Add(element.GetString());
+                        }
+                        return stringList;
+                    case JsonValueKind.True:
+                    case JsonValueKind.False:
+                        var boolList = new List<bool>();
+                        foreach (var element in jsonArray.EnumerateArray())
+                        {
+                            boolList.Add(element.GetBoolean());
+                        }
+                        return boolList;
+                    default:
+                        // Fallback: Liste von Objekten (z. B. wenn es sich um komplexe Objekte handelt)
+                        var objectList = new List<object>();
+                        foreach (var element in jsonArray.EnumerateArray())
+                        {
+                            objectList.Add(JsonSerializer.Deserialize<object>(element.GetRawText()));
+                        }
+                        return objectList;
+                }
+            }
+
+            // Leeres Array als Liste von Objekten zurückgeben
+            return new List<object>();
+        }
+
+        public override void Write(Utf8JsonWriter writer, Dictionary<string, object> value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+
+            foreach (var kvp in value)
+            {
+                writer.WritePropertyName(kvp.Key);
+                JsonSerializer.Serialize(writer, kvp.Value, kvp.Value?.GetType() ?? typeof(object), options);
+            }
+
+            writer.WriteEndObject();
+        }
+    }
+}

TelegramBotBase/States/Converter/JsonTypeConverter.cs

@@ -0,0 +1,296 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace TelegramBotBase.States.Converter
+{
+    public class JsonTypeConverter : JsonConverter<object>
+    {
+
+        public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            using (JsonDocument doc = JsonDocument.ParseValue(ref reader))
+            {
+                return ParseElement(doc.RootElement, options, typeof(object));
+            }
+
+        }
+
+        private object ParseElement(JsonElement element, JsonSerializerOptions options, Type expected_type)
+        {
+            // Wenn das Element ein JSON-Objekt ist
+            if (element.ValueKind == JsonValueKind.Object)
+            {
+                // Wenn es einen $type enthält, dann den Typ dynamisch instanziieren
+                if (element.TryGetProperty("$type", out JsonElement typeElement))
+                {
+                    string typeName = typeElement.GetString();
+                    Type type = Type.GetType(typeName);
+
+                    if (type == null)
+                        throw new InvalidOperationException($"Typ '{typeName}' konnte nicht gefunden werden.");
+
+                    // Liste verarbeiten, falls $values enthalten ist
+                    if (element.TryGetProperty("$values", out JsonElement valuesElement))
+                    {
+                        return ParseArray(valuesElement, type);
+                    }
+                    else if (expected_type.IsGenericType && expected_type.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+                    {
+                        var dictionary = new Dictionary<string, object>();
+                        foreach (var property in element.EnumerateObject())
+                        {
+                            dictionary[property.Name] = ParseElement(property.Value, options, typeof(object));
+                        }
+
+                        return dictionary;
+                    }
+                    else
+                    {
+                        var instance = type.GetConstructor(new Type[] { }).Invoke(new object[] { });
+                        var properties = type.GetProperties();
+
+                        foreach (var p in properties)
+                        {
+                            if (!element.TryGetProperty(p.Name, out JsonElement value))
+                                continue;
+
+                            switch (value.ValueKind)
+                            {
+                                case JsonValueKind.Number:
+
+                                    if (p.PropertyType == typeof(int))
+                                    {
+                                        if (value.TryGetInt32(out int i))
+                                        {
+                                            p.SetValue(instance, i);
+                                        }
+                                    }
+                                    else if (p.PropertyType == typeof(long))
+                                    {
+                                        if (value.TryGetInt64(out long l))
+                                        {
+                                            p.SetValue(instance, l);
+                                        }
+
+                                    }
+
+                                    break;
+                                case JsonValueKind.String:
+
+                                    p.SetValue(instance, value.ToString());
+
+                                    break;
+
+                                default:
+
+                                    //if (p.PropertyType.IsGenericType && p.PropertyType.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+                                    //{
+                                    //    var dictionary = new Dictionary<string, object>();
+                                    //    foreach (var property in element.EnumerateObject())
+                                    //    {
+                                    //        dictionary[property.Name] = ParseElement(property.Value, options, p.PropertyType);
+                                    //    }
+
+                                    //    p.SetValue(instance, dictionary);
+                                    //}
+                                    //else
+                                    //{
+
+                                    var obj = ParseElement(value, options, p.PropertyType);
+
+                                    if (obj == null)
+                                        continue;
+
+                                    try
+                                    {
+                                        p.SetValue(instance, obj);
+                                    }
+                                    catch
+                                    {
+
+                                    }
+                                    //}
+
+
+                                    break;
+                            }
+
+
+
+                        }
+
+                        return instance;
+
+                        // Objekt dynamisch deserialisieren
+                        //return JsonSerializer.Deserialize(element.GetRawText(), type, options);
+                    }
+                }
+                else
+                {
+                    // Falls kein $type vorhanden ist, als Dictionary verarbeiten
+                    var dictionary = new Dictionary<string, object>();
+                    foreach (var property in element.EnumerateObject())
+                    {
+                        dictionary[property.Name] = ParseElement(property.Value, options, typeof(object));
+                    }
+                    return dictionary;
+                }
+            }
+            // Wenn das Element ein Array ist
+            else if (element.ValueKind == JsonValueKind.Array)
+            {
+                return ParseArray(element, typeof(object));
+            }
+            // Primitive Typen (String, Number, Bool)
+            else if (element.ValueKind == JsonValueKind.Number)
+            {
+
+                if (expected_type == typeof(Int64))
+                {
+                    if (element.TryGetInt64(out long l))
+                        return l;
+                }
+                else if (expected_type == typeof(Int32))
+                {
+                    if (element.TryGetInt32(out int i))
+                        return i;
+                }
+
+                if (element.TryGetInt32(out int i2))
+                    return i2;
+
+                return 0;
+            }
+            else if (element.ValueKind == JsonValueKind.String)
+            {
+                return element.ToString();
+            }
+            else
+            {
+
+#if NETCOREAPP3_1
+                return JsonSerializer.Deserialize(element.ToString(), typeof(object), options);
+#else
+                return element.Deserialize<object>(options);
+#endif
+
+            }
+        }
+
+        private object ParseElement(JsonElement element)
+        {
+
+            return null;
+        }
+
+        private object ParseArray(JsonElement arrayElement, Type listType)
+        {
+            // Wenn der Typ eine generische Liste ist
+            if (listType.IsGenericType && listType.GetGenericTypeDefinition() == typeof(List<>))
+            {
+                Type elementType = listType.GetGenericArguments()[0];
+                var list = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(elementType));
+                foreach (var item in arrayElement.EnumerateArray())
+                {
+                    list.Add(ParseElement(item, new JsonSerializerOptions(), elementType));
+                }
+                return list;
+            }
+            else
+            {
+                // Standardmäßig als List<object>
+                var list = new List<object>();
+                foreach (var item in arrayElement.EnumerateArray())
+                {
+                    list.Add(ParseElement(item, new JsonSerializerOptions(), typeof(object)));
+                }
+                return list;
+            }
+        }
+
+        public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+        {
+            WriteWithTypeInfo(writer, value, options);
+
+        }
+
+        private void WriteWithTypeInfo(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+        {
+            if (value == null)
+            {
+                writer.WriteNullValue();
+                return;
+            }
+
+            Type type = value.GetType();
+
+            // Primitives und grundlegende Typen (int, string, bool, etc.)
+            if (type.IsPrimitive || type == typeof(string) || type == typeof(decimal))
+            {
+                JsonSerializer.Serialize(writer, value, type, options);
+            }
+            // Behandlung für Sammlungen
+            else if (value is IList list)
+            {
+                writer.WriteStartObject();
+                writer.WriteString("$type", type.AssemblyQualifiedName);
+                writer.WritePropertyName("$values");
+                writer.WriteStartArray();
+
+                foreach (var item in list)
+                {
+                    WriteWithTypeInfo(writer, item, options);
+                }
+
+                writer.WriteEndArray();
+                writer.WriteEndObject();
+            }
+            // Behandlung für Dictionaries
+            else if (value is IDictionary dictionary)
+            {
+                writer.WriteStartObject();
+                writer.WriteString("$type", type.AssemblyQualifiedName);
+
+                foreach (DictionaryEntry entry in dictionary)
+                {
+                    writer.WritePropertyName(entry.Key.ToString());
+                    WriteWithTypeInfo(writer, entry.Value, options);
+                }
+
+                writer.WriteEndObject();
+            }
+            // Komplexe Objekte
+            else if (value is Enum e)
+            {
+
+                int eValue = (int)value;
+
+                writer.WriteNumberValue(eValue);
+
+            }
+            else
+            {
+                writer.WriteStartObject();
+                writer.WriteString("$type", type.AssemblyQualifiedName);
+
+                foreach (var property in type.GetProperties())
+                {
+                    if (property.CanRead)
+                    {
+                        var propValue = property.GetValue(value);
+                        writer.WritePropertyName(property.Name);
+                        WriteWithTypeInfo(writer, propValue, options);
+                    }
+                }
+
+                writer.WriteEndObject();
+            }
+        }
+    }
+}

TelegramBotBase/States/JSONStateMachine.cs

@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using Newtonsoft.Json;
+using System.Text.Json;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
@@ -29,7 +29,7 @@ public class JsonStateMachine : IStateMachine
 
         if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
         {
-            throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
+            throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
         }
 
         FilePath = file ?? throw new ArgumentNullException(nameof(file));
@@ -48,16 +48,24 @@ public class JsonStateMachine : IStateMachine
         {
             var content = File.ReadAllText(FilePath);
 
-            var sc = JsonConvert.DeserializeObject<StateContainer>(content, new JsonSerializerSettings
+            var options = new JsonSerializerOptions
             {
-                TypeNameHandling = TypeNameHandling.All,
+                Converters = {
-                TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
+                    new Converter.JsonTypeConverter(),
-            });
+                    //new Converter.DictionaryObjectJsonConverter(),
+                    
+                },
+                PropertyNameCaseInsensitive = true
+            };
+
+            var obj = JsonSerializer.Deserialize<object>(content, options) ;
+            var sc = obj as StateContainer;
 
             return sc;
         }
-        catch
+        catch(Exception ex)
         {
+            throw ex;
         }
 
         return new StateContainer();
@@ -77,16 +85,23 @@ public class JsonStateMachine : IStateMachine
 
         try
         {
-            var content = JsonConvert.SerializeObject(e.States, Formatting.Indented, new JsonSerializerSettings
+            var options = new JsonSerializerOptions
             {
-                TypeNameHandling = TypeNameHandling.All,
+                WriteIndented = true,
-                TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
+                Converters = {
-            });
+                    new Converter.JsonTypeConverter(),
+                },
+                 PropertyNameCaseInsensitive = true
+            };
+
+            var content = JsonSerializer.Serialize<object>(e.States, options);
 
             File.WriteAllText(FilePath, content);
         }
         catch
         {
+
+
         }
     }
 }

TelegramBotBase/States/SimpleJSONStateMachine.cs

@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using Newtonsoft.Json;
+using System.Text.Json;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
@@ -30,7 +30,7 @@ public class SimpleJsonStateMachine : IStateMachine
 
         if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
         {
-            throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
+            throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
         }
 
         FilePath = file ?? throw new ArgumentNullException(nameof(file));
@@ -49,7 +49,15 @@ public class SimpleJsonStateMachine : IStateMachine
         {
             var content = File.ReadAllText(FilePath);
 
-            var sc = JsonConvert.DeserializeObject<StateContainer>(content);
+            var options = new JsonSerializerOptions
+            {
+                Converters = {
+                    new Converter.DictionaryObjectJsonConverter(),
+                    new Converter.JsonTypeConverter()
+                }
+            };
+
+            var sc = JsonSerializer.Deserialize<StateContainer>(content, options);
 
             return sc;
         }
@@ -74,7 +82,16 @@ public class SimpleJsonStateMachine : IStateMachine
 
         try
         {
-            var content = JsonConvert.SerializeObject(e.States, Formatting.Indented);
+            var options = new JsonSerializerOptions
+            {
+                WriteIndented = true,
+                Converters = {
+                    new Converter.DictionaryObjectJsonConverter(),
+                    new Converter.JsonTypeConverter()
+                }
+            };
+
+            var content = JsonSerializer.Serialize(e.States, options);
 
             File.WriteAllText(FilePath, content);
         }

TelegramBotBase/States/XMLStateMachine.cs

@@ -27,7 +27,7 @@ public class XmlStateMachine : IStateMachine
 
         if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
         {
-            throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
+            throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
         }
 
         FilePath = file ?? throw new ArgumentNullException(nameof(file));

TelegramBotBase/TelegramBotBase.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net6;net7;net8</TargetFrameworks>
         <LangVersion>10</LangVersion>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
@@ -22,8 +22,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 
 
@@ -60,4 +60,9 @@
         <PackageReference Include="Telegram.Bot" Version="19.0.0" />
     </ItemGroup>
 
+
+    <ItemGroup>
+      <ProjectReference Include="..\TelegramBotBase.SourceGenerators\TelegramBotBase.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" TargetFramework="netstandard2.0" />
+    </ItemGroup>
+
 </Project>

TelegramBotBase/TelegramBotBase.nuspec

@@ -14,12 +14,10 @@
     <dependencies>
       <group targetFramework=".NETFramework4.6.1">
         <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers" />
         <dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers" />
         <dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>

TelegramBotFramework.sln

@@ -30,7 +30,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCoreBot", "Examples\EFCor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotAndWebApplication", "Examples\BotAndWebApplication\BotAndWebApplication.csproj", "{52EA3201-02E8-46F5-87C4-B4752C8A815C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InlineAndReplyCombination", "Examples\InlineAndReplyCombination\InlineAndReplyCombination.csproj", "{067E8EBE-F90A-4AFF-A0FF-20578216486E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InlineAndReplyCombination", "Examples\InlineAndReplyCombination\InlineAndReplyCombination.csproj", "{067E8EBE-F90A-4AFF-A0FF-20578216486E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection", "Examples\DependencyInjection\DependencyInjection.csproj", "{689B16BC-200E-4C68-BB2E-8B209070849B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Serializer.Database.PostgreSql", "TelegramBotBase.Extensions.Serializer.Database.PostgreSql\TelegramBotBase.Extensions.Serializer.Database.PostgreSql.csproj", "{7C55D9FF-7DC1-41D0-809C-469EBFA20992}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Images.IronSoftware", "TelegramBotBase.Extensions.Images.IronSoftware\TelegramBotBase.Extensions.Images.IronSoftware.csproj", "{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.SourceGenerators", "TelegramBotBase.SourceGenerators\TelegramBotBase.SourceGenerators.csproj", "{B78455D6-8AF2-459C-B56A-210DC89D7793}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson", "TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson\TelegramBotBase.Extensions.Serializer.Legacy.NewtonsoftJson.csproj", "{21C44B20-1ED8-4BE6-A629-C2EC737C06E0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -78,6 +88,26 @@ Global
 		{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{689B16BC-200E-4C68-BB2E-8B209070849B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{689B16BC-200E-4C68-BB2E-8B209070849B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B78455D6-8AF2-459C-B56A-210DC89D7793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B78455D6-8AF2-459C-B56A-210DC89D7793}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B78455D6-8AF2-459C-B56A-210DC89D7793}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B78455D6-8AF2-459C-B56A-210DC89D7793}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21C44B20-1ED8-4BE6-A629-C2EC737C06E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21C44B20-1ED8-4BE6-A629-C2EC737C06E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21C44B20-1ED8-4BE6-A629-C2EC737C06E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21C44B20-1ED8-4BE6-A629-C2EC737C06E0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -91,6 +121,10 @@ Global
 		{261BED47-0404-4A9A-86FC-047DE42A7D25} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
 		{52EA3201-02E8-46F5-87C4-B4752C8A815C} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
 		{067E8EBE-F90A-4AFF-A0FF-20578216486E} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
+		{689B16BC-200E-4C68-BB2E-8B209070849B} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
+		{7C55D9FF-7DC1-41D0-809C-469EBFA20992} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
+		{DC521A4C-7446-46F7-845B-AAF10EDCF8C6} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
+		{21C44B20-1ED8-4BE6-A629-C2EC737C06E0} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {59CB40E1-9FA7-4867-A56F-4F418286F057}