diff --git a/Jetsparrow.Aasb.Tests/DetectTests.cs b/Jetsparrow.Aasb.Tests/DetectTests.cs index 823e8f8..ee42a7b 100644 --- a/Jetsparrow.Aasb.Tests/DetectTests.cs +++ b/Jetsparrow.Aasb.Tests/DetectTests.cs @@ -18,7 +18,7 @@ public class DetectTests : BleepTestsBase [InlineData("еб*ть—колотить", "*ебать")] [InlineData("Получилась полная х**ня: даже не знаю, что и сказать, б**.", "*херня\n**бля")] [InlineData("Сергей опять вы**нулся своим знанием тонкостей русского языка; в окно еб*шил стылый ноябрьский ветер. ", "*выебнулся\n**ебашил")] - public async void DetectWordsWithPunctuation(string text, string expected) + public async Task DetectWordsWithPunctuation(string text, string expected) { var unbleep = (await ubl.UnbleepSwears(text)).Replace("\r\n", "\n").Trim(); Assert.Equal(expected, unbleep); diff --git a/Jetsparrow.Aasb.Tests/Jetsparrow.Aasb.Tests.csproj b/Jetsparrow.Aasb.Tests/Jetsparrow.Aasb.Tests.csproj index 9ecd36d..2be20e9 100644 --- a/Jetsparrow.Aasb.Tests/Jetsparrow.Aasb.Tests.csproj +++ b/Jetsparrow.Aasb.Tests/Jetsparrow.Aasb.Tests.csproj @@ -1,15 +1,18 @@ - net6.0 + net10.0 false - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/Jetsparrow.Aasb/Jetsparrow.Aasb.csproj b/Jetsparrow.Aasb/Jetsparrow.Aasb.csproj index fe3b27e..1dff64b 100644 --- a/Jetsparrow.Aasb/Jetsparrow.Aasb.csproj +++ b/Jetsparrow.Aasb/Jetsparrow.Aasb.csproj @@ -1,7 +1,7 @@  - net6.0 + net10.0 en False @@ -11,25 +11,16 @@ - + Always - - Always - - - Always - - - Always - Always diff --git a/Jetsparrow.Aasb/Services/Aasb.cs b/Jetsparrow.Aasb/Services/Aasb.cs index b548def..8f413b7 100644 --- a/Jetsparrow.Aasb/Services/Aasb.cs +++ b/Jetsparrow.Aasb/Services/Aasb.cs @@ -54,7 +54,7 @@ public class AntiAntiSwearingBot : IHostedService TelegramBot = new TelegramBotClient(TelegramSettings.ApiKey, httpClient); Log.LogInformation("Connecting to Telegram..."); - Me = await TelegramBot.GetMeAsync(); + Me = await TelegramBot.GetMe(cancellationToken); Log.LogInformation("Connected to Telegram as @{Username}", Me.Username); Router = new ChatCommandRouter(Me.Username, AccessCfg); Router.Register(new LearnCommand(Dict), "learn"); @@ -74,7 +74,7 @@ public class AntiAntiSwearingBot : IHostedService public async Task StopAsync(CancellationToken cancellationToken) { - await TelegramBot.CloseAsync(); + await TelegramBot.Close(); } Task HandleErrorAsync(ITelegramBotClient botClient, Exception exception, CancellationToken cancellationToken) @@ -97,23 +97,26 @@ public class AntiAntiSwearingBot : IHostedService if (cmdResponse != null) { - await TelegramBot.SendTextMessageAsync( - msg.Chat.Id, + await TelegramBot.SendMessage( + msg.Chat, cmdResponse, - replyToMessageId: msg.MessageId, + replyParameters: new ReplyParameters { MessageId = msg.MessageId }, parseMode: ParseMode.MarkdownV2, - disableNotification: true); + disableNotification: true, + cancellationToken: cancellationToken); } } else { var unbleepResponse = await Unbleeper.UnbleepSwears(msg.Text); if (unbleepResponse != null) - await TelegramBot.SendTextMessageAsync( - msg.Chat.Id, + await TelegramBot.SendMessage( + msg.Chat, unbleepResponse, - replyToMessageId: msg.MessageId, - disableNotification: true); + replyParameters: new ReplyParameters { MessageId = msg.MessageId }, + disableNotification: true, + cancellationToken: cancellationToken); + } } catch (Exception e)