Merge pull request #63 from MajMcCloud/development

Integrating latest developments into master branch

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/Program.cs

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

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;
+
+
+
+            }
+
+
+
+        }
     }
 }

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
 
@@ -1081,3 +1157,8 @@ 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)
+
+
+Alpha: Full Dependency Injection example within this framework.
+
+- [Examples/DependencyInjection](Examples/DependencyInjection)

TelegramBotBase.Extensions.Images.IronSoftware/ImageExtensions.cs

@@ -0,0 +1,73 @@
+using IronSoftware.Drawing;
+using SixLabors.ImageSharp;
+using System.IO;
+using System.Threading.Tasks;
+using Telegram.Bot.Types;
+using TelegramBotBase.Form;
+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 DeviceSession 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 DeviceSession 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,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;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.1.1" />
+        <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" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Properties\" />
+    </ItemGroup>
+
+</Project>

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

@@ -2,11 +2,17 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</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>
@@ -15,10 +21,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-    </ItemGroup>
+        <PackageReference Include="TelegramBotBase" Version="6.0.0" />
-
-    <ItemGroup>
-      <ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
     </ItemGroup>
 
     <ItemGroup>

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.1.3" />
         <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.1" />
+    </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.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/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

@@ -32,6 +32,8 @@ public class FormBase : IDisposable
 
     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();
     }
 
 
-    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/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

@@ -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

@@ -115,12 +115,13 @@ public sealed class BotBase
             if (ds == null)
             {
                 ds = await Sessions.StartSession(e.DeviceId);
-                e.Device = ds;
                 ds.LastMessage = e.RawData.Message;
 
                 OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
             }
 
+            e.Device = ds;
+
             var mr = new MessageResult(e.RawData);
 
             var i = 0;

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)
@@ -84,6 +88,8 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
         DefaultLanguage();
 
+        UseSingleThread();
+
         return this;
     }
 
@@ -104,6 +110,8 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
 
         DefaultLanguage();
 
+        UseSingleThread();
+
         return this;
     }
 
@@ -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)"
 
+    /// <inheritdoc cref="ILanguageSelectionStage.DefaultLanguage"/>
     public IBuildingStage DefaultLanguage()
     {
         return this;
     }
 
+    /// <inheritdoc cref="ILanguageSelectionStage.UseEnglish"/>
     public IBuildingStage UseEnglish()
     {
         Default.Language = new English();
         return this;
     }
 
+    /// <inheritdoc cref="ILanguageSelectionStage.UseGerman"/>
     public IBuildingStage UseGerman()
     {
         Default.Language = new German();
         return this;
     }
 
+    /// <inheritdoc cref="ILanguageSelectionStage.UsePersian"/>
+    public IBuildingStage UsePersian()
+    {
+        Default.Language = new Persian();
+        return this;
+    }
+
+    /// <inheritdoc cref="ILanguageSelectionStage.UseRussian"/>
+    public IBuildingStage UseRussian()
+    {
+        Default.Language = new Russian();
+        return this;
+    }
+
+    /// <inheritdoc cref="ILanguageSelectionStage.Custom"/>
     public IBuildingStage 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/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();
 
     /// <summary>
     ///     Selects english as the default language for control labels.
     /// </summary>
-    /// <returns></returns>
+    /// <returns>The next stage in the building process.</returns>
     IBuildingStage 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();
 
+    /// <summary>
+    ///     Selects persian as the default language for control labels.
+    /// </summary>
+    /// <returns>The next stage in the building process.</returns>
+    IBuildingStage UsePersian();
+
+    /// <summary>
+    ///     Selects russian as the default language for control labels.
+    /// </summary>
+    /// <returns>The next stage in the building process.</returns>
+    IBuildingStage 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);
 }

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/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/Controls/Hybrid/ButtonGrid.cs

@@ -426,8 +426,6 @@ public class ButtonGrid : ControlBase
             return;
         }
 
-        await result.ConfirmAction(ConfirmationText ?? "");
-
         ButtonRow match = null;
         var index = -1;
 
@@ -462,6 +460,8 @@ public class ButtonGrid : ControlBase
         check:
         if (match != null)
         {
+            await result.ConfirmAction(ConfirmationText ?? "");
+
             await OnButtonClicked(new ButtonClickedEventArgs(match.GetButtonMatch(result.RawData, false), index,
                                                              match));
 

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()
     {
@@ -379,14 +383,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 +486,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 +571,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 +612,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 +741,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 +776,6 @@ public class TaggedButtonGrid : MultiView
                     return;
                 }
 
-                //if (bf.Count == 0)
-                //    return;
-
-
                 var rkm = (ReplyKeyboardMarkup)bf;
                 rkm.ResizeKeyboard = ResizeKeyboard;
                 rkm.OneTimeKeyboard = OneTimeKeyboard;
@@ -881,21 +897,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/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/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,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using TelegramBotBase.DependencyInjection;
 using TelegramBotBase.Form;
 using TelegramBotBase.Interfaces;
 
@@ -14,7 +15,7 @@ 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;
@@ -23,7 +24,12 @@ public class ServiceProviderStartFormFactory : IStartFormFactory
 
     public FormBase CreateForm()
     {
-        return (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
+        var fb = (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
+
+        //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/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,6 @@ public class English : Localization
         Values["PromptDialog_Back"] = "Back";
         Values["ToggleButton_Changed"] = "Setting changed";
         Values["ButtonGrid_SearchIcon"] = "🔍";
-        Values["ButtonGrid_TagIcon"] = "📁";
+        Values["TaggedButtonGrid_TagIcon"] = "📁";
     }
 }

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,7 @@ 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"] = "📁";
     }
 }

TelegramBotBase/Localizations/Persian.cs

@@ -0,0 +1,39 @@
+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"] = "📁";
+    }
+}
+

TelegramBotBase/Localizations/Russian.cs

@@ -0,0 +1,38 @@
+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"] = "📁";
+    }
+}

TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs

@@ -72,6 +72,12 @@ public class FormBaseMessageLoop : IMessageLoopFactory
             }
         }
 
+        //Message edited ?
+        if(update.Type == UpdateType.EditedMessage)
+        {
+            await activeForm.Edited(mr);
+        }
+
         //Action Event
         if (!session.FormSwitched && mr.IsAction)
         {

TelegramBotBase/MessageLoops/FullMessageLoop.cs

@@ -65,6 +65,12 @@ public class FullMessageLoop : IMessageLoopFactory
             }
         }
 
+        //Message edited ?
+        if (update.Type == UpdateType.EditedMessage)
+        {
+            await activeForm.Edited(mr);
+        }
+
         //Action Event
         if (!session.FormSwitched && mr.IsAction)
         {

TelegramBotBase/States/JSONStateMachine.cs

@@ -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));

TelegramBotBase/States/SimpleJSONStateMachine.cs

@@ -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));

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>netstandard2.0;netcoreapp3.1;net6;net7</TargetFrameworks>
         <LangVersion>10</LangVersion>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <GeneratePackageOnBuild>False</GeneratePackageOnBuild>

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,13 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -78,6 +84,18 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -91,6 +109,9 @@ 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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {59CB40E1-9FA7-4867-A56F-4F418286F057}