From 77d89f011be8ac3d879e68570379026c44a5e39b Mon Sep 17 00:00:00 2001 From: Sergey Gut Date: Tue, 28 May 2024 22:30:28 +0300 Subject: [PATCH] Revert "fix possible bans from Pavel Durov" This reverts commit 1460cb0a7595c4bb1bf0b17c62b18e5363cb4534. --- Core/Extensions/UserExtension.cs | 8 +------- modules/ChatManagement/Handler/Greet.cs | 10 +++++----- modules/Reputation/Handler/Reputation.cs | 3 --- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Core/Extensions/UserExtension.cs b/Core/Extensions/UserExtension.cs index ea0e28c..1e63d24 100644 --- a/Core/Extensions/UserExtension.cs +++ b/Core/Extensions/UserExtension.cs @@ -1,17 +1,12 @@ -using System; -using System.Text; +using System.Text; using Telegram.Bot.Types; namespace Kruzya.TelegramBot.Core.Extensions; public static class UserExtension { - [Obsolete("Insecure method, currently replaced to dummy text 'Chat Member'")] public static string ToHtml(this User user, bool byUsername = false) { - return "Пользователь"; - - /** var text = new StringBuilder(); text.Append($""); @@ -24,7 +19,6 @@ public static class UserExtension text.Append($"{user.FirstName} {user.LastName}".Trim().HtmlEncode()); } return text.Append("").ToString(); - */ } public static string ToLog(this User user) diff --git a/modules/ChatManagement/Handler/Greet.cs b/modules/ChatManagement/Handler/Greet.cs index c715976..fa1db42 100644 --- a/modules/ChatManagement/Handler/Greet.cs +++ b/modules/ChatManagement/Handler/Greet.cs @@ -27,26 +27,26 @@ public class Greet : BotEventHandler var message = RawUpdate.Message!; var members = message.NewChatMembers!; var reply = new HtmlString(); - // string membersHtml; + string membersHtml; if (members.Length > 1) { reply.Code("Приветствуем новых участников!"); - // membersHtml = string.Join(", ", members.Select(u => u.ToHtml())); + membersHtml = string.Join(", ", members.Select(u => u.ToHtml())); } else { reply.Code("Приветствуем нового участника!"); - // membersHtml = members.First().ToHtml(); + membersHtml = members.First().ToHtml(); } - // reply.Br().TextBr("{0}"); + reply.Br().TextBr("{0}"); if (await _rulesService.HasRulesAsync(Chat)) { reply.Text("Пожалуйста, ознакомьтесь с правилами. /rules"); } - await Bot.SendTextMessageAsync(Chat.Id, string.Format(reply.ToString()/*, membersHtml*/), + await Bot.SendTextMessageAsync(Chat.Id, string.Format(reply.ToString(), membersHtml), parseMode: ParseMode.Html, replyToMessageId: message.MessageId); } } \ No newline at end of file diff --git a/modules/Reputation/Handler/Reputation.cs b/modules/Reputation/Handler/Reputation.cs index 11878ab..bece4af 100644 --- a/modules/Reputation/Handler/Reputation.cs +++ b/modules/Reputation/Handler/Reputation.cs @@ -160,9 +160,6 @@ public class Reputation : CommonHandler [Command("top", CommandParseMode.Both)] public async Task HandleTop() { - await Reply("This feature is currently disabled."); - return; - var msg = new HtmlString(); msg.TextBr("Топ репутации чата: "); var i = 1;