diff --git a/.gitignore b/.gitignore index 587fcbc..522f82f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ obj/ /packages/ .idea +.vs .DS_Store appsettings.json diff --git a/Core/GeneralHandler.cs b/Core/GeneralHandler.cs index c4d7300..65388ca 100644 --- a/Core/GeneralHandler.cs +++ b/Core/GeneralHandler.cs @@ -28,9 +28,9 @@ namespace Kruzya.TelegramBot.Core } [HandleEverything] + [Priority(-10)] public async Task Listener() { - Console.WriteLine("handle"); foreach (var message in new Message[] {RawUpdate.Message, RawUpdate.EditedMessage, RawUpdate.ChannelPost, RawUpdate.EditedChannelPost}) { if (message == null) @@ -38,10 +38,8 @@ namespace Kruzya.TelegramBot.Core continue; } - return new Task(); + await VerifyChatPair(message); } - - throw new ArgumentException(); } public async Task VerifyChatPair(Message message) diff --git a/Kruzya.TelegramBot.sln b/Kruzya.TelegramBot.sln index 9681417..a5069e8 100644 --- a/Kruzya.TelegramBot.sln +++ b/Kruzya.TelegramBot.sln @@ -1,5 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{B41CB31A-641E-4079-87ED-5CE310B2D8C1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{C7821F15-DEDD-474F-A575-A296D4B58F10}" diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 6794e72..ed20f60 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -1,5 +1,5 @@ # Build a project -FROM mcr.microsoft.com/dotnet/sdk:3.1.416-bullseye-arm64v8 AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0.404-buster-slim-arm64v8 AS build WORKDIR /source # Copy project and perform restoring @@ -20,7 +20,7 @@ RUN dotnet publish -c release -o /app --no-restore Kruzya.TelegramBot.sln && \ rm -f /app/TelegramBot.*.{dll,pdb,json} # Now reuse image with only runtime -FROM mcr.microsoft.com/dotnet/aspnet:3.1.22-alpine3.14-arm64v8 +FROM mcr.microsoft.com/dotnet/aspnet:5.0.13-alpine3.14-arm64v8 WORKDIR /user COPY --from=build /app /app ENTRYPOINT ["dotnet", "/app/TelegramBot.dll"] diff --git a/modules/CombotAntiSpam/UserJoinHandler.cs b/modules/CombotAntiSpam/UserJoinHandler.cs index 60fced1..ff66722 100644 --- a/modules/CombotAntiSpam/UserJoinHandler.cs +++ b/modules/CombotAntiSpam/UserJoinHandler.cs @@ -53,7 +53,7 @@ namespace Kruzya.TelegramBot.CombotAntiSpam if (canKickMembers) { - await Bot.KickChatMemberAsync(Chat, member.Id); + await Bot.BanChatMemberAsync(Chat, member.Id); } } } diff --git a/modules/UrlLimitations/MessageHandler.cs b/modules/UrlLimitations/MessageHandler.cs index 0bc4726..b7c307d 100644 --- a/modules/UrlLimitations/MessageHandler.cs +++ b/modules/UrlLimitations/MessageHandler.cs @@ -49,7 +49,7 @@ namespace Kruzya.TelegramBot.UrlLimitations { var targetChat = new ChatId(Chat.Id); Task.WaitAll(new Task[] { - Bot.KickChatMemberAsync(new ChatId(Chat.Id), From.Id, DateTime.Now.AddDays(1)), + Bot.BanChatMemberAsync(new ChatId(Chat.Id), From.Id, DateTime.Now.AddDays(1)), Bot.DeleteMessageAsync(targetChat, message.MessageId), Bot.SendTextMessageAsync(targetChat, $"Member {From.ToHtml()} has been banned.\nReason:
Spam suspicion", ParseMode.Html)