fix(reaction-roles): Fix animated emojis

SideProjectGuys · Dec 1, 2019 · 55186f8 · 55186f8
1 parent 8c252b1
commit 55186f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/i18n/bot/en.json b/i18n/bot/en.json
@@ -1145,7 +1145,7 @@
 		},
 		"reactionRole": {
 			"noMessageFoundInDatabase": "cmd.reactionRole.noMessageFoundInDatabase",
-			"unknownEmojiBotNeedsToBeInGuildWithEmoji": "cmd.reactionRole.unknownEmojiBotNeedsToBeInGuildWithEmoji"
+			"unknownEmoji": "Unknown emoji. The bot must be in the guild where the emoji comes from!"
 		}
 	},
 	"JOIN_LEAVE_EMBEDS_IS_PREMIUM": "Using an embed as your join/leave message is a premium feature. Premium does not seem to be active on this server. Please contact us to learn more about how to purchase premium.",

diff --git a/src/management/commands/messages/placeholder.ts b/src/management/commands/messages/placeholder.ts
@@ -55,6 +55,8 @@ export default class extends Command {
 				embeds: newMessage.embeds
 			});
 
+			await message.delete().catch(() => undefined);
+
 			return;
 		}
 

diff --git a/src/management/commands/roles/reactionRoles.ts b/src/management/commands/roles/reactionRoles.ts
@@ -6,7 +6,7 @@ import { BooleanResolver, RoleResolver, StringResolver } from '../../../framewor
 import { CommandGroup, GuildPermission, ManagementCommand } from '../../../types';
 
 const THUMBS_UP = '👍';
-const CUSTOM_EMOJI_REGEX = /<:(\w+):(\d+)>/;
+const CUSTOM_EMOJI_REGEX = /<(?:.*)?:(\w+):(\d+)>/;
 
 export default class extends Command {
 	public constructor(client: IMClient) {