22.0.0

commands/settings/clear-setting.js

@@ -15,9 +15,12 @@ module.exports = class ClearSettingCommand extends Command {
                     key: 'setting',
                     prompt: 'What setting do you want to clear?',
                     type: 'string',
-                    validate: setting => {
-                        if (settings.includes(setting)) return true;
-                        return `Please enter one of the following: ${settings.join(', ')}.`;
+                    validate: (setting) => {
+                        if (settings.includes(setting)) {
+                            return true;
+                        } else {
+                            return `Please enter one of the following: ${settings.join(', ')}.`;
+                        }
                     }
                 }
             ]

commands/settings/member-message.js

@@ -16,18 +16,24 @@ module.exports = class MemberMsgCommand extends Command {
                     key: 'type',
                     prompt: 'Which message would you like to change? Please enter either `joinMsg` or `leaveMsg`.',
                     type: 'string',
-                    validate: type => {
-                        if (['joinMsg', 'leaveMsg'].includes(type)) return true;
-                        return 'Please enter either `joinMsg` or `leaveMsg`.';
+                    validate: (type) => {
+                        if (['joinMsg', 'leaveMsg'].includes(type)) {
+                            return true;
+                        } else {
+                            return 'Please enter either `joinMsg` or `leaveMsg`.';
+                        }
                     }
                 },
                 {
                     key: 'message',
                     prompt: 'What should be sent to the channel? Use <user>, <server>, and <mention> as placeholders.',
                     type: 'string',
-                    validate: message => {
-                        if (message.length < 150) return true;
-                        return 'Invalid Message. Message must be under 150 characters.';
+                    validate: (message) => {
+                        if (message.length < 150) {
+                            return true;
+                        } else {
+                            return 'Invalid Message. Message must be under 150 characters.';
+                        }
                     }
                 }
             ]

commands/settings/setting-list.js

@@ -13,7 +13,6 @@ module.exports = class SettingListCommand extends Command {
     }
 
     run(msg) {
-        const staffRole = msg.guild.settings.get('staffRole', false);
         const modLog = msg.guild.settings.get('modLog', false);
         const memberLog = msg.guild.settings.get('memberLog', false);
         const singleRole = msg.guild.settings.get('singleRole', false);
@@ -22,14 +21,13 @@ module.exports = class SettingListCommand extends Command {
         return msg.say(stripIndents`
             **Prefix:** ${msg.guild.commandPrefix}
             **Invite Guard:** ${msg.guild.settings.get('inviteGuard', false)}
-            **Staff Role:** ${staffRole ? (msg.guild.roles.has(staffRole) ? msg.guild.roles.get(staffRole).name : 'Missing') : 'None'}
-            **Mod Channel:** ${modLog ? (msg.guild.channels.has(modLog) ? msg.guild.channels.get(modLog).name : 'Missing') : 'None'}
-            **Starboard:** ${starboard ? (msg.guild.channels.has(starboard) ? msg.guild.channels.get(starboard).name : 'Missing') : 'None'}
-            **Join Role:** ${joinRole ? (msg.guild.roles.has(joinRole) ? msg.guild.roles.get(joinRole).name : 'Missing') : 'None'}
-            **Member Channel:** ${memberLog ? (msg.guild.channels.has(memberLog) ? msg.guild.channels.get(memberLog).name : 'Missing') : 'None'}
+            **Mod Channel:** ${modLog ? msg.guild.channels.has(modLog) ? msg.guild.channels.get(modLog).name : 'Missing' : 'None'}
+            **Starboard:** ${starboard ? msg.guild.channels.has(starboard) ? msg.guild.channels.get(starboard).name : 'Missing' : 'None'}
+            **Join Role:** ${joinRole ? msg.guild.roles.has(joinRole) ? msg.guild.roles.get(joinRole).name : 'Missing' : 'None'}
+            **Member Channel:** ${memberLog ? msg.guild.channels.has(memberLog) ? msg.guild.channels.get(memberLog).name : 'Missing' : 'None'}
             **Join Message:** ${msg.guild.settings.get('joinMsg', 'Welcome <user>! (Default)')}
             **Leave Message:** ${msg.guild.settings.get('leaveMsg', 'Bye <user>... (Default)')}
-            **Single Role:** ${singleRole ? (msg.guild.roles.has(singleRole) ? msg.guild.roles.get(singleRole).name : 'Missing') : 'None'}
+            **Single Role:** ${singleRole ? msg.guild.roles.has(singleRole) ? msg.guild.roles.get(singleRole).name : 'Missing' : 'None'}
         `);
     }
 };

commands/settings/staff-role.js

@@ -1,27 +0,0 @@
-const Command = require('../../structures/Command');
-
-module.exports = class StaffRoleCommand extends Command {
-    constructor(client) {
-        super(client, {
-            name: 'staff-role',
-            group: 'settings',
-            memberName: 'staff-role',
-            description: 'Sets the role that can use Mod Commands without perms.',
-            guildOnly: true,
-            userPermissions: ['ADMINISTRATOR'],
-            args: [
-                {
-                    key: 'role',
-                    prompt: 'What role should be staff?',
-                    type: 'role'
-                }
-            ]
-        });
-    }
-
-    run(msg, args) {
-        const { role } = args;
-        msg.guild.settings.set('staffRole', role.id);
-        return msg.say(`Server Staff role set to ${role.name}.`);
-    }
-};