From 26c96e6d85a1f8a50cd915bb5a517de66d5e7206 Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Thu, 11 May 2017 03:15:55 +0000 Subject: [PATCH] Reorder Index --- index.js | 38 ++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/index.js b/index.js index 03696d9c..686e8079 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,4 @@ const { TOKEN, OWNER, PREFIX, INVITE, CLEVS_KEY, CLEVS_USER, CLEVS_NICK } = process.env; - const { CommandoClient } = require('discord.js-commando'); const client = new CommandoClient({ commandPrefix: PREFIX, @@ -9,22 +8,18 @@ const client = new CommandoClient({ unknownCommandResponse: false }); const path = require('path'); - const { carbon, dBots } = require('./structures/Stats'); - const SequelizeProvider = require('./providers/Sequelize'); const Database = require('./structures/PostgreSQL'); -Database.start(); - const Cleverbot = require('./structures/Cleverbot'); const clevs = new Cleverbot({ key: CLEVS_KEY, user: CLEVS_USER, nick: CLEVS_NICK }); -clevs.create(); -let mention; +Database.start(); +clevs.create(); client.setProvider(new SequelizeProvider(Database.db)); @@ -48,6 +43,24 @@ client.registry .registerDefaultCommands({ help: false }) .registerCommandsIn(path.join(__dirname, 'commands')); +let mention; +client.on('ready', () => { + console.log(`[Ready] Shard ${client.shard.id} Logged in!`); + client.user.setGame(`x;help | Shard ${client.shard.id}`); + mention = new RegExp(`()`, 'g'); +}); + +client.on('disconnect', (event) => { + console.log(`[Disconnect] Shard ${client.shard.id} disconnected with Code ${event.code}.`); + process.exit(0); +}); + +client.on('error', console.error); + +client.on('warn', console.warn); + +client.on('commandError', (command, err) => console.error(command, err)); + client.on('message', async (msg) => { if (msg.author.bot) return; if (msg.channel.type !== 'dm') @@ -121,17 +134,6 @@ client.setTimeout(() => { process.exit(0); }, 14400000); -client.on('disconnect', (event) => { - console.log(`[Disconnect] Shard ${client.shard.id} disconnected with Code ${event.code}.`); - process.exit(0); -}); - -client.on('ready', () => { - console.log(`[Ready] Shard ${client.shard.id} Logged in!`); - client.user.setGame(`x;help | Shard ${client.shard.id}`); - mention = new RegExp(`()`, 'g'); -}); - client.login(TOKEN); process.on('unhandledRejection', console.error); diff --git a/package.json b/package.json index 9ed96b2e..2e513360 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "19.2.0", + "version": "19.2.1", "description": "A Discord Bot", "main": "shardingmanager.js", "scripts": {