Skip to content

Commit

Permalink
Changed how emoji names are parsed in mentions util.
Browse files Browse the repository at this point in the history
  • Loading branch information
moonstar-x committed Feb 3, 2022
1 parent 29084ce commit ebf99eb
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/utils/mentions.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { MessageMentions: { USERS_PATTERN, CHANNELS_PATTERN, ROLES_PATTERN } } = require('discord.js');

const CUSTOM_EMOJI_PATTERN = /<:.*?:(\d{17,19})>/g;
const CUSTOM_EMOJI_PATTERN = /<:(.*?):(\d{17,19})>/g;

const cleanMemberMentions = (message, members) => {
return message.replace(USERS_PATTERN, (_, id) => members.get(id).displayName);
Expand All @@ -14,17 +14,17 @@ const cleanRoleMentions = (message, roles) => {
return message.replace(ROLES_PATTERN, (_, id) => roles.get(id).name);
};

const cleanEmojis = (message, emojis) => {
return message.replace(CUSTOM_EMOJI_PATTERN, (_, id) => emojis.get(id).name);
const cleanEmojis = (message) => {
return message.replace(CUSTOM_EMOJI_PATTERN, (_, name) => name);
};

const cleanMessage = (message, { members, channels, roles, emojis }) => {
const cleanMessage = (message, { members, channels, roles }) => {
let clean = message;

clean = cleanMemberMentions(clean, members);
clean = cleanChannelMentions(clean, channels);
clean = cleanRoleMentions(clean, roles);
clean = cleanEmojis(clean, emojis);
clean = cleanEmojis(clean);

return clean;
};
Expand Down

0 comments on commit ebf99eb

Please sign in to comment.