Compare commits
No commits in common. "6ce4ca6fb8f809380e00c3dc644fcb100c024df5" and "723f14405a221bdd51e7ed98beab73f1bac34606" have entirely different histories.
6ce4ca6fb8
...
723f14405a
4 changed files with 5 additions and 14 deletions
|
@ -1,5 +1,4 @@
|
|||
const calculateReloaded = require("../../util/calculateReloaded");
|
||||
const executeCommand = require("../../util/executeCommand");
|
||||
const reloadCommands = require("../../util/reloadCommands");
|
||||
|
||||
module.exports = {
|
||||
|
@ -28,12 +27,10 @@ module.exports = {
|
|||
let commitCount = stdout.split(/\r\n|\r|\n/).length - 1
|
||||
sendText = `${sendText}\n\nLatest commits (${commitCount}):\n${stdout}`
|
||||
if(sendText.length >= 2000){
|
||||
sendText = sendText.slice(1955)
|
||||
sendText.slice(1955)
|
||||
sendText = `${sendText}\n... Message is too long to show everything`
|
||||
}
|
||||
message.channel.send(sendText)
|
||||
const githash = executeCommand(`git`, ["rev-parse", "--short", "HEAD"]);
|
||||
client.githash = githash.error ? "N/A" : githash.output;
|
||||
if (err) console.log(stderr)
|
||||
})
|
||||
}
|
||||
|
|
|
@ -12,11 +12,10 @@ module.exports = {
|
|||
let descriptionArr = [`Name: ${client.user.username}`,
|
||||
`Prefix: ${prefix}`,
|
||||
`Total Servers: ${guildInfo.guildCount}`,
|
||||
`Total Members: ${guildInfo.totalMembers} (${guildInfo.uniqueMemberCount} unique)`,
|
||||
`Total Members: ${guildInfo.totalMembers}`,
|
||||
`Total Commands: ${client.commands.size}`,
|
||||
`Creation Date: ${getCreationDate(client)}`,
|
||||
`Source: [Click Here](https://github.com/SileNce5k/discord_bot)`,
|
||||
`Current Version: ${client.githash}`
|
||||
`Source: [Click Here](https://github.com/SileNce5k/discord_bot)`
|
||||
]
|
||||
|
||||
let description = "";
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
const fs = require('fs');
|
||||
const createInitialConfig = require("./util/createInitialConfig")
|
||||
const convertJSONToSQL = require('./util/timer/convertJSONToSQL');
|
||||
const executeCommand = require('./util/executeCommand.js');
|
||||
const sqlite3 = require('sqlite3').verbose();
|
||||
if(!fs.existsSync("./data/config.json")) {
|
||||
createInitialConfig();
|
||||
|
@ -57,9 +56,6 @@ client.settings.set("presenceType", presenceType);
|
|||
client.settings.set("presenceText", presenceText);
|
||||
client.settings.set("globalPrefix", globalPrefix);
|
||||
|
||||
const githash = executeCommand(`git`, ["rev-parse", "--short", "HEAD"]);
|
||||
client.githash = githash.error ? "N/A" : githash.output;
|
||||
|
||||
const reloadCommands = require("./util/reloadCommands.js");
|
||||
const onMessage = require('./server/message');
|
||||
const onReady = require('./server/ready');
|
||||
|
|
|
@ -2,14 +2,13 @@ const { execFileSync } = require('child_process');
|
|||
module.exports = function(command, commandArgs, verbose=false) {
|
||||
if (typeof command !== 'string' || !Array.isArray(commandArgs)) return { error: true };
|
||||
console.log("Executing:", command, commandArgs.join(" "));
|
||||
let output;
|
||||
try {
|
||||
output = execFileSync(command, commandArgs, {encoding: 'utf8'})
|
||||
const output = execFileSync(command, commandArgs, {encoding: 'utf8'})
|
||||
if (output.length !== 0 && verbose)
|
||||
console.log(output)
|
||||
} catch (error) {
|
||||
console.error(`Error executing ${command} command:`, error);
|
||||
return { error: true };
|
||||
}
|
||||
return { error: false, output};
|
||||
return { error: false };
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue