From 7b4c5aa3d43a3e6565220d25d1b222485ed3d98d Mon Sep 17 00:00:00 2001
From: West14 <30056636+West14@users.noreply.github.com>
Date: Mon, 25 Apr 2022 20:13:43 +0300
Subject: [PATCH] [cm] change culture to ru, add no-perm warn on /ban command
---
Core/Program.cs | 2 +-
modules/ChatManagement/Handler/Ban.cs | 20 +++++++++++++++++---
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Core/Program.cs b/Core/Program.cs
index e8900aa..103d924 100644
--- a/Core/Program.cs
+++ b/Core/Program.cs
@@ -8,7 +8,7 @@ namespace Kruzya.TelegramBot.Core
{
public static void Main(string[] args)
{
- CultureInfo.CurrentCulture = new CultureInfo("en-US");
+ CultureInfo.CurrentCulture = new CultureInfo("ru-RU");
CreateHostBuilder(args).Build().Run();
}
diff --git a/modules/ChatManagement/Handler/Ban.cs b/modules/ChatManagement/Handler/Ban.cs
index 5defd72..7067b30 100644
--- a/modules/ChatManagement/Handler/Ban.cs
+++ b/modules/ChatManagement/Handler/Ban.cs
@@ -28,14 +28,28 @@ public class Ban : CommonHandler
var now = DateTime.Now;
var banEnd = now.AddDays(banLengthParam.DayCount);
- var banEndMsg = (banEnd - now).Days > 366 ? "навсегда" : $"до {banEnd.ToUniversalTime()}";
+ var banEndMsg = (banEnd - now).Days > 366 ? "навсегда" : $"до {banEnd:D}";
+
+ /*
+ TODO: cause this block of code is repeated in warn handler,
+ TODO: I think we should abstract it somehow
+ TODO: West, 25.04.2022, 20:10
+ */
+
+ try
+ {
+ await BanMember(RepliedUser!.Id, banEnd);
+ }
+ catch
+ {
+ await Bot.SendTextMessageAsync(Chat.Id, "Нет прав на блокировку пользователя.");
+ return;
+ }
await Bot.SendTextMessageAsync(
Chat.Id,
$"{From.ToHtml()} заблокировал {RepliedUser!.ToHtml()} {banEndMsg}",
disableNotification: true, parseMode: ParseMode.Html);
-
- await BanMember(RepliedUser!.Id, banEnd);
}
[Command("unban", CommandParseMode.Both)]