aboutsummaryrefslogtreecommitdiff
path: root/events
diff options
context:
space:
mode:
Diffstat (limited to 'events')
-rw-r--r--events/guildMemberAdd.js22
-rw-r--r--events/guildMemberRemove.js20
-rw-r--r--events/message.js40
-rw-r--r--events/messageDelete.js19
-rw-r--r--events/messageDeleteBulk.js15
-rw-r--r--events/messageUpdate.js19
-rw-r--r--events/ready.js6
7 files changed, 89 insertions, 52 deletions
diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js
index 1c8273a..8527f63 100644
--- a/events/guildMemberAdd.js
+++ b/events/guildMemberAdd.js
@@ -8,11 +8,15 @@
* *************************************/
module.exports = async (bot, member) => {
- const { RichEmbed } = require('discord.js');
+ const {RichEmbed} = require('discord.js');
const logChannel = await bot.plugins.settings.getStr('logs', member.guild.id);
- if (!logChannel) return;
+ if (!logChannel) {
+ return;
+ }
const channelObj = bot.channels.find('id', logChannel);
- if (!channelObj) return;
+ if (!channelObj) {
+ return;
+ }
channelObj.send(
new RichEmbed()
.setColor(0x00ae86)
@@ -24,14 +28,16 @@ module.exports = async (bot, member) => {
.setFooter(member.user.tag, member.user.avatarURL)
);
- if (member.guild.id != '417088992329334792') return;
+ if (member.guild.id != '417088992329334792') {
+ return;
+ }
const botCount = member.guild.members.filter(x => x.user.bot).size;
- bot.channels.get('635835776613220353').setName('User Count: ' + member.guild.memberCount);
- bot.channels.get('635835832913231872').setName('Member Count: ' + (member.guild.memberCount - botCount));
- bot.channels.get('635835875065987073').setName('Bot Count: ' + botCount);
+ bot.channels.get('635835776613220353').setName(`User Count: ${member.guild.memberCount}`);
+ bot.channels.get('635835832913231872').setName(`Member Count: ${member.guild.memberCount - botCount}`);
+ bot.channels.get('635835875065987073').setName(`Bot Count: ${botCount}`);
bot.channels.get('417100669980508160').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules! We now have ${member.guild.memberCount} members.`);
- bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join a team: `p:join <flare, skull>`. Also, make sure to read our introduction: `p:start`.');
+ bot.channels.get('417088992329334794').send(`Welcome to the server <@${member.id }>. Be sure to join a team: \`p:join <flare, skull>\`. Also, make sure to read our introduction: \`p:start\`.`);
const role = member.guild.roles.find('name', 'Trainers');
member.addRole(role);
};
diff --git a/events/guildMemberRemove.js b/events/guildMemberRemove.js
index 9100f6b..6d793a6 100644
--- a/events/guildMemberRemove.js
+++ b/events/guildMemberRemove.js
@@ -8,11 +8,15 @@
* *************************************/
module.exports = async (bot, member) => {
- const { RichEmbed } = require('discord.js');
+ const {RichEmbed} = require('discord.js');
const logChannel = await bot.plugins.settings.getStr('logs', member.guild.id);
- if (!logChannel) return;
+ if (!logChannel) {
+ return;
+ }
const channelObj = bot.channels.find('id', logChannel);
- if (!channelObj) return;
+ if (!channelObj) {
+ return;
+ }
channelObj.send(
new RichEmbed()
.setColor(0x00ae86)
@@ -24,10 +28,12 @@ module.exports = async (bot, member) => {
.setTimestamp()
.setFooter(member.user.tag, member.user.avatarURL)
);
- if (member.guild.id != '417088992329334792') return;
+ if (member.guild.id != '417088992329334792') {
+ return;
+ }
const botCount = member.guild.members.filter(x => x.user.bot).size;
- bot.channels.get('635835776613220353').setName('User Count: ' + member.guild.memberCount);
- bot.channels.get('635835832913231872').setName('Member Count: ' + (member.guild.memberCount - botCount));
- bot.channels.get('635835875065987073').setName('Bot Count: ' + botCount);
+ bot.channels.get('635835776613220353').setName(`User Count: ${member.guild.memberCount}`);
+ bot.channels.get('635835832913231872').setName(`Member Count: ${member.guild.memberCount - botCount}`);
+ bot.channels.get('635835875065987073').setName(`Bot Count: ${botCount}`);
bot.channels.get('417100669980508160').send(`**${member.user.tag}** just left. We now have ${member.guild.memberCount} members left. Aww man...`);
};
diff --git a/events/message.js b/events/message.js
index 21463a7..5c03099 100644
--- a/events/message.js
+++ b/events/message.js
@@ -26,23 +26,35 @@ module.exports = (bot, msg) => {
};
function parseCommand(bot, msg) {
- let category;
- const settings = require("../assets/settings.json");
+ if (msg.author.bot) {
+ return;
+ }
+
+ const settings = require('../assets/settings.json');
const prefix = settings.prefix;
- if (msg.author.bot) return;
- if (!msg.content.startsWith(prefix)) return;
+ if (!msg.content.startsWith(prefix)) {
+ return;
+ }
+
const args = msg.content.slice(prefix.length).trim().split(/ +/g);
+
+ let category;
const command = args.shift();
let cmd;
Array.from(bot.categories.keys()).forEach(i => {
const cmds = bot.categories.get(i);
- if (cmds.includes(command)) category = i;
- if (bot.aliases.get(i).has(command)) category = i;
+ if (cmds.includes(command)) {
+ category = i;
+ }
+ if (bot.aliases.get(i).has(command)) {
+ category = i;
+ }
});
- if (!category) return;
-
+ if (!category) {
+ return;
+ }
if (bot.commands.get(category).has(command)) {
cmd = bot.commands.get(category).get(command);
} else if (bot.aliases.get(category).has(command)) {
@@ -54,18 +66,18 @@ function parseCommand(bot, msg) {
return msg.reply('This command can only be ran in a guild.');
}
if (cmd.checkPermission != null) {
- let result = cmd.checkPermission(bot, msg.member)
- if (result != true)
- {
- if (result == false) return msg.reply('You are not authorized to run this command.');
+ const result = cmd.checkPermission(bot, msg.member);
+ if (result != true) {
+ if (result == false) {
+ return msg.reply('You are not authorized to run this command.');
+ }
return msg.reply(result);
}
}
try {
console.log(`${msg.author.tag} ran the command '${cmd.help.name}' in the guild '${msg.member.guild.name}'`);
cmd.run(bot, msg, args);
- }
- catch (e) {
+ } catch (e) {
console.error(e.stack);
bot.Raven.captureException(e);
msg.channel.send('There was an error trying to process your command. Don\'t worry because this issue is being looked into');
diff --git a/events/messageDelete.js b/events/messageDelete.js
index 5fb2007..05a3a65 100644
--- a/events/messageDelete.js
+++ b/events/messageDelete.js
@@ -8,8 +8,10 @@
* *************************************/
module.exports = async (bot, msg) => {
- const { RichEmbed } = require('discord.js');
- if (!msg.content) return;
+ const {RichEmbed} = require('discord.js');
+ if (!msg.content) {
+ return;
+ }
try {
const embed = new RichEmbed()
.setColor(0x00ae86)
@@ -19,12 +21,15 @@ module.exports = async (bot, msg) => {
.setTimestamp()
.setFooter(`Deleted message orginally created by: ${msg.author.tag}`, msg.author.avatarURL);
const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id);
- if (!logChannel) return;
+ if (!logChannel) {
+ return;
+ }
const channelObj = bot.channels.find('id', logChannel);
- if (!channelObj) return;
- channelObj.send({ embed });
- }
- catch (err) {
+ if (!channelObj) {
+ return;
+ }
+ channelObj.send({embed});
+ } catch (err) {
console.error(err.stack);
}
};
diff --git a/events/messageDeleteBulk.js b/events/messageDeleteBulk.js
index 9640dbf..d62848f 100644
--- a/events/messageDeleteBulk.js
+++ b/events/messageDeleteBulk.js
@@ -8,7 +8,7 @@
* *************************************/
module.exports = async (bot, msgs) => {
- const { RichEmbed } = require('discord.js');
+ const {RichEmbed} = require('discord.js');
try {
const embed = new RichEmbed()
.setColor(0x00ae86)
@@ -17,12 +17,15 @@ module.exports = async (bot, msgs) => {
.setTimestamp()
.setFooter('Messages purged');
const logChannel = await bot.plugins.settings.getStr('logs', msgs.first().guild.id);
- if (!logChannel) return;
+ if (!logChannel) {
+ return;
+ }
const channelObj = bot.channels.find('id', logChannel);
- if (!channelObj) return;
- channelObj.send({ embed });
- }
- catch (err) {
+ if (!channelObj) {
+ return;
+ }
+ channelObj.send({embed});
+ } catch (err) {
console.error(err.stack);
}
};
diff --git a/events/messageUpdate.js b/events/messageUpdate.js
index 43a6a67..c694255 100644
--- a/events/messageUpdate.js
+++ b/events/messageUpdate.js
@@ -8,8 +8,10 @@
* *************************************/
module.exports = async (bot, oldMsg, newMsg) => {
- const { RichEmbed } = require('discord.js');
- if (oldMsg.content == newMsg.content) return;
+ const {RichEmbed} = require('discord.js');
+ if (oldMsg.content == newMsg.content) {
+ return;
+ }
try {
const embed = new RichEmbed()
.setColor(0x00ae86)
@@ -20,12 +22,15 @@ module.exports = async (bot, oldMsg, newMsg) => {
.setTimestamp()
.setFooter(`Edited message originally created by: ${oldMsg.author.tag}`, oldMsg.author.avatarURL);
const logChannel = await bot.plugins.settings.getStr('logs', oldMsg.guild.id);
- if (!logChannel) return;
+ if (!logChannel) {
+ return;
+ }
const channelObj = bot.channels.find('id', logChannel);
- if (!channelObj) return;
- channelObj.send({ embed });
- }
- catch (err) {
+ if (!channelObj) {
+ return;
+ }
+ channelObj.send({embed});
+ } catch (err) {
console.error(err.stack);
}
};
diff --git a/events/ready.js b/events/ready.js
index 9c30717..3d1ce67 100644
--- a/events/ready.js
+++ b/events/ready.js
@@ -16,7 +16,7 @@ module.exports = (bot) => {
'Finding pokemon',
'Type p:help for help',
'Fighting AstralMod',
- 'Arrays start at 1',
+ 'Arrays start at 1'
];
bot.user.setPresence({
@@ -24,8 +24,8 @@ module.exports = (bot) => {
afk: false,
game: {
type: 0,
- name: games[Math.floor(Math.random() * games.length)],
- },
+ name: games[Math.floor(Math.random() * games.length)]
+ }
});
}, 200000);
};
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 03:13:20 +0000