diff --git a/commands/admin/setPresence.js b/commands/admin/setPresence.js index a53757e..9683fd7 100644 --- a/commands/admin/setPresence.js +++ b/commands/admin/setPresence.js @@ -1,4 +1,5 @@ -const setPresence = require("../../util/setPresence"); +const savePresence = require("../../util/savePresence"); +const timeUntil = require("../../util/timer/timeUntil"); module.exports = { name: 'setpresence', @@ -12,10 +13,9 @@ module.exports = { ,"Custom Variables:" ,"${guilds},${prefix},${uptime},{members}"], admin: true, - execute({message, client, args, globalPrefix}) { - const savePresence = require("../../util/savePresence"); + execute({message, client, args}) { let presenceType = args[0].toLocaleUpperCase(); - let sendText = "Updated presence"; + let sendText = "Presence has been set."; switch (presenceType) { case "PLAY": @@ -46,8 +46,8 @@ module.exports = { const firstArg = args[0].length + 1; let temp = args.join(" "); let presenceText = temp.slice(firstArg, temp.length) - setPresence({presenceText: presenceText,presenceType: presenceType, client: client, globalPrefix: globalPrefix}); savePresence(presenceType, presenceText, client); + sendText = `${sendText} It will update ` } message.channel.send(sendText); diff --git a/commands/info/guilds.js b/commands/info/guilds.js index bed7e5b..480fdda 100644 --- a/commands/info/guilds.js +++ b/commands/info/guilds.js @@ -3,10 +3,10 @@ module.exports = { description: 'Returns guild names', admin: true, execute({message, client}) { - let guildNames = ""; - client.guilds.cache.each(guild => { - guildNames = `${guildNames}${guild.name} (${guild.memberCount} members)\n` - }); + let guildNames = client.guilds.cache + .sort((a, b) => b.memberCount - a.memberCount) + .map(guild => `${guild.name} (${guild.memberCount} members)`) + .join("\n"); message.channel.send(guildNames) } }; \ No newline at end of file diff --git a/server/ready.js b/server/ready.js index 20324b7..b1c9fa6 100644 --- a/server/ready.js +++ b/server/ready.js @@ -3,7 +3,15 @@ const checkTimer = require('../util/timer/checkTimer'); const updatePresence = require('../util/updatePresence'); module.exports = function(client, enableLoginMessage, loginChannel, loginMessage) { + updatePresence(client) + client.lastPresenceUpdate = Date.now() + + setInterval(() => { + updatePresence(client) + client.lastPresenceUpdate = Date.now() + }, 60 * 1000); + console.log('Ready!'); if (enableLoginMessage === true) try{ diff --git a/util/updatePresence.js b/util/updatePresence.js index aafd875..e293ac4 100644 --- a/util/updatePresence.js +++ b/util/updatePresence.js @@ -1,14 +1,8 @@ const setPresence = require('./setPresence') module.exports = function (client) { - const updatePresence = require('./updatePresence') let presenceText = client.settings.get("presenceText") let presenceType = client.settings.get("presenceType") - if(presenceText.includes("${guilds}") || presenceText.includes("${prefix}") || presenceText.includes("${uptime}")) { - setPresence({presenceText: presenceText, presenceType: presenceType, client: client}); - } - - - setTimeout(updatePresence, 60000, client) + setPresence({presenceText: presenceText, presenceType: presenceType, client: client}); }