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

changes for eris + new loading UX

Browse source
This commit is contained in:
Emily 2021-07-17 15:55:18 +10:00
parent 9231fcc671
commit 022ec6b999
18 changed files with 84 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ module.exports = class {
if (args[0]) {
if (message.mentions.length > 0) {
member = await client.functions.getMember(message.guild, message.mentions[0].id);
member = await message.guild.members.fetch(message.mentions[0].id)
} else {
member = await client.functions.validateUserID(message.guild, args[0]);
@ -42,11 +42,11 @@ module.exports = class {
}
}
const embed = new client.RichEmbed()
const embed = new client.MessageEmbed()
.setTitle(member.user.username + '#' + member.user.discriminator)
.setColour(client.functions.displayHexColour(message.guild, member))
.setColor(client.functions.embedColor(message.guild, member))
.setImage(member.user.avatarURL);
message.channel.send({ embed: embed });
message.channel.send({ embeds: [embed] });
}
};

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

@ -19,8 +19,8 @@ module.exports = class {
run (client, message, args, data) { //eslint-disable-line no-unused-vars
const guild = message.guild;
const embed = new client.RichEmbed()
.setColour(client.functions.displayHexColour(message.guild))
const embed = new client.MessageEmbed()
.setColor(client.functions.embedColor(message.guild))
.setTitle(guild.name)
.setThumbnail(guild.iconURL)
.addField('ID', guild.id, true)
@ -29,6 +29,6 @@ module.exports = class {
.addField('Boosts', `${guild.premiumSubscriptionCount} (Level ${guild.premiumTier})`, true)
.addField('Member Count (Approximate)', `${guild.memberCount} (${guild.memberCount - guild.members.filter(member => member.user.bot).length} humans, ${guild.members.filter(member => member.user.bot).length} bots)`, true)
.addField('Channels', `${guild.channels.size} ()`)
message.channel.send({ embed: embed });
message.channel.send({ embeds: [embed] });
}
};

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

@ -24,7 +24,7 @@ module.exports = class {
if (args[0]) {
if (message.mentions.length > 0) {
member = await client.functions.getMember(message.guild, message.mentions[0].id);
member = await message.guild.members.fetch(message.mentions[0].id)
} else {
member = await client.functions.validateUserID(message.guild, args[0]);
@ -61,9 +61,9 @@ module.exports = class {
roles.push(`<@&${roleID}>`);
}
const embed = new client.RichEmbed()
const embed = new client.MessageEmbed()
.setTitle(member.user.username + '#' + member.user.discriminator)
.setColour(client.functions.displayHexColour(message.guild, member))
.setColor(client.functions.embedColor(message.guild, member))
.setThumbnail(member.user.avatarURL || member.user.defaultAvatarURL)
.addField('Display Name', member.nick || member.user.username, true)
.addField('User ID', member.id, true)
@ -73,6 +73,6 @@ module.exports = class {
.addField('Joined Discord', `${dayjs(member.user.createdAt).format('D/M/YYYY HH:mm (UTCZ)')}\n*${dayjs().to(member.user.createdAt)}*`, true);
if (badges.length > 0) embed.setDescription(badges.join(' '));
message.channel.send({ embed: embed });
message.channel.send({ embeds: [embed] });
}
};

11
bot/commands/Utility/weather.js
View file

@ -21,7 +21,7 @@ module.exports = class {
};
}
run (client, message, args, data) { //eslint-disable-line no-unused-vars
async run (client, message, args, data) { //eslint-disable-line no-unused-vars
if (!args[0]) return;
let city = args.join(' ').toProperCase();
@ -35,10 +35,9 @@ module.exports = class {
} else {
countryCode += params[1].trim();
}
console.log(countryCode);
}
message.channel.sendTyping();
const editMessage = await message.channel.send(`${client.config.emojis.loading} Please wait...`);
fetch(`https://api.openweathermap.org/data/2.5/weather?q=${city + countryCode}&appid=${client.config.keys.weather}`, { headers: { 'User-Agent': client.config.userAgent }})
.then(res => res.json())
.then(json => {
@ -57,10 +56,10 @@ module.exports = class {
embedColour = '#ff614f';
}
const embed = new client.RichEmbed()
const embed = new client.MessageEmbed()
.setTitle(`Weather for ${city + ', ' + ISO2.code[json.sys.country]}`)
.setThumbnail(`https://openweathermap.org/img/wn/${json.weather[0].icon}@4x.png`)
.setColour(embedColour)
.setColor(embedColour)
.addField('Condition:', json.weather[0].main, true)
.addField('Temperature:', `${tempCelcius}°C | ${Math.round(json.main.temp * 9/5 - 459.67)}°F`, true)
.addField('Min/Max:', `
@ -71,7 +70,7 @@ module.exports = class {
.addField('Wind Speed:', `${Math.round(json.wind.speed * 10) / 10}km/h | ${Math.round(json.wind.speed * 10 / 1.609344)}mi/h`, true)
.addField('Wind Direction:', windrose.getPoint(json.wind.deg).name, true)
.setFooter('Powered by openweathermap.org');
return message.channel.send({ embed:embed });
return editMessage.edit({ content: null, embeds: [embed] });
} else {
if (json.message && json.message === 'city not found') {
return message.channel.send(`${client.config.emojis.userError} You provided an invalid city name. Maybe check your spelling?`);