From 4c9171e72a6cb2005c229fb40f205154d2773a1e Mon Sep 17 00:00:00 2001
From: Ayyan <ayyantee@gmail.com>
Date: Tue, 19 Jan 2021 18:10:28 +0400
Subject: [PATCH] fix(handlers): support for custom emoji in reaction remove
 functions (#400)

---
 src/api/handlers/message.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/api/handlers/message.ts b/src/api/handlers/message.ts
index 93a096fcc..cf02ff86e 100644
--- a/src/api/handlers/message.ts
+++ b/src/api/handlers/message.ts
@@ -152,6 +152,12 @@ export function removeReaction(
   messageID: string,
   reaction: string,
 ) {
+  if (reaction.startsWith("<:")) {
+    reaction = reaction.substring(2, reaction.length - 1);
+  } else if (reaction.startsWith("<a:")) {
+    reaction = reaction.substring(3, reaction.length - 1);
+  }
+
   return RequestManager.delete(
     endpoints.CHANNEL_MESSAGE_REACTION_ME(
       channelID,
@@ -176,6 +182,12 @@ export async function removeUserReaction(
     throw new Error(Errors.MISSING_MANAGE_MESSAGES);
   }
 
+  if (reaction.startsWith("<:")) {
+    reaction = reaction.substring(2, reaction.length - 1);
+  } else if (reaction.startsWith("<a:")) {
+    reaction = reaction.substring(3, reaction.length - 1);
+  }
+
   return RequestManager.delete(
     endpoints.CHANNEL_MESSAGE_REACTION_USER(
       channelID,
@@ -217,6 +229,13 @@ export async function removeReactionEmoji(
   ) {
     throw new Error(Errors.MISSING_MANAGE_MESSAGES);
   }
+
+  if (reaction.startsWith("<:")) {
+    reaction = reaction.substring(2, reaction.length - 1);
+  } else if (reaction.startsWith("<a:")) {
+    reaction = reaction.substring(3, reaction.length - 1);
+  }
+
   return RequestManager.delete(
     endpoints.CHANNEL_MESSAGE_REACTION(channelID, messageID, reaction),
   );