diff --git a/server.js b/server.js index c82911c..871dc93 100644 --- a/server.js +++ b/server.js @@ -54,6 +54,7 @@ createAndLoadWhitelistTable(client.whitelist); client.settings.set("presenceType", presenceType); client.settings.set("presenceText", presenceText); +client.settings.set("globalPrefix", globalPrefix); const reloadCommands = require("./util/reloadCommands.js"); const onMessage = require('./server/message'); @@ -74,7 +75,7 @@ client.once('disconnect', () => { }); client.on('messageCreate', async message => { - onMessage(client, owners, message, globalPrefix); + onMessage(client, owners, message); }); diff --git a/server/message.js b/server/message.js index fb15f3b..169e206 100644 --- a/server/message.js +++ b/server/message.js @@ -1,6 +1,6 @@ const isWhitelisted = require('../util/isWhitelisted') -module.exports = function(client, owners, message, globalPrefix){ - let prefix = globalPrefix; +module.exports = function(client, owners, message){ + let prefix = client.settings.get("globalPrefix"); let serverPrefix = client.serverPrefixes.get(message.guild.id); if (serverPrefix) { prefix = serverPrefix; @@ -28,7 +28,7 @@ module.exports = function(client, owners, message, globalPrefix){ if (command.admin && owners.indexOf(message.author.id.toString()) == -1) return; try { console.log(`${message.author.username}(id: ${message.author.id}) executed ${command.name} with '${args}' as arguments`) - command.execute({ message: message, args: args, client: client, prefix: prefix, owners: owners, globalPrefix: globalPrefix}) + command.execute({ message: message, args: args, client: client, prefix: prefix, owners: owners}) } catch (error) { let divider = "------------------------" console.log(divider) diff --git a/util/setPresence.js b/util/setPresence.js index ea6f166..62b4633 100644 --- a/util/setPresence.js +++ b/util/setPresence.js @@ -2,7 +2,7 @@ const getGuildInfo = require("./getGuildInfo") const parseMS = require('./parseMS'); const convertDateToISOString = require('./convertDateToISOString') module.exports = function ({presenceText, presenceType, client}) { - const {globalPrefix} = require ('../data/config.json') + const globalPrefix = client.settings.get("globalPrefix") const guildInfo = getGuildInfo(client); let uptime = parseMS(client.uptime); let uptimeFormat = "";