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

Added more commands, added an auto-delete mechanism for a 12-year-old's spam, various fixes

Browse source
This commit is contained in:
TheEssem 2019-10-24 13:54:23 -05:00
parent 51c2547fd5
commit d78bb8dff7
9 changed files with 186 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
events/error.js
View file

@ -2,6 +2,5 @@ const logger = require("../utils/logger.js");
// run when eris encounters an error
module.exports = async (error, id) => {
logger.error(`An error event was sent by Eris in shard ${id}: \n${error.toString()}`);
logger.error(error.toString());
logger.error(`An error event was sent by Eris in shard ${id}: \n${error.message}`);
};

9
events/messageCreate.js
View file

@ -16,7 +16,8 @@ module.exports = async (message) => {
const prefix = prefixMention.test(message.content) ? message.content.match(prefixMention)[0] : guildConf.prefix;
// ignore other stuff
if (message.content.startsWith(prefix) === false && message.mentions.indexOf(client.user) <= -1 && message.channel.id !== "573553254575898626") return;
// && !message.attachments && message.attachments[0].filename !== "1561668913236-3.gif"
if (message.content.startsWith(prefix) === false && message.mentions.indexOf(client.user) <= -1 && message.channel.id !== "573553254575898626" && (!message.content.match(/https?:\/\/(media|cdn)\.discordapp\.(net|com)\/attachments\/596766080014221373\/606176845871972383\/1561668913236-3.gif/))) return;
// funny stuff
if (message.channel.id === "573553254575898626" && message.channel.guild.id === "433408970955423765") {
@ -32,6 +33,12 @@ module.exports = async (message) => {
await client.createMessage(generalChannel.id, message.content);
}
}
const odyMessages = ["Nope!", "No jojo gif here", "sorry ody, this gif is illegal", "get owned"];
// || (message.attachments && message.attachments[0].filename === "1561668913236-3.gif")
if (message.channel.guild.id === "322114245632327703" && (message.content.match(/https?:\/\/(media|cdn)\.discordapp\.(net|com)\/attachments\/596766080014221373\/606176845871972383\/1561668913236-3.gif/))) {
await message.delete("anti-jojo mechanism");
await client.createMessage(message.channel.id, misc.random(odyMessages));
}
// separate commands and args
const escapedPrefix = misc.regexEscape(prefix);