engineering
/
ramirez
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pingOnBotMention on same server setups. Fixes #134

master
Dragory 2018-09-20 21:57:54 +03:00
parent 8d54cce2b5
commit 2f04ed8359
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.js
View File

@ -148,8 +148,14 @@ bot.on('messageCreate', async msg => {
if (! msg.mentions.some(user => user.id === bot.user.id)) return; if (! msg.mentions.some(user => user.id === bot.user.id)) return;
if (msg.author.bot) return; if (msg.author.bot) return;
// If the person who mentioned the modmail bot is also on the modmail server, ignore them if (utils.messageIsOnInboxServer(msg)) {
if (utils.getInboxGuild().members.get(msg.author.id)) return; // For same server setups, check if the person who pinged modmail is staff. If so, ignore the ping.
if (utils.isStaff(msg.member)) return;
} else {
// For separate server setups, check if the member is staff on the modmail server
const inboxMember = utils.getInboxGuild().members.get(msg.author.id);
if (inboxMember && utils.isStaff(inboxMember)) return;
}
// If the person who mentioned the bot is blocked, ignore them // If the person who mentioned the bot is blocked, ignore them
if (await blocked.isBlocked(msg.author.id)) return; if (await blocked.isBlocked(msg.author.id)) return;