message.channel.guild > message.guild

This commit is contained in:
Emily 2021-07-15 12:53:57 +10:00
parent 9d0fd0ee01
commit 06c8aa1cc8
13 changed files with 34 additions and 34 deletions

View file

@ -29,7 +29,7 @@ module.exports = class {
const embed = new client.RichEmbed()
.setTitle('Users on blocklist: ' + data.guild.blocklist.length)
.setDescription('```' + list.join(', ') + '```')
.setColour(client.functions.displayHexColour(message.channel.guild));
.setColour(client.functions.displayHexColour(message.guild));
message.channel.send({ embed: embed });
@ -49,12 +49,12 @@ module.exports = class {
let member;
if (message.mentions.length > 0) {
member = await client.functions.getMember(message.channel.guild, message.mentions[0].id);
member = await client.functions.getMember(message.guild, message.mentions[0].id);
} else {
member = await client.functions.validateUserID(message.channel.guild, user[0]);
member = await client.functions.validateUserID(message.guild, user[0]);
if (!member) {
member = await message.channel.guild.searchMembers(user.join(' '), 2);
member = await message.guild.searchMembers(user.join(' '), 2);
if (member.length === 0) return message.channel.send(
`${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
@ -71,11 +71,11 @@ module.exports = class {
const blocklist = data.guild.blocklist;
if (action === 'add') {
if (member.id === message.channel.guild.ownerID) return message.channel.send(
if (member.id === message.guild.ownerID) return message.channel.send(
`${client.config.emojis.userError} You can't block the owner, silly!`
);
if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.channel.guild.ownerID) {
if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.guild.ownerID) {
return message.channel.send(`${client.config.emojis.userError} This user has a higher role than you, you can't add them to the blocklist!`);
}
@ -85,7 +85,7 @@ module.exports = class {
blocklist.push(member.id);
client.db.updateGuild(message.channel.guild.id, 'blocklist', blocklist).then(() => {
client.db.updateGuild(message.guild.id, 'blocklist', blocklist).then(() => {
message.channel.send(`${client.config.emojis.success} Added \`${member.username}#${member.discriminator}\` to the blocklist.`);
}).catch(error => {
client.logger.error('GUILD_UPDATE_ERROR', error);
@ -96,7 +96,7 @@ module.exports = class {
}
if (action === 'remove') {
if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.channel.guild.ownerID) {
if (client.functions.highestRole(member).position >= client.functions.highestRole(message.member).position && message.member.id !== message.guild.ownerID) {
return message.channel.send(`${client.config.emojis.userError} This user has a higher role than you, you can't remove them to the blocklist!`);
}
@ -106,7 +106,7 @@ module.exports = class {
blocklist.remove(member.id);
client.db.updateGuild(message.channel.guild.id, 'blocklist', blocklist).then(() => {
client.db.updateGuild(message.guild.id, 'blocklist', blocklist).then(() => {
message.channel.send(`${client.config.emojis.success} Removed \`${member.username}#${member.discriminator}\` from the blocklist.`);
}).catch(error => {
client.logger.error('GUILD_UPDATE_ERROR', error);

View file

@ -57,7 +57,7 @@ module.exports = class {
disabled.push(command.name);
await client.db.updateGuild(message.channel.guild.id, 'disabledcommands', disabled);
await client.db.updateGuild(message.guild.id, 'disabledcommands', disabled);
return message.channel.send(
`${client.config.emojis.success} Added **${args[1]}** to the list of disabled commands for this server.`
@ -85,7 +85,7 @@ module.exports = class {
disabled.remove(command.name);
await client.db.updateGuild(message.channel.guild.id, 'disabledcommands', disabled);
await client.db.updateGuild(message.guild.id, 'disabledcommands', disabled);
return message.channel.send(
`${client.config.emojis.success} Added **${args[1]}** to the list of disabled category for this server!`