murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgraded retrotext and DBL posting packages, fixed mention prefixes and DM commands

Browse source
This commit is contained in:
TheEssem 2021-03-18 09:29:03 -05:00
parent c0332673bf
commit 5d2e2b5274
8 changed files with 278 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

22
events/messageCreate.js
View file

@ -37,15 +37,29 @@ module.exports = async (message) => {
}
}
// this line be like Pain. Pain. Pain. Pain. Pain. Pain. Pain. Pain. Pain. Pain. Pain. Pain.
// there's also bit of a workaround here due to member.mention not accounting for both mention types
const prefix = message.channel.guild ? (message.content.startsWith(message.channel.guild.members.get(client.user.id).mention) ? `${message.channel.guild.members.get(client.user.id).mention} ` : (message.content.startsWith(`<@${client.user.id}>`) ? `<@${client.user.id}> ` : prefixCandidate)) : "";
let prefix;
let isMention = false;
if (message.channel.guild) {
const user = message.channel.guild.members.get(client.user.id);
if (message.content.startsWith(user.mention)) {
prefix = `${user.mention} `;
isMention = true;
} else if (message.content.startsWith(`<@${client.user.id}>`)) { // workaround for member.mention not accounting for both mention types
prefix = `<@${client.user.id}> `;
isMention = true;
} else {
prefix = prefixCandidate;
}
} else {
prefix = "";
}
// ignore other stuff
if (message.content.startsWith(prefix) === false) return;
// separate commands and args
const content = message.cleanContent.substring(prefix.length).trim();
const replace = isMention ? `@${client.user.username} ` : prefix;
const content = message.cleanContent.substring(replace.length).trim();
const rawContent = message.content.substring(prefix.length).trim();
const args = content.split(/ +/g);
args.shift();