From f7c36eefbde5fa1776b1991041cf878510afd21a Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Wed, 21 Apr 2021 19:22:50 +0200 Subject: [PATCH] Move config/data files into own directory --- .gitignore | 6 +++--- commands/botinfo.js | 2 +- commands/netload.js | 4 ++-- server.js | 2 +- util/loadServerPrefixes.js | 8 ++++---- util/setServerPrefix.js | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 00f6699..2525125 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -config.json -netmoduleWhitelist.json -serverPrefixes.json +/data/config.json +/data/netmoduleWhitelist.json +/data/serverPrefixes.json node_modules/ \ No newline at end of file diff --git a/commands/botinfo.js b/commands/botinfo.js index 375d8b1..7970e37 100644 --- a/commands/botinfo.js +++ b/commands/botinfo.js @@ -1,5 +1,5 @@ const Discord = require('discord.js'); -const { prefix } = require('../config.json'); +const { prefix } = require('../data/config.json'); const creationJoinDates = require("../util/creationJoinDates") diff --git a/commands/netload.js b/commands/netload.js index 4928795..fcd611b 100644 --- a/commands/netload.js +++ b/commands/netload.js @@ -7,7 +7,7 @@ module.exports = { name: 'netload', description: 'Load a module from the internet', execute({ message, args, prefix, client, owners }) { - let json = fs.readFileSync('netmoduleWhitelist.json', 'utf8'); + let json = fs.readFileSync('/data/netmoduleWhitelist.json', 'utf8'); let whitelist = JSON.parse(json) console.log(json.indexOf(message.author.id.toString()) == -1) if (json.indexOf(message.author.id.toString()) == -1) { @@ -16,7 +16,7 @@ module.exports = { } if (args[0] == "whitelist" && owners.indexOf(message.author.id.toString()) >= 0) { whitelist.push(args[1]) - fs.writeFileSync("netmoduleWhitelist.json", JSON.stringify(whitelist)) + fs.writeFileSync("/data/netmoduleWhitelist.json", JSON.stringify(whitelist)) return; } if (!args[0] && message.attachments.size == 0) { diff --git a/server.js b/server.js index 76450a7..4e70524 100644 --- a/server.js +++ b/server.js @@ -8,7 +8,7 @@ const { loginChannel, enableLoginMessage, owners -} = require('./config.json'); +} = require('./data/config.json'); client.commands = new Discord.Collection(); client.serverPrefixes = new Discord.Collection(); diff --git a/util/loadServerPrefixes.js b/util/loadServerPrefixes.js index b6cf726..2d257d1 100644 --- a/util/loadServerPrefixes.js +++ b/util/loadServerPrefixes.js @@ -3,11 +3,11 @@ const fs = require('fs') module.exports = function (client) { try { - if(!fs.existsSync('serverPrefixes.json')){ - console.log("Creating loadServerPrefixes.json...") - fs.writeFileSync("serverPrefixes.json","[]") + if(!fs.existsSync('/data/serverPrefixes.json')){ + console.log("Creating load serverPrefixes.json...") + fs.writeFileSync("/data/serverPrefixes.json","[]") } - const json = fs.readFileSync('serverPrefixes.json', 'utf8'); + const json = fs.readFileSync('/data/serverPrefixes.json', 'utf8'); const serverPrefixes = JSON.parse(json); serverPrefixes.forEach(server => { client.serverPrefixes.set(server.id, server.prefix) diff --git a/util/setServerPrefix.js b/util/setServerPrefix.js index b5ece00..a7565a2 100644 --- a/util/setServerPrefix.js +++ b/util/setServerPrefix.js @@ -3,13 +3,13 @@ const fs = require('fs'); module.exports = function (client, newPrefix, guildID) { let isExists = false; - const json = fs.readFileSync('serverPrefixes.json', 'utf8'); + const json = fs.readFileSync('/data/serverPrefixes.json', 'utf8'); const serverPrefixes = JSON.parse(json); serverPrefixes.forEach(function (server) { if (server.id === guildID) { server.prefix = newPrefix client.serverPrefixes.set(server.id, newPrefix) - fs.writeFileSync("serverPrefixes.json", JSON.stringify(serverPrefixes)); + fs.writeFileSync("/data/serverPrefixes.json", JSON.stringify(serverPrefixes)); isExists = true; } }); @@ -19,7 +19,7 @@ module.exports = function (client, newPrefix, guildID) { } serverPrefixes.push(_newPrefix) - fs.writeFileSync("serverPrefixes.json", JSON.stringify(serverPrefixes)) + fs.writeFileSync("/data/serverPrefixes.json", JSON.stringify(serverPrefixes)) client.serverPrefixes.set(guildID, newPrefix) } } \ No newline at end of file