Enchancement to override Label._renderNecessary

Updating master branch via development branch

.gitea/workflows/TelegramBotFramework.nuget.yaml

@@ -0,0 +1,48 @@
+name: build nuget workflow for TelegramBotBase project
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  Build-TelegramBotBase:
+    env:
+      APP_PROJECT_NAME: TelegramBotBase
+      PACKAGE_VERSION: "123.1.6"
+    strategy:
+      matrix:
+        os: 
+          - linux
+          # - win
+        arch:
+          - x64
+          #- x32
+          #- arch64
+    runs-on: [ "${{ matrix.os }}" ]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Restore dependencies
+        run: dotnet restore $APP_PROJECT_NAME /p:Version=$PACKAGE_VERSION
+        
+      - name: Build app
+        run: dotnet build -c Release --version-suffix $PACKAGE_VERSION --no-restore $APP_PROJECT_NAME /p:Version=$PACKAGE_VERSION
+        
+      - name: Pack app
+        run: dotnet pack --no-build $APP_PROJECT_NAME /p:Version=$PACKAGE_VERSION
+
+      - name: disconnect old source
+        run: dotnet nuget remove source gitea
+        continue-on-error: true
+
+      - name: Connect source
+        run: dotnet nuget add source --name gitea https://git.kosyakmakc.ru/api/packages/kosyakmakc/nuget/index.json
+
+      - name: Upload nuget package
+        run: dotnet nuget push --source gitea --api-key ${{ secrets.kosyakmakc_nuget_publish }} ${{ gitea.workspace }}/${{ env.APP_PROJECT_NAME }}/bin/Release/$APP_PROJECT_NAME.$PACKAGE_VERSION.nupkg

README.md

@@ -14,6 +14,10 @@
 
 **Releases: [GitHub](https://github.com/MajMcCloud/TelegramBotFramework/releases)**
 
+**Need your own bot? Get in touch https://t.me/botbasebuilder**
+
+**on X: @florian_zevedei**
+
 ## Donate
 
 Paypal: [https://paypal.me/majmccloud](https://paypal.me/majmccloud)
@@ -102,6 +106,7 @@ var bot = BotBaseBuilder
     })
     .NoSerialization()
     .UseEnglish()
+    .UseSingleThread()
     .Build();
 
 // Upload bot commands to BotFather
@@ -122,8 +127,32 @@ like ChatId and other stuff your carrying.
 From there you build up your bots:
 
 ```csharp
-public class StartForm : FormBase
+public class Start : FormBase
 {
+     
+    public Start()
+    {
+        //Additional event handlers
+        Init += Start_Init;
+        Opened += Start_Opened;
+        Closed += Start_Closed;
+    }
+
+    // Gets invoked on initialization, before navigation
+    private async Task Start_Init(object sender, Args.InitEventArgs e)
+    {
+    }
+
+    // Gets invoked after opened
+    private async Task Start_Opened(object sender, EventArgs e)
+    {
+    }
+
+    // Gets invoked after form has been closed
+    private async Task Start_Closed(object sender, EventArgs e)
+    {
+    }
+
     // Gets invoked during Navigation to this form
     public override async Task PreLoad(MessageResult message)
     {
@@ -220,6 +249,7 @@ var bot = BotBaseBuilder
     })
     .NoSerialization()
     .UseEnglish()
+    .UseSingleThread()
     .Build();
 
 bot.BotCommand += async (s, en) =>
@@ -260,15 +290,15 @@ public class SimpleForm : AutoCleanForm
 {
     public SimpleForm()
     {
-        this.DeleteSide = TelegramBotBase.Enums.eDeleteSide.Both;
+        DeleteSide = EDeleteSide.Both;
-        this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
+        DeleteMode = EDeleteMode.OnLeavingForm;
 
-        this.Opened += SimpleForm_Opened;
+        Opened += SimpleForm_Opened;
     }
 
     private async Task SimpleForm_Opened(object sender, EventArgs e)
     {
-        await this.Device.Send("Hello world! (send 'back' to get back to Start)\r\nOr\r\nhi, hello, maybe, bye and ciao");
+        await Device.Send("Hello world! (send 'back' to get back to Start)\r\nOr\r\nhi, hello, maybe, bye and ciao");
     }
 
     public override async Task Load(MessageResult message)
@@ -306,7 +336,13 @@ public class SimpleForm : AutoCleanForm
 ```csharp
 public class ButtonTestForm : AutoCleanForm
 {
-    public override async Task Opened()
+    public ButtonTestForm()
+    {
+        this.DeleteMode = eDeleteMode.OnLeavingForm;
+        Opened += ButtonTestForm_Opened;
+    }
+
+    private async Task ButtonTestForm_Opened(object sender, EventArgs e)
     {
         await this.Device.Send("Hello world! (Click 'back' to get back to Start)");
     }
@@ -376,9 +412,10 @@ public class ProgressTest : AutoCleanForm
     public ProgressTest()
     {
         this.DeleteMode = eDeleteMode.OnLeavingForm;
+        Opened += ProgressTest_Opened;
     }
 
-    public override async Task Opened()
+    private async Task ProgressTest_Opened(object sender, EventArgs e)
     {
         await this.Device.Send("Welcome to ProgressTest");
     }
@@ -858,6 +895,7 @@ var bot = BotBaseBuilder
     })
     .UseSimpleJSON(AppContext.BaseDirectory + "config\\states.json")
     .UseEnglish()
+    .UseSingleThread()
     .Build();
 
 await bot.Start();
@@ -881,6 +919,7 @@ var bot = BotBaseBuilder
     })
     .UseJSON(AppContext.BaseDirectory + "config\\states.json")
     .UseEnglish()
+    .UseSingleThread()
     .Build();
 
 await bot.Start();
@@ -903,6 +942,7 @@ var bot = BotBaseBuilder
     })
     .UseXML(AppContext.BaseDirectory + "config\\states.xml")
     .UseEnglish()
+    .UseSingleThread()
     .Build();
 
 await bot.Start();
@@ -916,7 +956,7 @@ datatype and one for implementing into a form which should be invoked with event
 #### IStateMachine
 
 Is the basic StateMachine interface, it has two methods `SaveFormStates(SaveStatesEventArgs e)`
-and `StateContainerLoadFormStates()`, nothing fancy, just simple calls. Implement both methods with your own
+and `LoadFormStates()`, nothing fancy, just simple calls. Implement both methods with your own
 serialization process.
 
 ```csharp

TelegramBotBase/Base/DataResult.cs

@@ -55,7 +55,7 @@ public class DataResult : ResultBase
     {
         var encryptedContent = new MemoryStream();
         encryptedContent.SetLength(Document.FileSize.Value);
-        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Document.FileId,
+        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(Document.FileId,
                        encryptedContent);
 
         return InputFile.FromStream(encryptedContent, Document.FileName);
@@ -69,9 +69,9 @@ public class DataResult : ResultBase
     /// <returns></returns>
     public async Task DownloadDocument(string path)
     {
-        var file = await Device.Client.TelegramClient.GetFileAsync(Document.FileId);
+        var file = await Device.Client.TelegramClient.GetFile(Document.FileId);
         var fs = new FileStream(path, FileMode.Create);
-        await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
+        await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
         fs.Close();
         fs.Dispose();
     }
@@ -83,7 +83,7 @@ public class DataResult : ResultBase
     public async Task<byte[]> DownloadRawDocument()
     {
         var ms = new MemoryStream();
-        await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Document.FileId, ms);
+        await Device.Client.TelegramClient.GetInfoAndDownloadFile(Document.FileId, ms);
         return ms.ToArray();
     }
 
@@ -103,7 +103,7 @@ public class DataResult : ResultBase
     public async Task<string> DownloadRawTextDocument(Encoding encoding)
     {
         var ms = new MemoryStream();
-        await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Document.FileId, ms);
+        await Device.Client.TelegramClient.GetInfoAndDownloadFile(Document.FileId, ms);
 
         ms.Position = 0;
 
@@ -116,16 +116,16 @@ public class DataResult : ResultBase
     {
         var encryptedContent = new MemoryStream();
         encryptedContent.SetLength(Video.FileSize.Value);
-        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Video.FileId, encryptedContent);
+        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(Video.FileId, encryptedContent);
 
         return InputFile.FromStream(encryptedContent, "");
     }
 
     public async Task DownloadVideo(string path)
     {
-        var file = await Device.Client.TelegramClient.GetFileAsync(Video.FileId);
+        var file = await Device.Client.TelegramClient.GetFile(Video.FileId);
         var fs = new FileStream(path, FileMode.Create);
-        await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
+        await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
         fs.Close();
         fs.Dispose();
     }
@@ -134,16 +134,16 @@ public class DataResult : ResultBase
     {
         var encryptedContent = new MemoryStream();
         encryptedContent.SetLength(Audio.FileSize.Value);
-        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Audio.FileId, encryptedContent);
+        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(Audio.FileId, encryptedContent);
 
         return InputFile.FromStream(encryptedContent, "");
     }
 
     public async Task DownloadAudio(string path)
     {
-        var file = await Device.Client.TelegramClient.GetFileAsync(Audio.FileId);
+        var file = await Device.Client.TelegramClient.GetFile(Audio.FileId);
         var fs = new FileStream(path, FileMode.Create);
-        await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
+        await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
         fs.Close();
         fs.Dispose();
     }
@@ -153,7 +153,7 @@ public class DataResult : ResultBase
         var photo = Photos[index];
         var encryptedContent = new MemoryStream();
         encryptedContent.SetLength(photo.FileSize.Value);
-        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(photo.FileId, encryptedContent);
+        var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(photo.FileId, encryptedContent);
 
         return InputFile.FromStream(encryptedContent, "");
     }
@@ -161,9 +161,9 @@ public class DataResult : ResultBase
     public async Task DownloadPhoto(int index, string path)
     {
         var photo = Photos[index];
-        var file = await Device.Client.TelegramClient.GetFileAsync(photo.FileId);
+        var file = await Device.Client.TelegramClient.GetFile(photo.FileId);
         var fs = new FileStream(path, FileMode.Create);
-        await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
+        await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
         fs.Close();
         fs.Dispose();
     }

TelegramBotBase/Base/FormBase.cs

@@ -446,8 +446,8 @@ public class FormBase : IDisposable
         {
             c.Cleanup().Wait();
 
-            Controls.Remove(c);
         }
+        Controls.Clear();
     }
 
     /// <summary>

TelegramBotBase/Base/MessageClient.cs

@@ -103,7 +103,7 @@ public class MessageClient
 
         var receiverOptions = new ReceiverOptions();
 
-        receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
+        receiverOptions.DropPendingUpdates = ThrowPendingUpdates;
 
         TelegramClient.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, _cancellationTokenSource.Token);
     }

TelegramBotBase/Base/MessageResult.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
+using System.Text.Json;
 using Telegram.Bot.Types;
 using Telegram.Bot.Types.Enums;
 
@@ -126,7 +126,7 @@ public class MessageResult : ResultBase
         T cd = null;
         try
         {
-            cd = JsonConvert.DeserializeObject<T>(RawData);
+            cd = JsonSerializer.Deserialize<T>(RawData);
 
             return cd;
         }

TelegramBotBase/Base/ThreadPoolMessageClient.cs

@@ -72,7 +72,7 @@ public class ThreadPoolMessageClient : MessageClient
 
         var receiverOptions = new ReceiverOptions();
 
-        receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
+        receiverOptions.DropPendingUpdates = ThrowPendingUpdates;
 
         ThreadPool.SetMaxThreads(ThreadPool_WorkerThreads, ThreadPool_IOThreads);
         

TelegramBotBase/Controls/Inline/Label.cs

@@ -14,7 +14,7 @@ namespace TelegramBotBase.Controls.Inline;
 [DebuggerDisplay("{Text}")]
 public class Label : ControlBase
 {
-    private bool _renderNecessary = true;
+    protected bool _renderNecessary = true;
 
     private string _text = Default.Language["Label_Text"];
 

TelegramBotBase/Factories/ServiceProviderStartFormFactory.cs

@@ -23,13 +23,15 @@ public class ServiceProviderStartFormFactory : IStartFormFactory
         _serviceProvider = serviceProvider;
     }
 
-    public FormBase CreateForm()
+    public FormBase CreateForm() => CreateForm(null);
+
+    public FormBase CreateForm(Type? specifiedStartFrom = null)
     {
         FormBase fb = null;
 
         try
         {
-            fb = (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
+            fb = (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, specifiedStartFrom ?? _startFormClass);
         }
         catch(InvalidOperationException ex)
         {

TelegramBotBase/Form/AutoCleanForm.cs

@@ -24,7 +24,7 @@ public class AutoCleanForm : FormBase
         DeleteMode = EDeleteMode.OnEveryCall;
         DeleteSide = EDeleteSide.BotOnly;
 
-        Init += AutoCleanForm_Init;
+        Opened += AutoCleanForm_Init;
 
         Closed += AutoCleanForm_Closed;
     }
@@ -35,7 +35,7 @@ public class AutoCleanForm : FormBase
 
     [SaveState] public EDeleteSide DeleteSide { get; set; }
 
-    private Task AutoCleanForm_Init(object sender, InitEventArgs e)
+    private Task AutoCleanForm_Init(object sender, EventArgs e)
     {
         if (Device == null)
         {
@@ -70,7 +70,8 @@ public class AutoCleanForm : FormBase
 
     private Task Device_MessageSent(object sender, MessageSentEventArgs e)
     {
-        if (DeleteSide == EDeleteSide.UserOnly)
+        if (DeleteSide == EDeleteSide.UserOnly
+         || Device.ActiveForm != this)
         {
             return Task.CompletedTask;
         }
@@ -137,6 +138,12 @@ public class AutoCleanForm : FormBase
             return Task.CompletedTask;
         }
 
+        Device.MessageSent -= Device_MessageSent;
+
+        Device.MessageReceived -= Device_MessageReceived;
+
+        Device.MessageDeleted -= Device_MessageDeleted;
+
         MessageCleanup().Wait();
         return Task.CompletedTask;
     }

TelegramBotBase/Form/CallbackData.cs

@@ -1,5 +1,6 @@
-using Newtonsoft.Json;
+using System.Text;
-using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using TelegramBotBase.Exceptions;
 
 namespace TelegramBotBase.Form;
@@ -19,9 +20,9 @@ public class CallbackData
         Value = value;
     }
 
-    [JsonProperty("m")] public string Method { get; set; }
+    [JsonPropertyName("m")] public string Method { get; set; }
 
-    [JsonProperty("v")] public string Value { get; set; }
+    [JsonPropertyName("v")] public string Value { get; set; }
 
     public static string Create(string method, string value)
     {
@@ -36,7 +37,7 @@ public class CallbackData
     {
         var s = string.Empty;
 
-        s = JsonConvert.SerializeObject(this);
+        s = JsonSerializer.Serialize(this);
 
         //Is data over 64 bytes ?
         int byte_count = Encoding.UTF8.GetByteCount(s);
@@ -55,7 +56,7 @@ public class CallbackData
     /// <returns></returns>
     public static CallbackData Deserialize(string data)
     {
-        return JsonConvert.DeserializeObject<CallbackData>(data);
+        return JsonSerializer.Deserialize<CallbackData>(data);
     }
 
     public static implicit operator string(CallbackData callbackData) => callbackData.Serialize(true);

TelegramBotBase/Form/GroupForm.cs

@@ -11,28 +11,28 @@ public class GroupForm : FormBase
     {
         switch (message.MessageType)
         {
-            case MessageType.ChatMembersAdded:
+            case MessageType.NewChatMembers:
 
-                await OnMemberChanges(new MemberChangeEventArgs(MessageType.ChatMembersAdded, message,
+                await OnMemberChanges(new MemberChangeEventArgs(MessageType.NewChatMembers, message,
                                                                 message.Message.NewChatMembers));
 
                 break;
-            case MessageType.ChatMemberLeft:
+            case MessageType.LeftChatMember:
 
-                await OnMemberChanges(new MemberChangeEventArgs(MessageType.ChatMemberLeft, message,
+                await OnMemberChanges(new MemberChangeEventArgs(MessageType.LeftChatMember, message,
                                                                 message.Message.LeftChatMember));
 
                 break;
 
-            case MessageType.ChatPhotoChanged:
+            case MessageType.NewChatPhoto:
-            case MessageType.ChatPhotoDeleted:
+            case MessageType.DeleteChatPhoto:
-            case MessageType.ChatTitleChanged:
+            case MessageType.NewChatTitle:
-            case MessageType.MigratedFromGroup:
+            case MessageType.MigrateFromChatId:
-            case MessageType.MigratedToSupergroup:
+            case MessageType.MigrateToChatId:
-            case MessageType.MessagePinned:
+            case MessageType.PinnedMessage:
-            case MessageType.GroupCreated:
+            case MessageType.GroupChatCreated:
-            case MessageType.SupergroupCreated:
+            case MessageType.SupergroupChatCreated:
-            case MessageType.ChannelCreated:
+            case MessageType.ChannelChatCreated:
 
                 await OnGroupChanged(new GroupChangedEventArgs(message.MessageType, message));
 

TelegramBotBase/Form/PromptDialog.cs

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

TelegramBotBase/MessageLoops/FormBaseMessageLoop.cs

@@ -46,6 +46,8 @@ public class FormBaseMessageLoop : IMessageLoopFactory
         mr.Device = session;
         ur.Device = session;
 
+        session.OnMessageReceived(new(mr.Message));
+
         var activeForm = session.ActiveForm;
 
         //Pre Loading Event

TelegramBotBase/SessionManager.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using TelegramBotBase.Args;
 using TelegramBotBase.Attributes;
 using TelegramBotBase.Base;
+using TelegramBotBase.Factories;
 using TelegramBotBase.Form;
 using TelegramBotBase.Interfaces;
 using TelegramBotBase.Sessions;
@@ -145,9 +146,17 @@ public class SessionManager
             {
                 continue;
             }
-
+            FormBase form;
+            if (BotBase.StartFormFactory is ServiceProviderStartFormFactory diFactory)
+            {
+                form = diFactory.CreateForm(t);
+            }
             //No default constructor, fallback
-            if (!(t.GetConstructor(new Type[] { })?.Invoke(new object[] { }) is FormBase form))
+            else if (t.GetConstructor(new Type[] { })?.Invoke(new object[] { }) is FormBase f)
+            {
+                form = f;
+            }
+            else
             {
                 if (!statemachine.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
                 {
@@ -293,17 +302,19 @@ public class SessionManager
 
                     se.Values = ssea.Values;
                 }
-
+                else
-                //Search for public properties with SaveState attribute
-                var fields = form.GetType()
-                                 .GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-                                 .Where(a => a.GetCustomAttributes(typeof(SaveState), true).Length != 0).ToList();
-
-                foreach (var f in fields)
                 {
-                    var val = f.GetValue(form);
+                  //Search for public properties with SaveState attribute
+                  var fields = form.GetType()
+                                   .GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                                   .Where(a => a.GetCustomAttributes(typeof(SaveState), true).Length != 0).ToList();
 
-                    se.Values.Add("$" + f.Name, val);
+                  foreach (var f in fields)
+                  {
+                      var val = f.GetValue(form);
+
+                      se.Values.Add("$" + f.Name, val);
+                  }
                 }
 
                 states.Add(se);

TelegramBotBase/Sessions/DeviceSession.cs

@@ -239,8 +239,7 @@ public class DeviceSession : IDeviceSession
             text = text.MarkdownV2Escape();
         }
 
-
+        var t = Api(a => a.SendMessage(deviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
-        var t = Api(a => a.SendTextMessageAsync(deviceId, text, null, parseMode, replyToMessageId: replyTo,
                                                 replyMarkup: markup, disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -294,7 +293,7 @@ public class DeviceSession : IDeviceSession
         }
 
 
-        var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
+        var t = Api(a => a.SendMessage(DeviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
                                                 replyMarkup: markup, disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -312,7 +311,7 @@ public class DeviceSession : IDeviceSession
     /// <param name="replyTo"></param>
     /// <param name="disableNotification"></param>
     /// <returns></returns>
-    public async Task<Message> Send(string text, ReplyMarkupBase markup, int replyTo = 0,
+    public async Task<Message> Send(string text, IReplyMarkup markup, int replyTo = 0,
                                     bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown,
                                     bool markdownV2AutoEscape = true)
     {
@@ -332,7 +331,7 @@ public class DeviceSession : IDeviceSession
         }
 
 
-        var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
+        var t = Api(a => a.SendMessage(DeviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
                                                 replyMarkup: markup, disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -362,7 +361,7 @@ public class DeviceSession : IDeviceSession
         InlineKeyboardMarkup markup = buttons;
 
 
-        var t = Api(a => a.SendPhotoAsync(DeviceId, file, null, caption, parseMode, replyToMessageId: replyTo,
+        var t = Api(a => a.SendPhoto(DeviceId, file, messageThreadId: null, caption: caption, parseMode: parseMode, replyParameters: replyTo,
                                           replyMarkup: markup, disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -392,8 +391,8 @@ public class DeviceSession : IDeviceSession
         InlineKeyboardMarkup markup = buttons;
 
 
-        var t = Api(a => a.SendVideoAsync(DeviceId, file, caption: caption, parseMode: parseMode,
+        var t = Api(a => a.SendVideo(DeviceId, file, caption: caption, parseMode: parseMode,
-                                          replyToMessageId: replyTo, replyMarkup: markup,
+                                          replyParameters: replyTo, replyMarkup: markup,
                                           disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -422,8 +421,8 @@ public class DeviceSession : IDeviceSession
         InlineKeyboardMarkup markup = buttons;
 
 
-        var t = Api(a => a.SendVideoAsync(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
+        var t = Api(a => a.SendVideo(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
-                                          replyToMessageId: replyTo, replyMarkup: markup,
+                                          replyParameters: replyTo, replyMarkup: markup,
                                           disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -457,7 +456,7 @@ public class DeviceSession : IDeviceSession
 
         var fts = InputFile.FromStream(ms, filename);
 
-        var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
+        var t = Api(a => a.SendVideo(DeviceId, fts, parseMode: parseMode, replyParameters: replyTo,
                                           replyMarkup: markup, disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -494,7 +493,7 @@ public class DeviceSession : IDeviceSession
 
         var fts = InputFile.FromStream(fs, filename);
 
-        var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
+        var t = Api(a => a.SendVideo(DeviceId, fts, parseMode: parseMode, replyParameters: replyTo,
                                           replyMarkup: markup, disableNotification: disableNotification));
 
         var o = GetOrigin(new StackTrace());
@@ -573,8 +572,8 @@ public class DeviceSession : IDeviceSession
         }
 
 
-        var t = Api(a => a.SendDocumentAsync(DeviceId, document, null, null, caption, replyMarkup: markup,
+        var t = Api(a => a.SendDocument(DeviceId, document, messageThreadId: null, thumbnail: null, caption: caption, replyMarkup: markup,
-                                             disableNotification: disableNotification, replyToMessageId: replyTo));
+                                             disableNotification: disableNotification, replyParameters: replyTo));
 
         var o = GetOrigin(new StackTrace());
         await OnMessageSent(new MessageSentEventArgs(await t, o));
@@ -772,11 +771,11 @@ public class DeviceSession : IDeviceSession
 
     #region "Users"
 
-    public virtual async Task RestrictUser(long userId, ChatPermissions permissions, bool? useIndependentGroupPermission = null, DateTime until = default)
+    public virtual async Task RestrictUser(long userId, ChatPermissions permissions, bool useIndependentGroupPermission = false, DateTime until = default)
     {
         try
         {
-            await Api(a => a.RestrictChatMemberAsync(DeviceId, userId, permissions, useIndependentGroupPermission, until));
+            await Api(a => a.RestrictChatMember(DeviceId, userId, permissions, useIndependentChatPermissions: useIndependentGroupPermission, untilDate: until));
         }
         catch
         {

TelegramBotBase/States/JSONStateMachine.cs

@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using Newtonsoft.Json;
+using System.Text.Json;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
@@ -48,11 +48,7 @@ public class JsonStateMachine : IStateMachine
         {
             var content = File.ReadAllText(FilePath);
 
-            var sc = JsonConvert.DeserializeObject<StateContainer>(content, new JsonSerializerSettings
+            var sc = JsonSerializer.Deserialize<StateContainer>(content);
-            {
-                TypeNameHandling = TypeNameHandling.All,
-                TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
-            });
 
             return sc;
         }
@@ -77,10 +73,9 @@ public class JsonStateMachine : IStateMachine
 
         try
         {
-            var content = JsonConvert.SerializeObject(e.States, Formatting.Indented, new JsonSerializerSettings
+            var content = JsonSerializer.Serialize(e.States, new JsonSerializerOptions
             {
-                TypeNameHandling = TypeNameHandling.All,
+              WriteIndented = true,
-                TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
             });
 
             File.WriteAllText(FilePath, content);

TelegramBotBase/States/SimpleJSONStateMachine.cs

@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using Newtonsoft.Json;
+using System.Text.Json;
 using TelegramBotBase.Args;
 using TelegramBotBase.Base;
 using TelegramBotBase.Form;
@@ -49,7 +49,7 @@ public class SimpleJsonStateMachine : IStateMachine
         {
             var content = File.ReadAllText(FilePath);
 
-            var sc = JsonConvert.DeserializeObject<StateContainer>(content);
+            var sc = JsonSerializer.Deserialize<StateContainer>(content);
 
             return sc;
         }
@@ -74,7 +74,9 @@ public class SimpleJsonStateMachine : IStateMachine
 
         try
         {
-            var content = JsonConvert.SerializeObject(e.States, Formatting.Indented);
+            var content = JsonSerializer.Serialize(e.States, new JsonSerializerOptions() {
+              WriteIndented = true
+            });
 
             File.WriteAllText(FilePath, content);
         }

TelegramBotBase/TelegramBotBase.csproj

@@ -22,7 +22,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 
@@ -57,7 +57,7 @@
 
 
     <ItemGroup>
-        <PackageReference Include="Telegram.Bot" Version="19.0.0" />
+        <PackageReference Include="Telegram.Bot" Version="22.2.0" />
     </ItemGroup>
 
 </Project>

TelegramBotBase/TelegramBotBase.nuspec

@@ -14,12 +14,12 @@
     <dependencies>
       <group targetFramework=".NETFramework4.6.1">
         <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
+        <dependency id="Telegram.Bot" version="22.2.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
+        <dependency id="Telegram.Bot" version="22.2.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
-</package>
+</package>

TelegramBotFramework.sln

@@ -38,6 +38,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Images.IronSoftware", "TelegramBotBase.Extensions.Images.IronSoftware\TelegramBotBase.Extensions.Images.IronSoftware.csproj", "{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Элементы решения", "Элементы решения", "{040F54FA-B51F-475F-89F8-2DD23CDC2989}"
+	ProjectSection(SolutionItems) = preProject
+		.gitea\workflows\TelegramBotFramework.nuget.yaml = .gitea\workflows\TelegramBotFramework.nuget.yaml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU