arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-13 08:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

ID-Based Guild Settings

Browse Source
This commit is contained in:
Daniel Odendahl Jr
2017-05-03 20:44:45 +00:00
parent 3268a30118
commit 3abc9b1b08
13 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/moderation/ban.js
+3 -3
View File
@@ -35,15 +35,15 @@ module.exports = class BanCommand extends Command {
}
hasPermission(msg) {
return msg.member.hasPermission('BAN_MEMBERS') || msg.member.roles.exists('name', msg.guild.settings.get('staffRole', 'Server Staff'));
return msg.member.hasPermission('BAN_MEMBERS') || msg.member.roles.has(msg.guild.settings.get('staffRole'));
}
async run(msg, args) {
if (!msg.channel.permissionsFor(this.client.user).has('BAN_MEMBERS'))
return msg.say('This Command requires the `Ban Members` Permission.');
const modlogs = msg.guild.channels.find('name', msg.guild.settings.get('modLog', 'mod_logs'));
const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
if (!modlogs)
return msg.say('This Command requires a channel named `mod_logs` or one custom set with the `modchannel` command.');
return msg.say('This Command requires a channel set with the `modchannel` command.');
if (!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
return msg.say('This Command requires the `Embed Links` Permission.');
const { member, reason } = args;
commands/moderation/kick.js
+3 -3
View File
@@ -32,15 +32,15 @@ module.exports = class KickCommand extends Command {
}
hasPermission(msg) {
return msg.member.hasPermission('KICK_MEMBERS') || msg.member.roles.exists('name', msg.guild.settings.get('staffRole', 'Server Staff'));
return msg.member.hasPermission('KICK_MEMBERS') || msg.member.roles.has(msg.guild.settings.get('staffRole'));
}
async run(msg, args) {
if (!msg.channel.permissionsFor(this.client.user).has('KICK_MEMBERS'))
return msg.say('This Command requires the `Kick Members` Permission.');
const modlogs = msg.guild.channels.find('name', msg.guild.settings.get('modLog', 'mod_logs'));
const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
if (!modlogs)
return msg.say('This Command requires a channel named `mod_logs` or one custom set with the `modchannel` command.');
return msg.say('This Command requires a channel set with the `modchannel` command.');
if (!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
return msg.say('This Command requires the `Embed Links` Permission.');
const { member, reason } = args;
commands/moderation/prune.js
+1 -1
View File
@@ -29,7 +29,7 @@ module.exports = class PruneCommand extends Command {
}
hasPermission(msg) {
return msg.member.hasPermission('MANAGE_MESSAGES') || msg.member.roles.exists('name', msg.guild.settings.get('staffRole', 'Server Staff'));
return msg.member.hasPermission('MANAGE_MESSAGES') || msg.member.roles.has(msg.guild.settings.get('staffRole'));
}
async run(msg, args) {
commands/moderation/softban.js
+3 -3
View File
@@ -32,7 +32,7 @@ module.exports = class SoftbanCommand extends Command {
}
hasPermission(msg) {
return msg.member.hasPermission('KICK_MEMBERS') || msg.member.roles.exists('name', msg.guild.settings.get('staffRole', 'Server Staff'));
return msg.member.hasPermission('KICK_MEMBERS') || msg.member.roles.has(msg.guild.settings.get('staffRole'));
}
async run(msg, args) {
@@ -40,9 +40,9 @@ module.exports = class SoftbanCommand extends Command {
return msg.say('This Command requires the `Ban Members` Permission.');
if (!msg.channel.permissionsFor(this.client.user).has('KICK_MEMBERS'))
return msg.say('This Command requires the `Kick Members` Permission.');
const modlogs = msg.guild.channels.find('name', msg.guild.settings.get('modLog', 'mod_logs'));
const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
if (!modlogs)
return msg.say('This Command requires a channel named `mod_logs` or one custom set with the `modchannel` command.');
return msg.say('This Command requires a channel set with the `modchannel` command.');
if (!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
return msg.say('This Command requires the `Embed Links` Permission.');
const { member, reason } = args;
commands/moderation/unban.js
+3 -3
View File
@@ -39,15 +39,15 @@ module.exports = class UnbanCommand extends Command {
}
hasPermission(msg) {
return msg.member.hasPermission('BAN_MEMBERS') || msg.member.roles.exists('name', msg.guild.settings.get('staffRole', 'Server Staff'));
return msg.member.hasPermission('BAN_MEMBERS') || msg.member.roles.has(msg.guild.settings.get('staffRole'));
}
async run(msg, args) {
if (!msg.channel.permissionsFor(this.client.user).has('BAN_MEMBERS'))
return msg.say('This Command requires the `Ban Members` Permission.');
const modlogs = msg.guild.channels.find('name', msg.guild.settings.get('modLog', 'mod_logs'));
const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog', 'mod_logs'));
if (!modlogs)
return msg.say('This Command requires a channel named `mod_logs` or one custom set with the `modchannel` command.');
return msg.say('This Command requires a channel set with the `modchannel` command.');
if (!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
return msg.say('This Command requires the `Embed Links` Permission.');
const { id, reason } = args;
commands/moderation/warn.js
+3 -3
View File
@@ -31,13 +31,13 @@ module.exports = class WarnCommand extends Command {
}
hasPermission(msg) {
return msg.member.hasPermission('KICK_MEMBERS') || msg.member.roles.exists('name', msg.guild.settings.get('staffRole', 'Server Staff'));
return msg.member.hasPermission('KICK_MEMBERS') || msg.member.roles.has(msg.guild.settings.get('staffRole'));
}
async run(msg, args) {
const modlogs = msg.guild.channels.find('name', msg.guild.settings.get('modLog', 'mod_logs'));
const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog', 'mod_logs'));
if (!modlogs)
return msg.say('This Command requires a channel named `mod_logs` or one custom set with the `modchannel` command.');
return msg.say('This Command requires a channel set with the `modchannel` command.');
if (!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
return msg.say('This Command requires the `Embed Links` Permission.');
const { member, reason } = args;
commands/util/memberchannel.js
+1 -1
View File
@@ -24,7 +24,7 @@ module.exports = class MemberLogCommand extends Command {
run(msg, args) {
const { channel } = args;
msg.guild.settings.set('memberLog', channel.name);
msg.guild.settings.set('memberLog', channel.id);
return msg.say(`Member Log channel set to ${channel.name}.`);
}
};
commands/util/modchannel.js
+1 -1
View File
@@ -24,7 +24,7 @@ module.exports = class ModChannelCommand extends Command {
run(msg, args) {
const { channel } = args;
msg.guild.settings.set('modLog', channel.name);
msg.guild.settings.set('modLog', channel.id);
return msg.say(`Mod Log channel set to ${channel.name}.`);
}
};
commands/util/staffrole.js
+1 -1
View File
@@ -24,7 +24,7 @@ module.exports = class StaffRoleCommand extends Command {
run(msg, args) {
const { role } = args;
msg.guild.settings.set('staffRole', role.name);
msg.guild.settings.set('staffRole', role.id);
return msg.say(`Server Staff role set to ${role.name}.`);
}
};
html/carbonuse.html
+3 -2
View File
@@ -11,8 +11,9 @@
<div class="xiaobox">
<h2>Notes:</h2>
<ol>
<li>Moderation Commands Require a Channel Named "mod_logs" to send Ban/Kick/Unban/Warn Logs, or you can set a channel with x;modchannel</li>
<li>To use Member Join/Leave Logging, make a channel named "member_logs", or set a channel with x;memberchannel</li>
<li>Moderation Commands Require a Channel set with x;modchannel to send Ban/Kick/Unban/Warn Logs</li>
<li>To use Member Join/Leave Logging, set a channel with x;memberchannel</li>
<li>You can set a special role that is able to use Moderation commands (excluding lockdown) with x;staffrole</li>
<li>Use x;help to View a Command List</li>
<li>Visit my <a href="https://discord.gg/fqQF8mc">Home Server</a> for more support, or for updates, or if you just want to hang out.</li>
</ol>
html/discordbots.html
+3 -2
View File
@@ -57,8 +57,9 @@
<div class="xiaobox">
<h2>Notes:</h2>
<ol>
<li>Moderation Commands Require a Channel Named "mod_logs" to send Ban/Kick/Unban/Warn Logs, or you can set a channel with x;modchannel</li>
<li>To use Member Join/Leave Logging, make a channel named "member_logs", or set a channel with x;memberchannel</li>
<li>Moderation Commands Require a Channel set with x;modchannel to send Ban/Kick/Unban/Warn Logs</li>
<li>To use Member Join/Leave Logging, set a channel with x;memberchannel</li>
<li>You can set a special role that is able to use Moderation commands (excluding lockdown) with x;staffrole</li>
<li>Use x;help to View a Command List</li>
<li>Visit my <a href="https://discord.gg/fqQF8mc">Home Server</a> for more support, or for updates, or if you just want to hang out.</li>
</ol>
index.js
+2 -2
View File
@@ -38,14 +38,14 @@ client.registry
.registerCommandsIn(path.join(__dirname, 'commands'));
client.on('guildMemberAdd', (member) => {
const channel = member.guild.channels.find('name', member.guild.settings.get('memberLog', 'member_logs'));
const channel = member.guild.channels.get(member.guild.settings.get('memberLog'));
if (!channel) return;
if (!channel.permissionsFor(client.user).has('SEND_MESSAGES')) return;
channel.send(`Welcome ${member.user.username}!`);
});
client.on('guildMemberRemove', (member) => {
const channel = member.guild.channels.find('name', member.guild.settings.get('memberLog', 'member_logs'));
const channel = member.guild.channels.get(member.guild.settings.get('memberLog'));
if (!channel) return;
if (!channel.permissionsFor(client.user).has('SEND_MESSAGES')) return;
channel.send(`Bye ${member.user.username}...`);
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "xiaobot",
"version": "17.2.12",
"version": "18.0.0",
"description": "A Discord Bot",
"main": "shardingmanager.js",
"scripts": {