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

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

@ -18,12 +18,12 @@ 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 message.channel.send(
`${client.config.emojis.userError} You didn't give me an ability to look up!`
);
message.channel.sendTyping();
const editMessage = await message.channel.send(`${client.config.emojis.loading} Please wait...`);
const query = args.join(' ').toLowerCase();
@ -52,7 +52,7 @@ module.exports = class {
if (json.errors) {
json.errors.forEach(error => {
if (error.message.startsWith('Failed to get data for ability')) {
message.channel.send(
editMessage.edit(
`${client.config.emojis.userError} I couldn't find any abilities with names similar to ${query}. Check your spelling, maybe?`
);
} else {
@ -70,8 +70,8 @@ module.exports = class {
fieldEffects = ` Outside of battle, ${ability.isFieldAbility}`;
}
const embed = new client.RichEmbed()
.setColour(client.functions.displayHexColour(message.guild))
const embed = new client.MessageEmbed()
.setColor(client.functions.embedColor(message.guild))
.setTitle(ability.name.toProperCase());
if (ability.desc) {
embed.setDescription(ability.desc + fieldEffects);
@ -79,7 +79,7 @@ module.exports = class {
embed.setDescription(ability.shortDesc + fieldEffects);
}
embed.addField('External Resources:', `[Bulbapedia](${ability.bulbapediaPage}) • [Serebii](${ability.serebiiPage}) • [Smogon](${ability.smogonPage})`);
message.channel.send({ embed: embed });
editMessage.edit({ content: null, embeds: [embed] });
});
}
};

8
bot/commands/Pokemon/effective.js
View file

@ -24,7 +24,7 @@ module.exports = class {
`${client.config.emojis.userError} You didn't give me a pokemon or type combination to look up! Usage: \`${message.prefix + this.name + ' ' + this.help.arguments}\``
);
message.channel.sendTyping();
const editMessage = await message.channel.send(`${client.config.emojis.loading} Please wait...`);
let types;
@ -105,8 +105,8 @@ module.exports = class {
${typeMatchup.defending.effectlessTypes.map(type => `\`${type.toProperCase()}\``).join(' ')}
`;
const embed = new client.RichEmbed()
.setColour(colours[types[0].toProperCase()])
const embed = new client.MessageEmbed()
.setColor(colours[types[0].toProperCase()])
.setTitle('Type effectiveness of ' + types.map(type => type.toProperCase()).join(' and '))
.addField('Offensive:', `
**Super-effective:**
@ -120,7 +120,7 @@ module.exports = class {
**Resistances:**
${this.parseResistedTypes(typeMatchup.defending.resistedTypes, typeMatchup.defending.doubleResistedTypes)}${immune}
`);
message.channel.send({ embed: embed });
editMessage.edit({ content: null, embeds: [embed] });
});
}

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

@ -18,12 +18,12 @@ 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 message.channel.send(
`${client.config.emojis.userError} You didn't give me an item to look up!`
);
message.channel.sendTyping();
const editMessage = await message.channel.send(`${client.config.emojis.loading} Please wait...`);
const query = args.join(' ').toLowerCase();
@ -66,8 +66,8 @@ module.exports = class {
const item = json.data.getItemDetailsByFuzzy;
const embed = new client.RichEmbed()
.setColour(client.functions.displayHexColour(message.guild))
const embed = new client.MessageEmbed()
.setColor(client.functions.embedColor(message.guild))
.setTitle(item.name)
.setThumbnail(item.sprite)
.addField('External Resources:', `[Bulbapedia](${item.bulbapediaPage}) • [Serebii](${item.serebiiPage}) • [Smogon](${item.smogonPage})`);
@ -76,7 +76,7 @@ module.exports = class {
} else {
embed.setDescription(`${item.shortDesc} Added in Generation ${item.generationIntroduced}.`);
}
message.channel.send({ embed: embed });
editMessage.edit({ content: null, embeds: [embed] });
});
}
};

10
bot/commands/Pokemon/move.js
View file

@ -19,12 +19,12 @@ 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 message.channel.send(
`${client.config.emojis.userError} You didn't give me a pokemon move to look up!`
);
message.channel.sendTyping();
const editMessage = await message.channel.send(`${client.config.emojis.loading} Please wait...`);
const query = args.join(' ').toLowerCase();
@ -91,8 +91,8 @@ module.exports = class {
let fieldEffects = '';
if (move.isFieldMove) fieldEffects = ' Outside of battle, ' + move.isFieldMove;
const embed = new client.RichEmbed()
.setColour(colours[move.type])
const embed = new client.MessageEmbed()
.setColor(colours[move.type])
.setTitle(move.name.toProperCase() + suffix);
if (move.desc) {
embed.setDescription(move.desc + fieldEffects);
@ -113,7 +113,7 @@ module.exports = class {
if (move.isGMax) embed.addField('G-Max Pokemon:', move.isGMax, true);
if (move.contestType !== null) embed.addField('Contest Type', move.contestType, true);
embed.addField('External Resources:', `[Bulbapedia](${move.bulbapediaPage}) • [Serebii](${move.serebiiPage}) • [Smogon](${move.smogonPage})`);
message.channel.send({ embed: embed });
editMessage.edit({ content: null, embeds: [embed] });
});
}
};

8
bot/commands/Pokemon/pokemon.js
View file

@ -24,7 +24,7 @@ module.exports = class {
`${client.config.emojis.userError} You didn't give me a pokemon to look up!`
);
message.channel.sendTyping();
const editMessage = await message.channel.send(`${client.config.emojis.loading} Please wait...`);
const query = args.join(' ').toLowerCase();
@ -92,8 +92,8 @@ module.exports = class {
formes = formes.split().concat(pokemon.cosmeticFormes);
}
}
const embed = new client.RichEmbed()
.setColour(colours[pokemon.types[0]])
const embed = new client.MessageEmbed()
.setColor(colours[pokemon.types[0]])
.setTitle(`${pokemon.species.toProperCase()} (No. ${pokemon.num})`)
.setDescription(pokemon.flavorTexts[0].flavor)
.setThumbnail(sprite)
@ -108,7 +108,7 @@ module.exports = class {
embed.addField('Egg Groups:', pokemon.eggGroups.join(', '), true);
embed.addField('Smogon Tier:', pokemon.smogonTier, true);
embed.addField('External Resources:', `[Bulbapedia](${pokemon.bulbapediaPage}) • [Serebii](${pokemon.serebiiPage}) • [Smogon](${pokemon.smogonPage})`);
message.channel.send({ embed: embed });
editMessage.edit({ content: null, embeds: [embed] });
});
}