sync changes

This commit is contained in:
Emily 2020-10-20 19:30:46 +11:00
parent ee5de0ccaa
commit 4769669d12
6 changed files with 123 additions and 64 deletions

View file

@ -1,46 +1,67 @@
/* eslint-disable indent */
class EventHandler {
constructor (client) {
this.client = client;
}
ready () {
const readyModules = this.client.eventModules.filter(module => module.wsEvent = 'ready');
readyModules.forEach(module => module.execute(this.client));
}
handle (wsEvent, param_1, param_2) {
switch (wsEvent) {
case 'ready': {
const readyModules = this.client.eventModules.filter(module => module.wsEvent === 'ready');
readyModules.forEach(module => module.run(this.client));
break;
}
error () {
const errorModules = this.client.eventModules.filter(module => module.wsEvent = 'error');
errorModules.forEach(module => module.execute(this.client));
}
// param_1 - error message
case 'error': {
const errorModules = this.client.eventModules.filter(module => module.wsEvent === 'error');
errorModules.forEach(module => module.run(this.client, param_1));
break;
}
messageCreate () {
const mCreateModules = this.client.eventModules.filter(module => module.wsEvent = 'messageCreate');
mCreateModules.forEach(module => module.execute(this.client));
}
// param_1 - message object
case 'messageCreate': {
const mCreateModules = this.client.eventModules.filter(module => module.wsEvent === 'messageCreate');
mCreateModules.forEach(module => module.run(this.client, param_1));
break;
}
guildCreate () {
const gCreateModules = this.client.eventModules.filter(module => module.wsEvent = 'guildCreate');
gCreateModules.forEach(module => module.execute(this.client));
}
// param_1 - guild object
case 'guildCreate': {
const gCreateModules = this.client.eventModules.filter(module => module.wsEvent === 'guildCreate');
gCreateModules.forEach(module => module.run(this.client, param_1));
break;
}
guildDelete () {
const gDeleteModules = this.client.eventModules.filter(module => module.wsEvent = 'guildDelete');
gDeleteModules.forEach(module => module.execute(this.client));
}
// param_1 - guild object
case 'guildDelete': {
const gDeleteModules = this.client.eventModules.filter(module => module.wsEvent === 'guildDelete');
gDeleteModules.forEach(module => module.run(this.client, param_1));
break;
}
guildMemberAdd () {
const gMemberAddModules = this.client.eventModules.filter(module => module.wsEvent = 'guildMemberAdd');
gMemberAddModules.forEach(module => module.execute(this.client));
}
// param_1 - guild object | param_2 - member object
case 'guildMemberAdd': {
const gMemberAddModules = this.client.eventModules.filter(module => module.wsEvent === 'guildMemberAdd');
gMemberAddModules.forEach(module => module.run(this.client, param_1, param_2));
break;
}
guildMemberRemove () {
const gMemberRemoveModules = this.client.eventModules.filter(module => module.wsEvent = 'guildMemberRemove');
gMemberRemoveModules.forEach(module => module.execute(this.client));
}
// param_1 - guild object | param_2 - member object
case 'guildMemberRemove': {
const gMemberRemoveModules = this.client.eventModules.filter(module => module.wsEvent === 'guildMemberRemove');
gMemberRemoveModules.forEach(module => module.run(this.client, param_1, param_2));
break;
}
voiceStateUpdate () {
const vStateUpdateModules = this.client.eventModules.filter(module => module.wsEvent = 'voiceStateUpdate');
vStateUpdateModules.forEach(module => module.execute(this.client));
// param_1 - old voice state | param_2 - new voice state
case 'voiceStateUpdate': {
const vStateUpdateModules = this.client.eventModules.filter(module => module.wsEvent === 'voiceStateUpdate');
vStateUpdateModules.forEach(module => module.run(this.client));
break;
}
}
}
}

View file

@ -1,4 +1,3 @@
const { MessageEmbed } = require('discord.js');
const { inspect, promisify } = require('util');
class Helpers {
@ -6,6 +5,7 @@ class Helpers {
this.client = client;
}
/* Rewrite for Eris
userError (channel, cmd, error) {
const embed = new MessageEmbed()
.setColor('#EF5350')
@ -16,6 +16,7 @@ class Helpers {
channel.send(embed);
}
*/
async getLastMessage (channel) {
const messages = await channel.messages.fetch({ limit: 2 });

View file

@ -77,7 +77,7 @@ class Logger {
* @returns {void}
*/
static event (body) {
console.log(chalk.bold.yellow(`[ ${this._getCurrentTime()} ] [ EVENT ] `) + body);
console.log(chalk.bold.blue(`[ ${this._getCurrentTime()} ] [ EVENT ] `) + body);
}
/**