From e21db0b22cb60f68f21a8b2176af070424ced1c0 Mon Sep 17 00:00:00 2001 From: plane000 Date: Mon, 21 May 2018 16:42:37 +0100 Subject: [PATCH] Changed some stuff arround and added some admin commands --- commandmanager.js | 13 +++++++++---- commands/admincommands.js | 31 +++++++++++++++++++++++++++++++ helper.js | 12 ++++++------ main.js | 19 ++++++++++++------- 4 files changed, 58 insertions(+), 17 deletions(-) diff --git a/commandmanager.js b/commandmanager.js index 8655233..f1731e2 100644 --- a/commandmanager.js +++ b/commandmanager.js @@ -1,12 +1,12 @@ +const Discord = require('discord.js'); +const http = require('http'); +const fs = require('fs'); const Logger = require('./logger'); const Config = require('./config'); const Commands = require('./commands/commands') const RuleCommands = require('./commands/rulecommands') +const AdminCommands = require('./commands/admincommands') const CommandManager = require('./main'); -const http = require('http'); -const ping = require('ping'); -const fs = require('fs'); -const Discord = require('discord.js'); var commands = {}; @@ -42,4 +42,9 @@ module.exports.loadCommands = function() { addCommand('DelRule', 'delrule', undefined, 'delrule [rule number]', 'Deletes the corresponding rule for the server the command was issued on', true, RuleCommands.delrule); addCommand('EditRule', 'editrule', undefined, 'editrule [rule number] [new rule]', 'Edits the corresponding rule for the server the command was issued on', true, RuleCommands.editrule); + //admin commands + addCommand('Shutdown', 'stop', undefined, 'stop', 'Shutsdown JefferyBot', true, AdminCommands.stop); + addCommand('Reload', 'reload', undefined, 'reload', 'Reloads the server config and the misc config', false, AdminCommands.reload); + addCommand('Set Prefix', 'setprefix', undefined, 'setprefix [new prefix]', 'Changes Jeffery\'s prefix to the new prefix', true, AdminCommands.setprefix); + addCommand('Set Game', 'setgame', undefined, 'setgame [new game]', 'Changes Jeffery\'s game to the new game', true, AdminCommands.setgame); } diff --git a/commands/admincommands.js b/commands/admincommands.js index e69de29..f701d83 100644 --- a/commands/admincommands.js +++ b/commands/admincommands.js @@ -0,0 +1,31 @@ +const Discord = require('discord.js'); +const fs = require('fs'); +const Config = require('../config.js'); +const Logger = require('../logger.js'); +const CommandManager = require('../commandmanager.js'); +const Helper = require('../helper.js'); + +/*message object, messaage full, message args, discord client*/ + +module.exports.stop = async function(message, msg, args, discordclient) { + message.channel.send(':white_check_mark: \`Disconnected...\`'); + Logger.failed('Disconnected'); + discordclient.destroy(); + //discordclient.disconnect(); +} + +module.exports.reload = async function(message, msg, args, discordclient) { + try { + + } catch (e) { + + } +} + +module.exports.setprefix = async function(message, msg, args, discordclient) { + +} + +module.exports.setgame = async function(message, msg, args, discordclient) { + +} diff --git a/helper.js b/helper.js index c1a6054..95104f8 100644 --- a/helper.js +++ b/helper.js @@ -1,13 +1,13 @@ +const Discord = require('discord.js'); +const http = require('http'); +const ping = require('ping'); +const fs = require('fs'); +const request = require('request'); const colors = require('colors'); const Logger = require('./logger'); const Config = require('./config'); const Commands = require('./commands/commands') const CommandManager = require('./commandmanager'); -const http = require('http'); -const ping = require('ping'); -const fs = require('fs'); -const request = require('request'); -const Discord = require('discord.js'); module.exports.requestPromise = function(url) { return new Promise((resolve, reject) => { @@ -21,5 +21,5 @@ module.exports.requestPromise = function(url) { } module.exports.isUserAdmin = function(message) { - + } diff --git a/main.js b/main.js index 4364805..36ef5ed 100644 --- a/main.js +++ b/main.js @@ -1,15 +1,15 @@ +const Discord = require('discord.js'); +const http = require('http'); +const ping = require('ping'); +const fs = require('fs'); const colors = require('colors'); const Logger = require('./logger'); const Config = require('./config'); const Commands = require('./commands/commands') const CommandManager = require('./commandmanager'); const Helper = require('./helper') -const http = require('http'); -const ping = require('ping'); -const fs = require('fs'); -const Discord = require('discord.js'); -const client = new Discord.Client(); +const client = new Discord.Client({autoReconnect:true}); Logger.welcome(); @@ -117,8 +117,13 @@ client.on('guildCreate', async (guild) => { /*on leave server event*/ client.on('guildDelete', async (guild) => { - Logger.log(`JefferyBot left the \'${guild.name}\' server!`) + Logger.log(`JefferyBot left the \'${guild.name}\' server!`); +}); + +client.on("disconnected", function () { + Logger.failed('Disconnected...') + process.exit(1); }); client.on('error', async (error) => { -}) +});