Refactor methods and update package versions

bvdcode · bvdcode · commit 1d1d453d9d86 · 2024-11-15T17:24:13.000-08:00
Replaced `SendTextMessageAsync` with `SendMessage` across multiple files. Changed `ParseMode` in `InlineResult.cs` to non-nullable with default `ParseMode.None`. Updated `Microsoft.EntityFrameworkCore.Sqlite` and `Microsoft.EntityFrameworkCore.Tools` to `9.0.0` in `TelegramBot.ConsoleTest.csproj`. Updated `Telegram.Bot` to `22.0.2` and other packages to `9.0.0` in `TelegramBot.csproj`. Added using directives in `BotApp.cs`. Replaced `GetMeAsync` with `GetMe` in `BotApp.cs`. Adjusted order of operations and refactored `HostApplicationLifetime` logic in `BotApp.cs`. Removed unused using directives.
diff --git a/Sources/TelegramBot.ConsoleTest/Controllers/CafeController.cs b/Sources/TelegramBot.ConsoleTest/Controllers/CafeController.cs
@@ -48,7 +48,7 @@ public async Task<IActionResult> HandleBurgersAsync(int burgers, bool drink)
             $"Total: ${totalPrice}.00\n" +
                 "Send /burgersdone when you are ready to pick up";
 
-            await telegramBotClient.SendTextMessageAsync(adminId, orderText);
+            await telegramBotClient.SendMessage(adminId, orderText);
             SetValue("customerId", User.Id);
             Delete();
             return Text(text);
@@ -67,7 +67,7 @@ public async Task<IActionResult> HandleBurgersDoneAsync()
             {
                 return Text("You have no active orders");
             }
-            await telegramBotClient.SendTextMessageAsync(customerId, text);
+            await telegramBotClient.SendMessage(customerId, text);
             return Text(text);
         }
 
diff --git a/Sources/TelegramBot.ConsoleTest/TelegramBot.ConsoleTest.csproj b/Sources/TelegramBot.ConsoleTest/TelegramBot.ConsoleTest.csproj
@@ -11,8 +11,8 @@
 		<Content Include="appsettings.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/Sources/TelegramBot/ActionResults/FileResult.cs b/Sources/TelegramBot/ActionResults/FileResult.cs
@@ -60,7 +60,7 @@ public void Dispose()
         public Task ExecuteResultAsync(ActionContext context)
         {
             InputFile file = InputFile.FromStream(_fileStream, _fileName);
-            return context.Bot.SendDocumentAsync(context.ChatId, document: file);
+            return context.Bot.SendDocument(context.ChatId, document: file);
         }
     }
 }
diff --git a/Sources/TelegramBot/ActionResults/InlineResult.cs b/Sources/TelegramBot/ActionResults/InlineResult.cs
@@ -46,12 +46,12 @@ public InlineResult(string text, InlineKeyboardMarkup keyboard, bool useMarkdown
         /// <returns>The task representing the result of the action.</returns>
         public async Task ExecuteResultAsync(ActionContext context)
         {
-            ParseMode? parseMode = null;
+            ParseMode parseMode = ParseMode.None;
             if (UseMarkdown)
             {
                 parseMode = ParseMode.MarkdownV2;
             }
-            await context.Bot.SendTextMessageAsync(context.ChatId, Text, replyMarkup: Keyboard, parseMode: parseMode);
+            await context.Bot.SendMessage(context.ChatId, Text, replyMarkup: Keyboard, parseMode: parseMode);
         }
     }
 }
diff --git a/Sources/TelegramBot/ActionResults/MarkdownResult.cs b/Sources/TelegramBot/ActionResults/MarkdownResult.cs
@@ -31,7 +31,7 @@ public MarkdownResult(string text)
         /// <returns>The task representing the result of the action.</returns>
         public async Task ExecuteResultAsync(ActionContext context)
         {
-            await context.Bot.SendTextMessageAsync(context.ChatId, Text, parseMode: ParseMode.MarkdownV2);
+            await context.Bot.SendMessage(context.ChatId, Text, parseMode: ParseMode.MarkdownV2);
         }
     }
 }
diff --git a/Sources/TelegramBot/ActionResults/TextResult.cs b/Sources/TelegramBot/ActionResults/TextResult.cs
@@ -30,7 +30,7 @@ public TextResult(string text)
         /// <returns>The task representing the result of the action.</returns>
         public async Task ExecuteResultAsync(ActionContext context)
         {
-            await context.Bot.SendTextMessageAsync(context.ChatId, Text);
+            await context.Bot.SendMessage(context.ChatId, Text);
         }
     }
 }
diff --git a/Sources/TelegramBot/BotApp.cs b/Sources/TelegramBot/BotApp.cs
@@ -5,18 +5,17 @@
 using System.Reflection;
 using Telegram.Bot.Types;
 using TelegramBot.Handlers;
+using TelegramBot.Services;
+using TelegramBot.Builders;
+using TelegramBot.Attributes;
 using System.Threading.Tasks;
 using TelegramBot.Extensions;
 using TelegramBot.Controllers;
 using TelegramBot.Abstractions;
 using System.Collections.Generic;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Newtonsoft.Json.Linq;
-using TelegramBot.Attributes;
-using TelegramBot.Services;
-using TelegramBot.Builders;
 
 namespace TelegramBot
 {
@@ -104,7 +103,7 @@ public async Task StartAsync(CancellationToken cancellationToken = default)
             CheckDisposed();
             try
             {
-                var botUser = _client.GetMeAsync().Result;
+                var botUser = _client.GetMe().Result;
                 _client.StartReceiving(UpdateHandler, ErrorHandler, cancellationToken: mergedToken);
                 _logger.LogInformation("Bot '{botUser}' started - receiving updates.", botUser.Username);
             }
@@ -117,28 +116,31 @@ public async Task StartAsync(CancellationToken cancellationToken = default)
                 _logger.LogError(ex, "Error occurred while starting the bot. Probably the bot token is invalid or the network is not available.");
                 throw ex;
             }
+
+            var hostApplicationLifetime = _serviceProvider.GetService<IHostApplicationLifetime>() as HostApplicationLifetime
+                ?? throw new InvalidOperationException("Host application lifetime is not registered.");
+            hostApplicationLifetime.NotifyStarted();
+
             var hostedServices = _serviceProvider.GetServices<IHostedService>();
             foreach (var hostedService in hostedServices)
             {
                 await hostedService.StartAsync(mergedToken);
                 _logger.LogInformation("Started '{hostedService}'.", hostedService.GetType().Name);
             }
-            var hostApplicationLifetime = _serviceProvider.GetService<IHostApplicationLifetime>()
-                as HostApplicationLifetime ?? throw new InvalidOperationException("Host application lifetime is not registered.");
+
             var commandRegistrationBuilders = _serviceProvider.GetServices<CommandRegistrationBuilder>();
             if (commandRegistrationBuilders != null && commandRegistrationBuilders.Any())
             {
                 foreach (var builder in commandRegistrationBuilders)
                 {
                     var commands = builder.Build();
-                    await _client.SetMyCommandsAsync(commands,
+                    await _client.SetMyCommands(commands,
                             languageCode: builder.Language,
                             cancellationToken: mergedToken);
                     _logger.LogInformation("Registered {count} commands for language '{language}'.",
                         commands.Count(), builder.Language);
                 }
             }
-            hostApplicationLifetime.NotifyStarted();
         }
 
         private void OnProcessExit(object sender, EventArgs e)
diff --git a/Sources/TelegramBot/Controllers/BotControllerBase.cs b/Sources/TelegramBot/Controllers/BotControllerBase.cs
@@ -137,7 +137,7 @@ public void Delete()
             }
             try
             {
-                Client.DeleteMessageAsync(User.Id, messageId);
+                Client.DeleteMessage(User.Id, messageId);
             }
             catch (Exception) { }
         }
diff --git a/Sources/TelegramBot/TelegramBot.csproj b/Sources/TelegramBot/TelegramBot.csproj
@@ -28,19 +28,19 @@
 		<None Include="..\..\README.md" Pack="true" PackagePath="\" />
 		<None Include="icon.png" Pack="true" PackagePath="\" />
 		<None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
-		<PackageReference Include="Telegram.Bot" Version="19.0.0" />
-		<PackageReference Include="System.Text.Json" Version="8.0.4" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Telegram.Bot" Version="22.0.2" />
+		<PackageReference Include="System.Text.Json" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
 	</ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public async Task<IActionResult> HandleBurgersAsync(int burgers, bool drink)`
`48`	`48`	`$"Total: ${totalPrice}.00\n" +`
`49`	`49`	`"Send /burgersdone when you are ready to pick up";`
`50`	`50`
`51`		`- await telegramBotClient.SendTextMessageAsync(adminId, orderText);`
	`51`	`+ await telegramBotClient.SendMessage(adminId, orderText);`
`52`	`52`	`SetValue("customerId", User.Id);`
`53`	`53`	`Delete();`
`54`	`54`	`return Text(text);`
`@@ -67,7 +67,7 @@ public async Task<IActionResult> HandleBurgersDoneAsync()`
`67`	`67`	`{`
`68`	`68`	`return Text("You have no active orders");`
`69`	`69`	`}`
`70`		`- await telegramBotClient.SendTextMessageAsync(customerId, text);`
	`70`	`+ await telegramBotClient.SendMessage(customerId, text);`
`71`	`71`	`return Text(text);`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void Dispose()`
`60`	`60`	`public Task ExecuteResultAsync(ActionContext context)`
`61`	`61`	`{`
`62`	`62`	`InputFile file = InputFile.FromStream(_fileStream, _fileName);`
`63`		`- return context.Bot.SendDocumentAsync(context.ChatId, document: file);`
	`63`	`+ return context.Bot.SendDocument(context.ChatId, document: file);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ public InlineResult(string text, InlineKeyboardMarkup keyboard, bool useMarkdown`
`46`	`46`	`/// <returns>The task representing the result of the action.</returns>`
`47`	`47`	`public async Task ExecuteResultAsync(ActionContext context)`
`48`	`48`	`{`
`49`		`- ParseMode? parseMode = null;`
	`49`	`+ ParseMode parseMode = ParseMode.None;`
`50`	`50`	`if (UseMarkdown)`
`51`	`51`	`{`
`52`	`52`	`parseMode = ParseMode.MarkdownV2;`
`53`	`53`	`}`
`54`		`- await context.Bot.SendTextMessageAsync(context.ChatId, Text, replyMarkup: Keyboard, parseMode: parseMode);`
	`54`	`+ await context.Bot.SendMessage(context.ChatId, Text, replyMarkup: Keyboard, parseMode: parseMode);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public MarkdownResult(string text)`
`31`	`31`	`/// <returns>The task representing the result of the action.</returns>`
`32`	`32`	`public async Task ExecuteResultAsync(ActionContext context)`
`33`	`33`	`{`
`34`		`- await context.Bot.SendTextMessageAsync(context.ChatId, Text, parseMode: ParseMode.MarkdownV2);`
	`34`	`+ await context.Bot.SendMessage(context.ChatId, Text, parseMode: ParseMode.MarkdownV2);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public TextResult(string text)`
`30`	`30`	`/// <returns>The task representing the result of the action.</returns>`
`31`	`31`	`public async Task ExecuteResultAsync(ActionContext context)`
`32`	`32`	`{`
`33`		`- await context.Bot.SendTextMessageAsync(context.ChatId, Text);`
	`33`	`+ await context.Bot.SendMessage(context.ChatId, Text);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public void Delete()`
`137`	`137`	`}`
`138`	`138`	`try`
`139`	`139`	`{`
`140`		`- Client.DeleteMessageAsync(User.Id, messageId);`
	`140`	`+ Client.DeleteMessage(User.Id, messageId);`
`141`	`141`	`}`
`142`	`142`	`catch (Exception) { }`
`143`	`143`	`}`