Fix Everything

This commit is contained in:
Daniel Odendahl Jr
2017-06-01 18:31:20 +00:00
parent 66706d9c7b
commit 4e1f83a30f
85 changed files with 721 additions and 851 deletions
+2 -5
View File
@@ -16,11 +16,8 @@ module.exports = class ClearSettingCommand extends Command {
prompt: 'What setting do you want to clear?',
type: 'string',
validate: (setting) => {
if (settings.includes(setting)) {
return true;
} else {
return `Please enter one of the following: ${settings.join(', ')}.`;
}
if (settings.includes(setting)) return true;
else return `Please enter one of the following: ${settings.join(', ')}.`;
}
}
]
+5 -11
View File
@@ -17,11 +17,8 @@ module.exports = class MemberMsgCommand extends Command {
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;
} else {
return 'Please enter either `joinMsg` or `leaveMsg`.';
}
if (['joinMsg', 'leaveMsg'].includes(type)) return true;
else return 'Please enter either `joinMsg` or `leaveMsg`.';
}
},
{
@@ -29,11 +26,8 @@ module.exports = class MemberMsgCommand extends Command {
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;
} else {
return 'Invalid Message. Message must be under 150 characters.';
}
if (message.length < 150) return true;
else return 'Invalid Message. Message must be under 150 characters.';
}
}
]
@@ -45,7 +39,7 @@ module.exports = class MemberMsgCommand extends Command {
if (type === 'joinMsg') {
msg.guild.settings.set('joinMsg', message);
return msg.say(`Join Message set to "${message}".`);
} else if (type === 'leaveMsg') {
} else {
msg.guild.settings.set('leaveMsg', message);
return msg.say(`Leave Message set to "${message}".`);
}
+10 -10
View File
@@ -13,21 +13,21 @@ module.exports = class SettingListCommand extends Command {
}
run(msg) {
const modLog = msg.guild.settings.get('modLog', false);
const memberLog = msg.guild.settings.get('memberLog', false);
const singleRole = msg.guild.settings.get('singleRole', false);
const joinRole = msg.guild.settings.get('joinRole', false);
const starboard = msg.guild.settings.get('starboard', false);
const modLog = msg.guild.channels.get(msg.guild.settings.get('modLog'));
const memberLog = msg.guild.channels.get(msg.guild.settings.get('memberLog'));
const singleRole = msg.guild.roles.get(msg.guild.settings.get('singleRole'));
const joinRole = msg.guild.roles.get(msg.guild.settings.get('joinRole'));
const starboard = msg.guild.channels.get(msg.guild.settings.get('starboard'));
return msg.say(stripIndents`
**Prefix:** ${msg.guild.commandPrefix}
**Invite Guard:** ${msg.guild.settings.get('inviteGuard', false)}
**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 ? modLog.name : 'None'}
**Starboard:** ${starboard ? starboard.name : 'None'}
**Join Role:** ${joinRole ? joinRole.name : 'None'}
**Member Channel:** ${memberLog ? memberLog.name : '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 ? singleRole.name : 'None'}
`);
}
};