embee/woomy-v2
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

message.channel.guild > message.guild

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bot/commands/Bot/help.js
View file

@ -32,7 +32,7 @@ module.exports = class {
if (!args[0]) { if (!args[0]) {
const embed = new client.RichEmbed(); const embed = new client.RichEmbed();
embed.setTitle('Help & Commands'); embed.setTitle('Help & Commands');
embed.setColour(client.functions.displayHexColour(message.channel.guild)); embed.setColour(client.functions.displayHexColour(message.guild));
embed.setDescription( embed.setDescription(
` `
» Use \`${message.prefix}help [category]\` to get basic information on all commands in the category. » Use \`${message.prefix}help [category]\` to get basic information on all commands in the category.
@ -66,7 +66,7 @@ module.exports = class {
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle(prettified[cat].emoji + ' ' + cat) .setTitle(prettified[cat].emoji + ' ' + cat)
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setDescription(cmds) .setDescription(cmds)
.setFooter('<> = required, / = either/or, [] = optional'); .setFooter('<> = required, / = either/or, [] = optional');
@ -77,7 +77,7 @@ module.exports = class {
const command = client.commands.get(cmd) || client.commands.get(client.aliases.get(cmd)); const command = client.commands.get(cmd) || client.commands.get(client.aliases.get(cmd));
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle(prettified[command.category].emoji + ' ' + command.category + ' -> ' + command.name.toProperCase()) .setTitle(prettified[command.category].emoji + ' ' + command.category + ' -> ' + command.name.toProperCase())
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setDescription(command.help.description) .setDescription(command.help.description)
.addField('Format:', `\`${message.prefix + command.name} ${command.help.arguments}`.trim() + '`'); .addField('Format:', `\`${message.prefix + command.name} ${command.help.arguments}`.trim() + '`');
if (command.help.details.length > 0) embed.addField('Parameters:', command.help.details); if (command.help.details.length > 0) embed.addField('Parameters:', command.help.details);

2
bot/commands/Bot/ping.js
View file

@ -21,7 +21,7 @@ module.exports = class {
run (client, message, args, data) { //eslint-disable-line no-unused-vars run (client, message, args, data) { //eslint-disable-line no-unused-vars
message.channel.send(replies.ping.random()) message.channel.send(replies.ping.random())
.then(m => { .then(m => {
m.edit(`${m.content} \`roundtrip: ${m.timestamp - message.timestamp}ms | websocket: ${message.channel.guild.shard.latency}ms\``); m.edit(`${m.content} \`roundtrip: ${m.timestamp - message.timestamp}ms | websocket: ${message.guild.shard.latency}ms\``);
}); });
} }
}; };

18
bot/commands/Configuration/blocklist.js
View file

@ -29,7 +29,7 @@ module.exports = class {
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle('Users on blocklist: ' + data.guild.blocklist.length) .setTitle('Users on blocklist: ' + data.guild.blocklist.length)
.setDescription('```' + list.join(', ') + '```') .setDescription('```' + list.join(', ') + '```')
.setColour(client.functions.displayHexColour(message.channel.guild)); .setColour(client.functions.displayHexColour(message.guild));
message.channel.send({ embed: embed }); message.channel.send({ embed: embed });
@ -49,12 +49,12 @@ module.exports = class {
let member; let member;
if (message.mentions.length > 0) { 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 { } else {
member = await client.functions.validateUserID(message.channel.guild, user[0]); member = await client.functions.validateUserID(message.guild, user[0]);
if (!member) { 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( if (member.length === 0) return message.channel.send(
`${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.` `${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; const blocklist = data.guild.blocklist;
if (action === 'add') { 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!` `${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!`); 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); 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.`); message.channel.send(`${client.config.emojis.success} Added \`${member.username}#${member.discriminator}\` to the blocklist.`);
}).catch(error => { }).catch(error => {
client.logger.error('GUILD_UPDATE_ERROR', error); client.logger.error('GUILD_UPDATE_ERROR', error);
@ -96,7 +96,7 @@ module.exports = class {
} }
if (action === 'remove') { 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!`); 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); 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.`); message.channel.send(`${client.config.emojis.success} Removed \`${member.username}#${member.discriminator}\` from the blocklist.`);
}).catch(error => { }).catch(error => {
client.logger.error('GUILD_UPDATE_ERROR', error); client.logger.error('GUILD_UPDATE_ERROR', error);

4
bot/commands/Configuration/disable.js
View file

@ -57,7 +57,7 @@ module.exports = class {
disabled.push(command.name); 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( return message.channel.send(
`${client.config.emojis.success} Added **${args[1]}** to the list of disabled commands for this server.` `${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); 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( return message.channel.send(
`${client.config.emojis.success} Added **${args[1]}** to the list of disabled category for this server!` `${client.config.emojis.success} Added **${args[1]}** to the list of disabled category for this server!`

2
bot/commands/Fun/garfield.js
View file

@ -27,7 +27,7 @@ module.exports = class {
.then(json => { .then(json => {
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle(`${json.data.name} (No. ${json.data.number})`) .setTitle(`${json.data.name} (No. ${json.data.number})`)
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setURL('https://www.mezzacotta.net/garfield/?comic=' + json.data.number) .setURL('https://www.mezzacotta.net/garfield/?comic=' + json.data.number)
.setImage(json.data.image.src); .setImage(json.data.image.src);
message.channel.send({ embed: embed }); message.channel.send({ embed: embed });

2
bot/commands/Pokemon/ability.js
View file

@ -71,7 +71,7 @@ module.exports = class {
} }
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setTitle(ability.name.toProperCase()); .setTitle(ability.name.toProperCase());
if (ability.desc) { if (ability.desc) {
embed.setDescription(ability.desc + fieldEffects); embed.setDescription(ability.desc + fieldEffects);

2
bot/commands/Pokemon/item.js
View file

@ -67,7 +67,7 @@ module.exports = class {
const item = json.data.getItemDetailsByFuzzy; const item = json.data.getItemDetailsByFuzzy;
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setTitle(item.name) .setTitle(item.name)
.setThumbnail(item.sprite) .setThumbnail(item.sprite)
.addField('External Resources:', `[Bulbapedia](${item.bulbapediaPage}) • [Serebii](${item.serebiiPage}) • [Smogon](${item.smogonPage})`); .addField('External Resources:', `[Bulbapedia](${item.bulbapediaPage}) • [Serebii](${item.serebiiPage}) • [Smogon](${item.smogonPage})`);

6
bot/commands/Splatoon/salmonrun.js
View file

@ -35,7 +35,7 @@ module.exports = class {
embeds.push( embeds.push(
new client.RichEmbed() new client.RichEmbed()
.setTitle('Upcoming Salmon Run') .setTitle('Upcoming Salmon Run')
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image) .setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image)
.addField('Map', json.details[0].stage.name, true) .addField('Map', json.details[0].stage.name, true)
.setFooter(`Starting in ${prettifyMiliseconds(json.details[0].start_time * 1000 - Date.now(), { secondsDecimalDigits: 0 })} | Data provided by splatoon2.ink`) .setFooter(`Starting in ${prettifyMiliseconds(json.details[0].start_time * 1000 - Date.now(), { secondsDecimalDigits: 0 })} | Data provided by splatoon2.ink`)
@ -44,7 +44,7 @@ module.exports = class {
embeds.push( embeds.push(
new client.RichEmbed() new client.RichEmbed()
.setTitle('Current Salmon Run') .setTitle('Current Salmon Run')
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setThumbnail('https://splatoon2.ink/assets/splatnet'+timelineJson.coop.reward_gear.gear.image) .setThumbnail('https://splatoon2.ink/assets/splatnet'+timelineJson.coop.reward_gear.gear.image)
.setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image) .setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image)
.addField('Map', json.details[0].stage.name, true) .addField('Map', json.details[0].stage.name, true)
@ -57,7 +57,7 @@ module.exports = class {
embeds.push( embeds.push(
new client.RichEmbed() new client.RichEmbed()
.setTitle('Upcoming Salmon Run') .setTitle('Upcoming Salmon Run')
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setImage('https://splatoon2.ink/assets/splatnet/'+json.details[1].stage.image) .setImage('https://splatoon2.ink/assets/splatnet/'+json.details[1].stage.image)
.addField('Map', json.details[1].stage.name, true) .addField('Map', json.details[1].stage.name, true)
.addField('Weapons', json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[2].weapon.name+', '+json.details[1].weapons[3].weapon.name) .addField('Weapons', json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[2].weapon.name+', '+json.details[1].weapons[3].weapon.name)

2
bot/commands/Splatoon/splatnet.js
View file

@ -31,7 +31,7 @@ module.exports = class {
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle(json.merchandises[i].gear.name) .setTitle(json.merchandises[i].gear.name)
.setThumbnail('https://splatoon2.ink/assets/splatnet' + json.merchandises[i].gear.image) .setThumbnail('https://splatoon2.ink/assets/splatnet' + json.merchandises[i].gear.image)
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.addField('Price', (json.merchandises[i].price).toString(), true) .addField('Price', (json.merchandises[i].price).toString(), true)
.addField('Brand', json.merchandises[i].gear.brand.name, true) .addField('Brand', json.merchandises[i].gear.brand.name, true)
.addField('Ability Slots', (json.merchandises[i].gear.rarity + 1).toString(), true) .addField('Ability Slots', (json.merchandises[i].gear.rarity + 1).toString(), true)

4
bot/commands/Splatoon/splatoonmaps.js
View file

@ -29,7 +29,7 @@ module.exports = class {
const embeds = [ const embeds = [
new client.RichEmbed() new client.RichEmbed()
.setTitle('Current Splatoon 2 Maps') .setTitle('Current Splatoon 2 Maps')
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.addField('<:turf_war:814651383911153692> Turf War', `${json.regular[0].stage_a.name}\n${json.regular[0].stage_b.name}`, true) .addField('<:turf_war:814651383911153692> Turf War', `${json.regular[0].stage_a.name}\n${json.regular[0].stage_b.name}`, true)
.addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[0].rule.name}`, `${json.gachi[0].stage_a.name}\n${json.gachi[0].stage_b.name}`, true) .addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[0].rule.name}`, `${json.gachi[0].stage_a.name}\n${json.gachi[0].stage_b.name}`, true)
.addField(`<:league:814651415409590363> League: ${json.league[0].rule.name}`, `${json.league[0].stage_a.name}\n${json.league[0].stage_b.name}`, true) .addField(`<:league:814651415409590363> League: ${json.league[0].rule.name}`, `${json.league[0].stage_a.name}\n${json.league[0].stage_b.name}`, true)
@ -39,7 +39,7 @@ module.exports = class {
for ( let i = 1; i < json.regular.length; i++ ) { for ( let i = 1; i < json.regular.length; i++ ) {
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle('Upcoming Splatoon 2 Maps') .setTitle('Upcoming Splatoon 2 Maps')
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.addField('<:turf_war:814651383911153692> Turf War', `${json.regular[i].stage_a.name}\n${json.regular[i].stage_b.name}`, true) .addField('<:turf_war:814651383911153692> Turf War', `${json.regular[i].stage_a.name}\n${json.regular[i].stage_b.name}`, true)
.addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[i].rule.name}`, `${json.gachi[i].stage_a.name}\n${json.gachi[i].stage_b.name}`, true) .addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[i].rule.name}`, `${json.gachi[i].stage_a.name}\n${json.gachi[i].stage_b.name}`, true)
.addField(`<:league:814651415409590363> League: ${json.league[i].rule.name}`, `${json.league[i].stage_a.name}\n${json.league[i].stage_b.name}`, true) .addField(`<:league:814651415409590363> League: ${json.league[i].rule.name}`, `${json.league[i].stage_a.name}\n${json.league[i].stage_b.name}`, true)

8
bot/commands/Utility/avatar.js
View file

@ -22,12 +22,12 @@ module.exports = class {
if (args[0]) { if (args[0]) {
if (message.mentions.length > 0) { 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 { } else {
member = await client.functions.validateUserID(message.channel.guild, args[0]); member = await client.functions.validateUserID(message.guild, args[0]);
if (!member) { if (!member) {
member = await message.channel.guild.searchMembers(args.join(' '), 2); member = await message.guild.searchMembers(args.join(' '), 2);
if (member.length === 0) return message.channel.send( if (member.length === 0) return message.channel.send(
`${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.` `${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
@ -44,7 +44,7 @@ module.exports = class {
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle(member.user.username + '#' + member.user.discriminator) .setTitle(member.user.username + '#' + member.user.discriminator)
.setColour(client.functions.displayHexColour(message.channel.guild, member)) .setColour(client.functions.displayHexColour(message.guild, member))
.setImage(member.user.avatarURL); .setImage(member.user.avatarURL);
message.channel.send({ embed: embed }); message.channel.send({ embed: embed });

4
bot/commands/Utility/serverinfo.js
View file

@ -17,10 +17,10 @@ module.exports = class {
} }
run (client, message, args, data) { //eslint-disable-line no-unused-vars run (client, message, args, data) { //eslint-disable-line no-unused-vars
const guild = message.channel.guild; const guild = message.guild;
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setColour(client.functions.displayHexColour(message.channel.guild)) .setColour(client.functions.displayHexColour(message.guild))
.setTitle(guild.name) .setTitle(guild.name)
.setThumbnail(guild.iconURL) .setThumbnail(guild.iconURL)
.addField('ID', guild.id, true) .addField('ID', guild.id, true)

8
bot/commands/Utility/userinfo.js
View file

@ -24,12 +24,12 @@ module.exports = class {
if (args[0]) { if (args[0]) {
if (message.mentions.length > 0) { 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 { } else {
member = await client.functions.validateUserID(message.channel.guild, args[0]); member = await client.functions.validateUserID(message.guild, args[0]);
if (!member) { if (!member) {
member = await message.channel.guild.searchMembers(args.join(' '), 2); member = await message.guild.searchMembers(args.join(' '), 2);
if (member.length === 0) return message.channel.send( if (member.length === 0) return message.channel.send(
`${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.` `${client.config.emojis.userError} No users found. Check for mispellings, or ping the user instead.`
@ -63,7 +63,7 @@ module.exports = class {
const embed = new client.RichEmbed() const embed = new client.RichEmbed()
.setTitle(member.user.username + '#' + member.user.discriminator) .setTitle(member.user.username + '#' + member.user.discriminator)
.setColour(client.functions.displayHexColour(message.channel.guild, member)) .setColour(client.functions.displayHexColour(message.guild, member))
.setThumbnail(member.user.avatarURL || member.user.defaultAvatarURL) .setThumbnail(member.user.avatarURL || member.user.defaultAvatarURL)
.addField('Display Name', member.nick || member.user.username, true) .addField('Display Name', member.nick || member.user.username, true)
.addField('User ID', member.id, true) .addField('User ID', member.id, true)