From 29d5d81edc5440f0e44cdf076ddf584af2376fe4 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Thu, 1 Jul 2021 17:48:42 +0200 Subject: [PATCH 1/2] Remove leftover comments from example --- commands/ping.js | 4 ++-- commands/update.js | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 commands/update.js diff --git a/commands/ping.js b/commands/ping.js index 848eb4d..6e23a0c 100644 --- a/commands/ping.js +++ b/commands/ping.js @@ -1,7 +1,7 @@ module.exports = { - name: 'ping', // Keep it to one word + name: 'ping', description: 'Just ping.', - execute({message, client}) { //parameters you can use for netload: message, args, client, prefix + execute({message, client}) { message.channel.send(`Pong.\n${client.ws.ping}ms`) } }; \ No newline at end of file diff --git a/commands/update.js b/commands/update.js new file mode 100644 index 0000000..0fef233 --- /dev/null +++ b/commands/update.js @@ -0,0 +1,18 @@ +module.exports = { + name: 'update', + description: 'pull changes from master and reload commands', + admin: true, + execute({message}) { + let cmd = "git pull"; + const exec = require("child_process").exec; + + exec(cmd, (err, stdout, stderr) => { + process.stdout.write(stdout); + if (err) { + message.channel.send("Something went wrong..."); + console.log(stderr); + } + }); + + } +}; \ No newline at end of file From 73b0b5f4eddf7a2919cb6a99ad5e947094b70fdd Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Thu, 1 Jul 2021 18:08:10 +0200 Subject: [PATCH 2/2] Add update command Uses git pull to update to latest commit --- commands/reload.js | 18 ++---------------- commands/update.js | 16 +++++++++++++--- util/calculateReloaded.js | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 util/calculateReloaded.js diff --git a/commands/reload.js b/commands/reload.js index d3deadd..7f55553 100644 --- a/commands/reload.js +++ b/commands/reload.js @@ -1,3 +1,4 @@ +const calculateReloaded = require("../util/calculateReloaded.js"); const reloadNetModules = require("../util/reloadNetModules.js"); module.exports = { @@ -8,24 +9,9 @@ module.exports = { let reloadCommands = require("../util/reloadCommands.js") let beforeSize = client.commands.size; - let sendText; reloadNetModules(client) reloadCommands(client) - if (beforeSize > client.commands.size) { - let difference = beforeSize - client.commands.size; - if (difference == 1) - sendText = `${client.commands.size} modules were reloaded after ${difference} module was deleted.` - else - sendText = `${client.commands.size} modules were reloaded after ${difference} were disabled.` - } else if (beforeSize < client.commands.size) { - let difference = client.commands.size - beforeSize; - if (difference == 1) - sendText = `${difference} module was added, and a total of ${client.commands.size} were reloaded.` - else - sendText = `${difference} module were added, and a total of ${client.commands.size} were reloaded.` - } else if (beforeSize === client.commands.size) { - sendText = `${client.commands.size} modules were reloaded.` - } + let sendText = calculateReloaded(beforeSize, client) message.channel.send(sendText) } }; \ No newline at end of file diff --git a/commands/update.js b/commands/update.js index 0fef233..3310a99 100644 --- a/commands/update.js +++ b/commands/update.js @@ -1,18 +1,28 @@ +const calculateReloaded = require("../util/calculateReloaded"); +const reloadCommands = require("../util/reloadCommands"); + module.exports = { name: 'update', description: 'pull changes from master and reload commands', admin: true, - execute({message}) { + execute({message, client}) { let cmd = "git pull"; const exec = require("child_process").exec; - exec(cmd, (err, stdout, stderr) => { process.stdout.write(stdout); + if(stdout.startsWith("Already up to date.")){ + message.channel.send("Already up to date.\nNo updating needed.") + }else{ + let beforeSize = client.commands.size; + reloadCommands(client) + let sendText = `${stdout}\nBot updated, and\n${calculateReloaded(beforeSize, client)}` + message.channel.send(sendText) + } if (err) { message.channel.send("Something went wrong..."); console.log(stderr); } }); - + } }; \ No newline at end of file diff --git a/util/calculateReloaded.js b/util/calculateReloaded.js new file mode 100644 index 0000000..bf63f42 --- /dev/null +++ b/util/calculateReloaded.js @@ -0,0 +1,19 @@ +module.exports = function(beforeSize, client){ + + if (beforeSize > client.commands.size) { + let difference = beforeSize - client.commands.size; + if (difference == 1) + sendText = `${client.commands.size} modules were reloaded after ${difference} module was deleted.` + else + sendText = `${client.commands.size} modules were reloaded after ${difference} were disabled.` + } else if (beforeSize < client.commands.size) { + let difference = client.commands.size - beforeSize; + if (difference == 1) + sendText = `${difference} module was added, and a total of ${client.commands.size} were reloaded.` + else + sendText = `${difference} module were added, and a total of ${client.commands.size} were reloaded.` + } else if (beforeSize === client.commands.size) { + sendText = `${client.commands.size} modules were reloaded.` + } + return sendText; +} \ No newline at end of file