Skip to content
This repository was archived by the owner on Dec 24, 2021. It is now read-only.

Mention prefix option #349

Open
MagnusHJensen wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Mention prefix option #349

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
93ad9c4
Added the docs/check for if mentionPrefix is disabled.
MagnusHJensen Dec 23, 2020
be32ea7
Added the check for mention prefix, in the usage command, so it doesn…
MagnusHJensen Dec 23, 2020
1c34cf8
Added the mentionPrefix as a argument to buildCommandPattern, and add…
MagnusHJensen Dec 23, 2020
57ed336
added the argument mentionPrefix to Command.usage
MagnusHJensen Dec 23, 2020
33a5874
added typings for the added mentionPrefix
MagnusHJensen Dec 23, 2020
e4fd992
made default return value, be true, when getting the mention prefix. …
MagnusHJensen Dec 23, 2020
dc9450c
removed test, logs.
MagnusHJensen Dec 23, 2020
f59bd78
Remove the check, since we are working with boolean values.
MagnusHJensen Dec 24, 2020
4bdcf8a
Merge branch 'master' into mention_prefix
xiaobotdev Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/dispatcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,14 @@ class CommandDispatcher {
}
}


// Find the command to run with default command handling
const prefix = message.guild ? message.guild.commandPrefix : this.client.commandPrefix;
if(!this._commandPatterns[prefix]) this.buildCommandPattern(prefix);
const mentionAsPrefix = this.client.mentionPrefix;

console.log(prefix);
console.log(this._commandPatterns[prefix]);
if(!this._commandPatterns[prefix]) this.buildCommandPattern(prefix, mentionAsPrefix);
let cmdMsg = this.matchDefault(message, this._commandPatterns[prefix], 2);
if(!cmdMsg && !message.guild) cmdMsg = this.matchDefault(message, /^([^\s]+)/i, 1, true);
return cmdMsg;
Expand Down Expand Up @@ -283,18 +288,25 @@ class CommandDispatcher {
/**
* Creates a regular expression to match the command prefix and name in a message
* @param {?string} prefix - Prefix to build the pattern for
* @param {boolean} mentionPrefix - Boolean value, for mention as a prefix.
* @return {RegExp}
* @private
*/
buildCommandPattern(prefix) {
buildCommandPattern(prefix, mentionPrefix) {
let pattern;
if(prefix) {
if(prefix && mentionPrefix) {
const escapedPrefix = escapeRegex(prefix);
pattern = new RegExp(
`^(<@!?${this.client.user.id}>\\s+(?:${escapedPrefix}\\s*)?|${escapedPrefix}\\s*)([^\\s]+)`, 'i'
);
} else {
} else if(!prefix && mentionPrefix) {
pattern = new RegExp(`(^<@!?${this.client.user.id}>\\s+)([^\\s]+)`, 'i');
} else if(prefix && !mentionPrefix) {
const escapedPrefix = escapeRegex(prefix);
pattern = new RegExp(`((?:${escapedPrefix}\\s*)?|${escapedPrefix}\\s*)([^\\s]+)`, 'i');
} else {
const escapedDefaultPrefix = escapeRegex('!');
pattern = new RegExp(`((?:${escapedDefaultPrefix}\\s*)?|${escapedDefaultPrefix}\\s*)([^\\s]+)`, 'i');
}
this._commandPatterns[prefix] = pattern;
this.client.emit('debug', `Built command pattern for prefix "${prefix}": ${pattern}`);
Expand Down