Merge pull request #347 from ZiomaleQ/main

Support 'raw' emojis
harmonyland · May 17, 2023 · daca400 · daca400
2 parents f8f6a47 + d75c52f
commit daca400
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/managers/messageReactions.ts b/src/managers/messageReactions.ts
@@ -82,6 +82,12 @@ export class MessageReactionsManager extends BaseManager<
 
   /** Remove a specific Emoji from Reactions */
   async removeEmoji(emoji: Emoji | string): Promise<MessageReactionsManager> {
+    emoji =
+      emoji instanceof String && emoji[0] === '<' ? emoji.substring(1) : emoji
+    emoji =
+      emoji instanceof String && emoji[emoji.length - 1] === '>'
+        ? emoji.substring(0, emoji.length - 2)
+        : emoji
     const val = encodeURIComponent(
       (typeof emoji === 'object' ? emoji.id ?? emoji.name : emoji) as string
     )
@@ -96,6 +102,13 @@ export class MessageReactionsManager extends BaseManager<
     emoji: Emoji | string,
     user: User | string
   ): Promise<MessageReactionsManager> {
+    emoji =
+      emoji instanceof String && emoji[0] === '<' ? emoji.substring(1) : emoji
+    emoji =
+      emoji instanceof String && emoji[emoji.length - 1] === '>'
+        ? emoji.substring(0, emoji.length - 2)
+        : emoji
+
     const val = encodeURIComponent(
       (typeof emoji === 'object' ? emoji.id ?? emoji.name : emoji) as string
     )

diff --git a/src/structures/textChannel.ts b/src/structures/textChannel.ts
@@ -93,6 +93,13 @@ export class TextChannel extends Channel {
         const findEmoji = await this.client.emojis.get(emoji)
         if (findEmoji !== undefined) emoji = `${findEmoji.name}:${findEmoji.id}`
         else throw new Error(`Emoji not found: ${emoji}`)
+      } else {
+        // strip out the <>
+        emoji = emoji[0] === '<' ? emoji.substring(1) : emoji
+        emoji =
+          emoji[emoji.length - 1] === '>'
+            ? emoji.substring(0, emoji.length - 2)
+            : emoji
       }
     }
     if (message instanceof Message) message = message.id
@@ -116,6 +123,13 @@ export class TextChannel extends Channel {
         const findEmoji = await this.client.emojis.get(emoji)
         if (findEmoji !== undefined) emoji = `${findEmoji.name}:${findEmoji.id}`
         else throw new Error(`Emoji not found: ${emoji}`)
+      } else {
+        // strip out the <>
+        emoji = emoji[0] === '<' ? emoji.substring(1) : emoji
+        emoji =
+          emoji[emoji.length - 1] === '>'
+            ? emoji.substring(0, emoji.length - 2)
+            : emoji
       }
     }
     if (message instanceof Message) message = message.id