Compare commits
4 commits
acba68a2d1
...
dfc1674bad
Author | SHA1 | Date | |
---|---|---|---|
dfc1674bad | |||
7e623c36fd | |||
b94fc32f46 | |||
dfc1978368 |
7 changed files with 13 additions and 9 deletions
|
@ -20,7 +20,7 @@ module.exports = class {
|
||||||
}
|
}
|
||||||
|
|
||||||
run (client, message, args, data) { //eslint-disable-line no-unused-vars
|
run (client, message, args, data) { //eslint-disable-line no-unused-vars
|
||||||
client.logger.success('RESTART', 'Restart command recieved. ' + exitQuotes.random());
|
client.logger.success('RESTART', 'Restart command received. ' + exitQuotes.random());
|
||||||
client.disconnect();
|
client.disconnect();
|
||||||
client.functions.wait();
|
client.functions.wait();
|
||||||
|
|
||||||
|
|
18
bot/index.js
18
bot/index.js
|
@ -3,10 +3,10 @@
|
||||||
const Discord = require('discord.js');
|
const Discord = require('discord.js');
|
||||||
const CommandLoader = require('./util/commandLoader');
|
const CommandLoader = require('./util/commandLoader');
|
||||||
const EventLoader = require('./util/eventLoader');
|
const EventLoader = require('./util/eventLoader');
|
||||||
const EventHandler = require('./util/handlers/eventHandler');
|
const EventHandler = require('./event_modules/eventHandler');
|
||||||
const MessageHandler = require('./util/handlers/messageHandler');
|
const MessageHandler = require('./event_modules/interactionCreate/messageHandler');
|
||||||
const Functions = require('./util/functions');
|
const Functions = require('./util/functions');
|
||||||
// const Database = require('./util/database');
|
const Database = require('./util/database');
|
||||||
const Logger = require('./util/logger');
|
const Logger = require('./util/logger');
|
||||||
const sentry = require('@sentry/node');
|
const sentry = require('@sentry/node');
|
||||||
const config = require('../botconfig.json');
|
const config = require('../botconfig.json');
|
||||||
|
@ -23,7 +23,7 @@ class WoomyClient extends Discord.Client {
|
||||||
// Essential modules
|
// Essential modules
|
||||||
this.logger = Logger;
|
this.logger = Logger;
|
||||||
this.MessageEmbed = Discord.MessageEmbed;
|
this.MessageEmbed = Discord.MessageEmbed;
|
||||||
//this.db = new Database(this);
|
this.db = new Database(this);
|
||||||
this.functions = new Functions(this);
|
this.functions = new Functions(this);
|
||||||
this.commandLoader = new CommandLoader(this);
|
this.commandLoader = new CommandLoader(this);
|
||||||
this.eventLoader = new EventLoader(this);
|
this.eventLoader = new EventLoader(this);
|
||||||
|
@ -41,7 +41,8 @@ class WoomyClient extends Discord.Client {
|
||||||
createEventListeners () {
|
createEventListeners () {
|
||||||
this.on('ready', this.runReadyModules);
|
this.on('ready', this.runReadyModules);
|
||||||
this.on('error', this.runErrorModules);
|
this.on('error', this.runErrorModules);
|
||||||
this.on('messageCreate', this.runMessageCreateModules);
|
this.on('interactionCreate', this.runInteractionModules);
|
||||||
|
/// this.on('messageCreate', this.runMessageCreateModules);
|
||||||
this.on('guildCreate', this.runGuildCreateModules);
|
this.on('guildCreate', this.runGuildCreateModules);
|
||||||
this.on('guildDelete', this.runGuildDeleteModules);
|
this.on('guildDelete', this.runGuildDeleteModules);
|
||||||
this.on('guildMemberAdd', this.runGuildMemberAddModules);
|
this.on('guildMemberAdd', this.runGuildMemberAddModules);
|
||||||
|
@ -67,8 +68,11 @@ class WoomyClient extends Discord.Client {
|
||||||
this.mainEventListener('error', error);
|
this.mainEventListener('error', error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
runInteractionCreateModules (interaction) {
|
||||||
|
this.mainEventListener('interactionCreate', interaction);
|
||||||
|
}
|
||||||
|
|
||||||
runMessageCreateModules (message) {
|
runMessageCreateModules (message) {
|
||||||
this.messageHandler.handle(message);
|
|
||||||
this.mainEventListener('messageCreate', message);
|
this.mainEventListener('messageCreate', message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -142,7 +146,7 @@ process.on('unhandledRejection', err => {
|
||||||
client.logger.error('UNHANDLED_PROMISE_ERROR', err.stack);
|
client.logger.error('UNHANDLED_PROMISE_ERROR', err.stack);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Shut down gracefully when SIGINT is recieved
|
// Shut down gracefully when SIGINT is received
|
||||||
process.on('SIGINT', () => {
|
process.on('SIGINT', () => {
|
||||||
client.functions.shutdown();
|
client.functions.shutdown();
|
||||||
});
|
});
|
|
@ -18,7 +18,7 @@
|
||||||
"database": "",
|
"database": "",
|
||||||
"password": "",
|
"password": "",
|
||||||
"port": 0000
|
"port": 0000
|
||||||
}
|
},
|
||||||
|
|
||||||
"emojis": {
|
"emojis": {
|
||||||
"success": "<:success:466995111885144095>",
|
"success": "<:success:466995111885144095>",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue