diff --git a/bot/modules/lbrylink.js b/bot/modules/lbrylink.js index 7e8a2d6..4ac1bda 100644 --- a/bot/modules/lbrylink.js +++ b/bot/modules/lbrylink.js @@ -12,11 +12,18 @@ exports.lbrylink = async function(bot, msg, suffix) { const urlOccurrences = (msg.content.match(/lbry:\/\//g) || []).length; if (urlOccurrences > 0) { - //convert all mentions to a plain string (because lbry://@Nikooo777 gets parsed as lbry://@<123123123> instead) - let mentions = msg.mentions.users; - mentions.forEach(m => { - msg.content = msg.content.replace(new RegExp(m.toString(), 'g'), `@${m.username}`); - }); + //convert all mentions to a plain string (because lbry://@Nikooo777 gets parsed as lbry://@<123123123> instead) + const mentionRegex = /(.+)<@!?(\d{18})>(.+)/; + let match; + do { + if (match) { + msg.content = + match[1] + + `@${msg.guild.members.get(match[2]).user.username}` + + match[3]; + } + match = msg.content.match(mentionRegex); + } while (match); //compile a list of URLs let urls = msg.content.match(/lbry:\/\/\S+/g);