From 3cac6d3737155d18479c1bb3eb90fb7f6ce1d218 Mon Sep 17 00:00:00 2001 From: WubzyGD Date: Sat, 3 Apr 2021 21:46:29 -0600 Subject: [PATCH] bugsss --- commands/dev/setstatus.js | 7 ++++--- commands/misc/commands.js | 2 +- commands/misc/userinfo.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/commands/dev/setstatus.js b/commands/dev/setstatus.js index ecbab5f..d22cbf4 100644 --- a/commands/dev/setstatus.js +++ b/commands/dev/setstatus.js @@ -21,9 +21,10 @@ module.exports = { .addField("Syntax", "`setstatus <-s status> <-t type>`") .addField('Notice', "This command is **developer-only**"), async execute(message, msg, args, cmd, prefix, mention, client) { - if (!args.length) {return message.channel.send(`Syntax: \`${prefix}setstatus <-s status> <-t type>\``);} + if (!args.length) {return message.channel.send(`Syntax: \`${prefix}setstatus [type]\``);} + let tu = await UserData.findOne({uid: message.author.id}); - if (!tu || !tu.developer) {return message.channel.send("You must be a Natsuki developer in order to do that!");} + if ((!tu || !tu.developer) && !client.developers.includes(message.author.id)) {return message.channel.send("You must be my developer in order to do that!");} let options = new TagFilter([ new Tag(['s', 'status', 'm', 'msg', 'message'], 'status', 'append'), @@ -36,6 +37,6 @@ module.exports = { if (options.type) {client.user.setActivity(options.status, {type: options.type.toUpperCase()});} else {client.user.setActivity(options.status);} - return message.channel.send(`Status set to: \`${options.type ? `${options.type.slice(0, 1).toUpperCase()}${options.type.slice(1).toLowerCase()}${options.type && options.type.toLowerCase() == 'listening'} ` ? 'to ' : '' : ''}${options.status}\`.`); + return message.channel.send(`Status set to: \`${options.type ? `${options.type.slice(0, 1).toUpperCase()}${options.type.slice(1).toLowerCase()}` : "Playing"} ${options.status}\``); } }; \ No newline at end of file diff --git a/commands/misc/commands.js b/commands/misc/commands.js index 21233ff..02b8302 100644 --- a/commands/misc/commands.js +++ b/commands/misc/commands.js @@ -16,7 +16,7 @@ module.exports = { let ce = new Discord.MessageEmbed() .setTitle("Commands") .setDescription(`You can use \`${prefix}help\` on any command to get more help on it.`) - .setColor('dc134c') + .setColor('c375f0') .setFooter("Natsuki", client.user.avatarURL()) .setTimestamp(); categories.forEach(category => ce.addField(category, Array.from(client.commands.values()).filter(command => command.meta ? command.meta.category === category : category === "Uncategorized").map(cmd => `\`${cmd.name}\``).join(', '))); diff --git a/commands/misc/userinfo.js b/commands/misc/userinfo.js index df73b00..e4486ce 100644 --- a/commands/misc/userinfo.js +++ b/commands/misc/userinfo.js @@ -31,7 +31,7 @@ module.exports = { if (message.guild) { infoembed.addField('In Server Since', `${moment(person.joinedAt).fromNow()}${!moment(person.joinedAt).fromNow().includes('days') ? ` | ${Math.floor((new Date().getTime() - person.joinedAt.getTime()) / (60 * 60 * 24 * 1000))} days` : ''}\nMember for **${Math.round(((now.getTime() - new Date(message.member.joinedAt.getTime()).getTime()) / (new Date(message.guild.createdAt).getTime() - now.getTime())) * -100)}%** of server lifetime`, false) .addField('Roles', `**${person.roles.cache.size}** roles | [${person.roles.cache.size}/${message.guild.roles.cache.size}] - ${Math.round((person.roles.cache.size / message.guild.roles.cache.size) * 100)}%\nHighest: ${person.roles.highest ? `<@&${person.roles.highest.id}>` : 'No roles!'}`, true) - if (message.guild.ownerId === person.id) {infoembed.addField("Extra", "User is the server's owner!");} + if (message.guild.owner.id === person.id) {infoembed.addField("Extra", "User is the server's owner!");} else if (person.permissions.has("ADMINISTRATOR")) {infoembed.addField("Extra", "User is an admin! Watch out :eyes:");} }