Adjusted emoji script for custom emoji

grommunio · Apr 26, 2024 · 0392f26 · 0392f26
1 parent 2224222
commit 0392f26
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/webapp/channels/build/emoji/make_emojis.mjs b/webapp/channels/build/emoji/make_emojis.mjs
@@ -13,17 +13,17 @@
 * npm run make-emojis -- --help
 */
 
-import path from 'node:path';
-import * as fsPromise from 'node:fs/promises';
 import * as fs from 'node:fs';
+import * as fsPromise from 'node:fs/promises';
+import path from 'node:path';
 import * as url from 'node:url';
 
-import yargs from 'yargs';
 import chalk from 'chalk';
-import jsonData from 'emoji-datasource/emoji.json';
-import jsonCategories from 'emoji-datasource/categories.json';
+import jsonCategories from 'emoji-datasource/categories.json' assert { type: 'json' };
+import jsonData from 'emoji-datasource/emoji.json' assert { type: 'json' };
+import yargs from 'yargs';
 
-import additionalShortnames from './additional_shortnames.json';
+import additionalShortnames from './additional_shortnames.json' assert { type: 'json' };
 
 const EMOJI_SIZE = 64;
 const EMOJI_SIZE_PADDED = EMOJI_SIZE + 2; // 1px per side
@@ -126,7 +126,7 @@ readMissingDirPromise.then(() => {
 
 // Copy mattermost emoji image
 const webappImagesDir = path.resolve(webappRootDir, 'channels', 'src', 'images');
-endResults.push(copyFileAndPrint(path.resolve(webappImagesDir, 'icon64x64.png'), path.resolve(webappImagesDir, 'emoji/mattermost.png'), 'mattermost-emoji'));
+endResults.push(copyFileAndPrint(path.resolve(webappImagesDir, 'icon64x64.png'), path.resolve(webappImagesDir, 'emoji/grommunio.png'), 'grommunio-emoji'));
 
 const sheetSource = path.resolve(webappRootDir, `node_modules/emoji-datasource-apple/img/apple/sheets/${EMOJI_SIZE}.png`);
 const sheetAbsoluteFile = path.resolve(webappRootDir, 'channels', 'src', 'images/emoji-sheets/apple-sheet.png');
@@ -213,12 +213,12 @@ fullEmoji.forEach((emoji) => {
 
 // add built-in custom emojis
 fullEmoji.push({
-    id: 'mattermost',
-    name: 'Mattermost',
+    id: 'grommunio',
+    name: 'grommunio',
     unified: '',
-    image: 'mattermost.png',
-    short_name: 'mattermost',
-    short_names: ['mattermost'],
+    image: 'grommunio.png',
+    short_name: 'grommunio',
+    short_names: ['grommunio'],
     category: 'custom',
 });
 

diff --git a/webapp/channels/src/images/emoji/mattermost.png b/webapp/channels/src/images/emoji/mattermost.png
diff --git a/webapp/channels/src/images/icon64x64.png b/webapp/channels/src/images/icon64x64.png
diff --git a/webapp/channels/src/packages/mattermost-redux/src/utils/emoji_utils.ts b/webapp/channels/src/packages/mattermost-redux/src/utils/emoji_utils.ts
@@ -15,8 +15,8 @@ export function isSystemEmoji(emoji: Emoji): emoji is SystemEmoji {
 
 export function getEmojiImageUrl(emoji: Emoji): string {
     // If its the mattermost custom emoji
-    if (!isSystemEmoji(emoji) && emoji.id === 'mattermost') {
-        return Client4.getSystemEmojiImageUrl('mattermost');
+    if (!isSystemEmoji(emoji) && emoji.id === 'grommunio') {
+        return Client4.getSystemEmojiImageUrl('grommunio');
     }
 
     if (isSystemEmoji(emoji)) {