Правка Вебхука а-чата (#942)

Небольшие правки форма текста no cl, no fun
AdventureTimeSS14 · Jan 4, 2025 · 44c7d28 · 44c7d28
1 parent bd7679b
commit 44c7d28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
@@ -111,7 +111,7 @@ public async void DeAdmin(ICommonSession session) // ADT-tweak: add "async"
                     return;
                 var payload = new WebhookPayload
                 {
-                    Content = $"**Снял права**: **{session.Name}**"
+                    Content = $"**Снял права**: `{session.Name}`"
                 };
                 var identifier = webhookData.ToIdentifier();
                 await _discord.CreateMessage(identifier, payload);
@@ -198,7 +198,7 @@ public async void ReAdmin(ICommonSession session) // ADT-tweak: add "async"
                     return;
                 var payload = new WebhookPayload
                 {
-                    Content = $"**Вернул права**: **{session.Name}**"
+                    Content = $"**Вернул права**: `{session.Name}`"
                 };
                 var identifier = webhookData.ToIdentifier();
                 await _discord.CreateMessage(identifier, payload);
@@ -407,7 +407,7 @@ private async void DisconnectedAdminMaybe(ICommonSession session)
                     return;
                 var payload = new WebhookPayload
                 {
-                    Content = $"**Оповещение: Админ ВЫШЕЛ {senderName}**"
+                    Content = $"**Оповещение: Админ ВЫШЕЛ** `{senderName}`"
                 };
                 var identifier = webhookData.ToIdentifier();
                 await _discord.CreateMessage(identifier, payload);
@@ -459,14 +459,11 @@ private async void LoginAdminMaybe(ICommonSession session)
                             var senderAdmin = GetAdminData(session);
                             if (senderAdmin == null)
                                 return;
-                            var senderName = session.Name;
-                            if (!string.IsNullOrEmpty(senderAdmin.Title))
-                                senderName += $"\\[{senderAdmin.Title}\\]";
                             if (await _discord.GetWebhook(webhookUrl) is not { } webhookData)
                                 return;
                             var payload = new WebhookPayload
                             {
-                                Content = $"**Оповещение: Админ зашёл {senderName}**"
+                                Content = $"**Оповещение: Админ ЗАШЁЛ** `{session.Name}`[{senderAdmin.Title}]"
                             };
                             var identifier = webhookData.ToIdentifier();
                             await _discord.CreateMessage(identifier, payload);

diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
@@ -331,7 +331,7 @@ private async void SendAdminChat(ICommonSession player, string message)
                 return;
             var payload = new WebhookPayload
             {
-                Content = $"***AdminChat***: **{senderName}**: {message}"
+                Content = $"***AdminChat***: `{player.Name}`[{senderAdmin.Title}]: {message}"
             };
             var identifier = webhookData.ToIdentifier();
             await _discord.CreateMessage(identifier, payload);