Refactor presence stuff
* Create new function that sets presence which replaces with correct variables * Probably some more shit I don't remember
This commit is contained in:
parent
7b069ad429
commit
bf1a7985aa
4 changed files with 19 additions and 18 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
const setPresence = require("../util/setPresence");
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
name: 'setpresence',
|
name: 'setpresence',
|
||||||
description: 'Set the presence for the bot',
|
description: 'Set the presence for the bot',
|
||||||
|
@ -20,9 +22,8 @@ module.exports = {
|
||||||
}
|
}
|
||||||
const firstArg = args[0].length + 1;
|
const firstArg = args[0].length + 1;
|
||||||
let temp = args.join(" ");
|
let temp = args.join(" ");
|
||||||
let regex = /<prefix>/g
|
|
||||||
let presenceText = temp.slice(firstArg, temp.length)
|
let presenceText = temp.slice(firstArg, temp.length)
|
||||||
client.user.setActivity(presenceText.replace(regex, globalPrefix), { type: presenceType });
|
setPresence({presenceText: presenceText,presenceType: presenceType, client: client, globalPrefix: globalPrefix});
|
||||||
savePresence(presenceType, presenceText);
|
savePresence(presenceType, presenceText);
|
||||||
message.channel.send("Updated presence.")
|
message.channel.send("Updated presence.")
|
||||||
}
|
}
|
||||||
|
|
10
server.js
10
server.js
|
@ -11,9 +11,7 @@ const {
|
||||||
loginMessage,
|
loginMessage,
|
||||||
loginChannel,
|
loginChannel,
|
||||||
enableLoginMessage,
|
enableLoginMessage,
|
||||||
owners,
|
owners
|
||||||
presenceText,
|
|
||||||
presenceType
|
|
||||||
} = require('./data/config.json');
|
} = require('./data/config.json');
|
||||||
|
|
||||||
client.commands = new Discord.Collection();
|
client.commands = new Discord.Collection();
|
||||||
|
@ -32,12 +30,6 @@ client.once('ready', () => {
|
||||||
console.clear();
|
console.clear();
|
||||||
updatePresence(client)
|
updatePresence(client)
|
||||||
console.log('Ready!');
|
console.log('Ready!');
|
||||||
if(presenceType && presenceText){
|
|
||||||
let regex = /<prefix>/g
|
|
||||||
client.user.setActivity(presenceText.replace(regex, globalPrefix), { type: presenceType });
|
|
||||||
}
|
|
||||||
else
|
|
||||||
client.user.setActivity(globalPrefix, {type : "WATCHING"});
|
|
||||||
if (enableLoginMessage === true)
|
if (enableLoginMessage === true)
|
||||||
try{
|
try{
|
||||||
client.channels.cache.get(loginChannel).send(loginMessage)
|
client.channels.cache.get(loginChannel).send(loginMessage)
|
||||||
|
|
11
util/setPresence.js
Normal file
11
util/setPresence.js
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
const getGuildCount = require("./getGuildCount")
|
||||||
|
|
||||||
|
module.exports = function ({presenceText, presenceType, client}) {
|
||||||
|
const {globalPrefix} = require ('../data/config.json')
|
||||||
|
let guildCount = getGuildCount(client)
|
||||||
|
let regex = /<guilds>/g
|
||||||
|
presenceText = presenceText.replace(regex, guildCount)
|
||||||
|
regex = /<prefix>/g
|
||||||
|
presenceText = presenceText.replace(regex, globalPrefix)
|
||||||
|
client.user.setActivity(presenceText, { type: presenceType });
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
const getGuildCount = require('./getGuildCount')
|
const setPresence = require('./setPresence')
|
||||||
|
|
||||||
module.exports = function (client) {
|
module.exports = function (client) {
|
||||||
const updatePresence = require('./updatePresence')
|
const updatePresence = require('./updatePresence')
|
||||||
|
@ -7,11 +7,8 @@ module.exports = function (client) {
|
||||||
presenceType
|
presenceType
|
||||||
} = require('../data/config.json')
|
} = require('../data/config.json')
|
||||||
|
|
||||||
if(presenceText.includes("<guilds>")){
|
if(presenceText.includes("<guilds>") || presenceText.includes("<prefix>")){
|
||||||
let guildCount = getGuildCount(client)
|
setPresence({presenceText: presenceText, presenceType: presenceType, client: client});
|
||||||
let regex = /<guilds>/g
|
|
||||||
presenceText = presenceText.replace(regex, guildCount)
|
|
||||||
client.user.setActivity(presenceText, { type: presenceType });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue