From 9058b0fd63ed8f0063349b754ab63b194dcd2b52 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Tue, 17 Aug 2021 19:23:56 +0300
Subject: [PATCH] Fix emoji mentions in default log messages

---
 backend/src/data/DefaultLogMessages.json     | 6 +++---
 backend/src/utils/configAccessibleObjects.ts | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/data/DefaultLogMessages.json b/backend/src/data/DefaultLogMessages.json
index c666ff43..1adb760f 100644
--- a/backend/src/data/DefaultLogMessages.json
+++ b/backend/src/data/DefaultLogMessages.json
@@ -50,9 +50,9 @@
   "STAGE_INSTANCE_DELETE": "📣 Stage Instance `{stageInstance.topic}` was deleted in Stage Channel <#{stageChannel.id}>",
   "STAGE_INSTANCE_UPDATE": "📣 Stage Instance `{newStageInstance.topic}` was edited in Stage Channel <#{stageChannel.id}>. Changes:\n{differenceString}",
 
-  "EMOJI_CREATE": "<{emoji.identifier}> Emoji `{emoji.name} ({emoji.id})` was created",
-  "EMOJI_DELETE": "👋 Emoji `{emoji.name} ({emoji.id})` was deleted",
-  "EMOJI_UPDATE": "<{newEmoji.identifier}> Emoji `{newEmoji.name} ({newEmoji.id})` was updated. Changes:\n{differenceString}",
+  "EMOJI_CREATE": "{emoji.mention} Emoji **{emoji.name}** (`{emoji.id}`) was created",
+  "EMOJI_DELETE": "👋 Emoji **{emoji.name}** (`{emoji.id}`) was deleted",
+  "EMOJI_UPDATE": "{newEmoji.mention} Emoji **{newEmoji.name}** (`{newEmoji.id}`) was updated. Changes:\n{differenceString}",
 
   "STICKER_CREATE": "🖼️ Sticker `{sticker.name} ({sticker.id})` was created. Description: `{sticker.description}` Format: {emoji.format}",
   "STICKER_DELETE": "🖼️ Sticker `{sticker.name} ({sticker.id})` was deleted.",
diff --git a/backend/src/utils/configAccessibleObjects.ts b/backend/src/utils/configAccessibleObjects.ts
index 2e80c7f0..0a776629 100644
--- a/backend/src/utils/configAccessibleObjects.ts
+++ b/backend/src/utils/configAccessibleObjects.ts
@@ -140,6 +140,7 @@ export interface IConfigAccessibleEmoji {
   createdAt?: number;
   animated: boolean;
   identifier: string;
+  mention: string;
 }
 
 export function emojiToConfigAccessibleEmoji(emoji: Emoji): IConfigAccessibleEmoji {
@@ -149,6 +150,7 @@ export function emojiToConfigAccessibleEmoji(emoji: Emoji): IConfigAccessibleEmo
     createdAt: emoji.createdTimestamp ?? undefined,
     animated: emoji.animated ?? false,
     identifier: emoji.identifier,
+    mention: emoji.animated ? `<a:${emoji.name}:${emoji.id}>` : `<:${emoji.name}:${emoji.id}>`,
   };
 
   return toReturn;