From 97365f68a16e7616a58a272f171cfb676334a853 Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Sat, 20 May 2017 14:18:21 +0000 Subject: [PATCH] Change where invite guard is located --- commands/settings/clearsetting.js | 8 ++++---- commands/settings/inviteguard.js | 2 +- commands/settings/settinglist.js | 2 +- index.js | 2 +- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/commands/settings/clearsetting.js b/commands/settings/clearsetting.js index 1be40b73..c748a0c6 100644 --- a/commands/settings/clearsetting.js +++ b/commands/settings/clearsetting.js @@ -6,16 +6,16 @@ module.exports = class ClearSettingCommand extends Command { name: 'clear-setting', group: 'settings', memberName: 'clear-setting', - description: 'Removes a custom-set Guard Mode, Mod Channel, Member Channel, Member Message, Staff Role, or Single Role.', + description: 'Removes a custom setting from your server.', guildOnly: true, args: [ { key: 'setting', - prompt: 'What setting do you want to clear? `guard`, `modLog`, `memberLog`, `joinMsg`, `leaveMsg`, `staffRole`, or `singleRole`?', + prompt: 'What setting do you want to clear? `inviteGuard`, `modLog`, `memberLog`, `joinMsg`, `leaveMsg`, `staffRole`, or `singleRole`?', type: 'string', validate: setting => { - if (['guard', 'modLog', 'memberLog', 'joinMsg', 'leaveMsg', 'staffRole', 'singleRole'].includes(setting)) return true; - return 'Please enter either `guard`, `modLog`, `memberLog`, `joinMsg`, `leaveMsg`, `staffRole`, or `singleRole`.'; + if (['inviteGuard', 'modLog', 'memberLog', 'joinMsg', 'leaveMsg', 'staffRole', 'singleRole'].includes(setting)) return true; + return 'Please enter either `inviteGuard`, `modLog`, `memberLog`, `joinMsg`, `leaveMsg`, `staffRole`, or `singleRole`.'; } } ] diff --git a/commands/settings/inviteguard.js b/commands/settings/inviteguard.js index 81dfd624..d6819c68 100644 --- a/commands/settings/inviteguard.js +++ b/commands/settings/inviteguard.js @@ -16,7 +16,7 @@ module.exports = class InviteGuardCommand extends Command { } run(msg) { - msg.guild.settings.set('guard', true); + msg.guild.settings.set('inviteGuard', true); return msg.say('Invite Guard is now active.'); } }; diff --git a/commands/settings/settinglist.js b/commands/settings/settinglist.js index 97c3a556..458236a1 100644 --- a/commands/settings/settinglist.js +++ b/commands/settings/settinglist.js @@ -19,7 +19,7 @@ module.exports = class SettingListCommand extends Command { const singleRole = msg.guild.settings.get('singleRole', false); return msg.say(stripIndents` **Prefix:** ${msg.guild.commandPrefix} - **Invite Guard:** ${msg.guild.settings.get('guard', false)} + **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'} **Member Channel:** ${memberLog ? (msg.guild.channels.has(memberLog) ? msg.guild.channels.get(memberLog).name : 'Missing') : 'None'} diff --git a/index.js b/index.js index d4c356b7..582cace3 100644 --- a/index.js +++ b/index.js @@ -66,7 +66,7 @@ client.on('commandError', (command, err) => { }); client.on('message', async (msg) => { - if (msg.guild && msg.guild.settings.get('guard') && /(discord(.gg\/|app.com\/invite\/))/g.test(msg.content)) { + if (msg.guild && msg.guild.settings.get('inviteGuard') && /(discord(.gg\/|app.com\/invite\/))/g.test(msg.content)) { if (msg.author.bot || msg.member.hasPermission('ADMINISTRATOR') || msg.author.id === msg.guild.ownerID diff --git a/package.json b/package.json index 7002d4a8..31817f5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "19.10.0", + "version": "19.10.1", "description": "A Discord Bot", "main": "shardingmanager.js", "scripts": {