zumito-framework 1.18.0 → 1.19.0

package/dist/services/EmojiFallback.d.ts

@@ -3,8 +3,12 @@ import { TranslationManager } from './managers/TranslationManager';
 export declare class EmojiFallback {
     client: Client;
     translator: TranslationManager;
+    private applicationEmojisPromise;
     constructor(client: Client, translator: TranslationManager);
-    getEmoji(emojiId: string, fallbackEmoji: any): any;
-    getEmojiByName(emojiName: string, fallbackEmoji: any): any;
-    getEmojiByIdentifier(emojiId: string, fallbackEmoji: any): any;
+    private ensureApplicationEmojis;
+    getEmoji(emojiId: string, fallbackEmoji: any): Promise<any>;
+    getEmojiByName(emojiName: string, fallbackEmoji: any): Promise<any>;
+    getEmojiByIdentifier(emojiId: string, fallbackEmoji: any): Promise<any>;
+    getApplicationEmoji(emojiId: string): Promise<import("discord.js").ApplicationEmoji>;
+    getApplicationEmojiByName(emojiName: string): Promise<import("discord.js").ApplicationEmoji>;
 }

package/dist/services/EmojiFallback.js

@@ -1,26 +1,65 @@
 export class EmojiFallback {
     client;
     translator;
+    applicationEmojisPromise = null;
     constructor(client, translator) {
         this.client = client;
         this.translator = translator;
     }
-    getEmoji(emojiId, fallbackEmoji) {
+    ensureApplicationEmojis() {
+        if (!this.applicationEmojisPromise) {
+            if (this.client.application) {
+                this.applicationEmojisPromise = this.client.application.emojis.fetch().catch(() => { });
+            }
+            else {
+                this.applicationEmojisPromise = Promise.resolve();
+            }
+        }
+        return this.applicationEmojisPromise;
+    }
+    async getEmoji(emojiId, fallbackEmoji) {
         if (this.translator.has(emojiId)) {
             emojiId = this.translator.get(emojiId);
         }
         const emoji = this.client.emojis.cache.get(emojiId);
-        return emoji?.toString() || fallbackEmoji;
+        if (emoji)
+            return emoji.toString();
+        const appEmoji = await this.getApplicationEmoji(emojiId);
+        if (appEmoji)
+            return appEmoji.toString();
+        return fallbackEmoji;
     }
-    getEmojiByName(emojiName, fallbackEmoji) {
+    async getEmojiByName(emojiName, fallbackEmoji) {
         const emoji = this.client.emojis.cache.find((emoji) => emoji.name === emojiName);
-        return emoji?.toString() || fallbackEmoji;
+        if (emoji)
+            return emoji.toString();
+        const appEmoji = await this.getApplicationEmojiByName(emojiName);
+        if (appEmoji)
+            return appEmoji.toString();
+        return fallbackEmoji;
     }
-    getEmojiByIdentifier(emojiId, fallbackEmoji) {
+    async getEmojiByIdentifier(emojiId, fallbackEmoji) {
         if (this.translator.has(emojiId)) {
             emojiId = this.translator.get(emojiId);
         }
         const emoji = this.client.emojis.cache.find((emoji) => emoji.id === emojiId);
-        return emoji?.toString() || fallbackEmoji;
+        if (emoji)
+            return emoji.toString();
+        const appEmoji = await this.getApplicationEmoji(emojiId);
+        if (appEmoji)
+            return appEmoji.toString();
+        return fallbackEmoji;
+    }
+    async getApplicationEmoji(emojiId) {
+        if (!this.client.application)
+            return undefined;
+        await this.ensureApplicationEmojis();
+        return this.client.application.emojis.cache.get(emojiId);
+    }
+    async getApplicationEmojiByName(emojiName) {
+        if (!this.client.application)
+            return undefined;
+        await this.ensureApplicationEmojis();
+        return this.client.application.emojis.cache.find((emoji) => emoji.name === emojiName);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",