This commit is contained in:
parent
ba99719c20
commit
e92210e856
3 changed files with 6 additions and 5 deletions
|
@ -54,6 +54,7 @@ createAndLoadWhitelistTable(client.whitelist);
|
||||||
|
|
||||||
client.settings.set("presenceType", presenceType);
|
client.settings.set("presenceType", presenceType);
|
||||||
client.settings.set("presenceText", presenceText);
|
client.settings.set("presenceText", presenceText);
|
||||||
|
client.settings.set("globalPrefix", globalPrefix);
|
||||||
|
|
||||||
const reloadCommands = require("./util/reloadCommands.js");
|
const reloadCommands = require("./util/reloadCommands.js");
|
||||||
const onMessage = require('./server/message');
|
const onMessage = require('./server/message');
|
||||||
|
@ -74,7 +75,7 @@ client.once('disconnect', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
client.on('messageCreate', async message => {
|
client.on('messageCreate', async message => {
|
||||||
onMessage(client, owners, message, globalPrefix);
|
onMessage(client, owners, message);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
const isWhitelisted = require('../util/isWhitelisted')
|
const isWhitelisted = require('../util/isWhitelisted')
|
||||||
module.exports = function(client, owners, message, globalPrefix){
|
module.exports = function(client, owners, message){
|
||||||
let prefix = globalPrefix;
|
let prefix = client.settings.get("globalPrefix");
|
||||||
let serverPrefix = client.serverPrefixes.get(message.guild.id);
|
let serverPrefix = client.serverPrefixes.get(message.guild.id);
|
||||||
if (serverPrefix) {
|
if (serverPrefix) {
|
||||||
prefix = 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;
|
if (command.admin && owners.indexOf(message.author.id.toString()) == -1) return;
|
||||||
try {
|
try {
|
||||||
console.log(`${message.author.username}(id: ${message.author.id}) executed ${command.name} with '${args}' as arguments`)
|
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) {
|
} catch (error) {
|
||||||
let divider = "------------------------"
|
let divider = "------------------------"
|
||||||
console.log(divider)
|
console.log(divider)
|
||||||
|
|
|
@ -2,7 +2,7 @@ const getGuildInfo = require("./getGuildInfo")
|
||||||
const parseMS = require('./parseMS');
|
const parseMS = require('./parseMS');
|
||||||
const convertDateToISOString = require('./convertDateToISOString')
|
const convertDateToISOString = require('./convertDateToISOString')
|
||||||
module.exports = function ({presenceText, presenceType, client}) {
|
module.exports = function ({presenceText, presenceType, client}) {
|
||||||
const {globalPrefix} = require ('../data/config.json')
|
const globalPrefix = client.settings.get("globalPrefix")
|
||||||
const guildInfo = getGuildInfo(client);
|
const guildInfo = getGuildInfo(client);
|
||||||
let uptime = parseMS(client.uptime);
|
let uptime = parseMS(client.uptime);
|
||||||
let uptimeFormat = "";
|
let uptimeFormat = "";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue