From 93f7e2ef21fd5a35a885e2ef1680a8f1b6f9cb40 Mon Sep 17 00:00:00 2001 From: Lucas Gabriel Date: Fri, 25 Oct 2024 10:25:07 -0300 Subject: [PATCH] Fixed MLP char alias + result msg changes --- commands/ponyapi.js | 15 ++++++++++++--- locales/english.json | 4 ++-- locales/portuguese.json | 2 +- locales/spanish.json | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/commands/ponyapi.js b/commands/ponyapi.js index 8afb4a5..47cace6 100644 --- a/commands/ponyapi.js +++ b/commands/ponyapi.js @@ -40,9 +40,18 @@ module.exports = (bot) => { if (Array.isArray(response.data.data)) { response.data.data.forEach(character => { + let aliases = []; + if (character.alias) { + if (typeof character.alias === 'string') { + aliases.push(character.alias); + } else if (Array.isArray(character.alias)) { + aliases = aliases.concat(character.alias); + } + } + charactersArray.push({ name: character.name, - alias: character.alias ? character.alias.join(', ') : 'N/A', + alias: aliases.length > 0 ? aliases.join(', ') : 'N/A', url: character.url, sex: character.sex, residence: character.residence ? character.residence.replace(/\n/g, ' / ') : 'N/A', @@ -84,7 +93,7 @@ module.exports = (bot) => { }); }; }); - + bot.command("mlpep", spamwatchMiddleware, async (ctx) => { const Strings = getStrings(ctx.from.language_code); const userInput = ctx.message.text.split(' ').slice(1).join(' '); @@ -96,7 +105,7 @@ module.exports = (bot) => { }); return; }; - + const apiUrl = `http://ponyapi.net/v1/episode/by-overall/${userInput}`; try { diff --git a/locales/english.json b/locales/english.json index 8edcf1d..73999c9 100644 --- a/locales/english.json +++ b/locales/english.json @@ -84,8 +84,8 @@ "httpCodeErr": "An error occurred while fetching the HTTP code.", "httpCodeNotFound": "HTTP code not found.", "httpCodeResult": "*HTTP Code*: {code}\n*Name*: `{message}`\n*Description*: {description}", - "ponyApiCharRes": "*MLP Character Information for* `{input}`*:*\n\n*Name:* `{name}`\n*Alias*: `{alias}`\n*Fandom URL:* [{url}]({url})\n*Sex:* `{sex}`\n*Residence:* `{residence}`\n*Occupation:* `{occupation}`\n*Kind:* `{kind}`", - "ponyApiEpRes": "*MLP Episode Information for* `{input}`*:*\n\n*Name:* `{name}`\n*Fandom URL:* [{url}]({url})\n*Season:* `{season}`\n*Episode:* `{episode}`\n*Overall Ep.:* `{overall}`\n*Release date:* `{airdate}`\n*Story by:* `{storyby}`\n*Written by:* `{writtenby}`\n*Storyboard:* `{storyboard}`", + "ponyApiCharRes": "*MLP Character Information for* \"`{input}`\"*:*\n\n*Name:* `{name}`\n\n*Alias*: `{alias}`\n\n*Fandom URL:* [{url}]({url})\n\n*Sex:* `{sex}`\n\n*Residence:* `{residence}`\n\n*Occupation:* `{occupation}`\n\n*Kind:* `{kind}`", + "ponyApiEpRes": "*MLP Episode Information for* \"`{input}`\"*:*\n\n*Name:* `{name}`\n*Fandom URL:* [{url}]({url})\n*Season:* `{season}`\n*Episode:* `{episode}`\n*Overall Ep.:* `{overall}`\n*Release date:* `{airdate}`\n*Story by:* `{storyby}`\n*Written by:* `{writtenby}`\n*Storyboard:* `{storyboard}`", "ponyApiNoCharName": "Please provide the character's name.", "ponyApiNoCharFound": "No character found.", "ponyApiNoEpisodeNum": "Please provide the episode's number.", diff --git a/locales/portuguese.json b/locales/portuguese.json index 7dbd1c4..7358d33 100644 --- a/locales/portuguese.json +++ b/locales/portuguese.json @@ -84,7 +84,7 @@ "httpCodeErr": "Ocorreu um erro ao buscar o código HTTP.", "httpCodeNotFound": "Código HTTP não encontrado.", "httpCodeResult": "*Código HTTP*: `{code}`\n*Nome*: `{message}`\n*Descrição*: `{description}`", - "ponyApiCharRes": "*Informações do Personagem de MLP para* `{input}`*:*\n\n*Nome:* `{name}`\n*Apelido:* `{alias}`\n*URL do Fandom:* [{url}]({url})\n*Sexo:* `{sex}`\n*Residência:* `{residence}`\n*Ocupação:* `{occupation}`\n*Tipo:* `{kind}`", + "ponyApiCharRes": "*Informações do Personagem de MLP para* `{input}`*:*\n\n*Nome:* `{name}`\n\n*Apelido:* `{alias}`\n\n*URL do Fandom:* [{url}]({url})\n\n*Sexo:* `{sex}`\n\n*Residência:* `{residence}`\n\n*Ocupação:* `{occupation}`\n\n*Tipo:* `{kind}`", "ponyApiEpRes": "*Informações do Episódio de MLP para* `{input}`*:*\n\n*Nome:* `{name}`\n*URL do Fandom:* [{url}]({url})\n*Temporada:* `{season}`\n*Episódio:* `{episode}`\n*Episódio Geral:* `{overall}`\n*Data de Lançamento:* `{airdate}`\n*História por:* `{storyby}`\n*Escrito por:* `{writtenby}`\n*Storyboard:* `{storyboard}`", "ponyApiNoCharName": "Por favor, forneça o nome do personagem.", "ponyApiNoCharFound": "Nenhum personagem encontrado.", diff --git a/locales/spanish.json b/locales/spanish.json index af5e9b5..61c65c7 100644 --- a/locales/spanish.json +++ b/locales/spanish.json @@ -84,7 +84,7 @@ "httpCodeErr": "Ocurrió un error al buscar el código HTTP.", "httpCodeNotFound": "Código HTTP no encontrado.", "httpCodeResult": "*Código HTTP*: {code}\n*Nombre*: `{message}`\n*Descripción*: {description}", - "ponyApiCharRes": "*Información del Personaje MLP para* `{input}`*:*\n\n*Nombre:* `{name}`\n*Alias:* `{alias}`\n*URL del Fandom:* [{url}]({url})\n*Sexo:* `{sex}`\n*Residencia:* `{residence}`\n*Ocupación:* `{occupation}`\n*Tipo:* `{kind}`", + "ponyApiCharRes": "*Información del Personaje MLP para* `{input}`*:*\n\n*Nombre:* `{name}`\n\n*Alias:* `{alias}`\n\n*URL del Fandom:* [{url}]({url})\n\n*Sexo:* `{sex}`\n\n*Residencia:* `{residence}`\n\n*Ocupación:* `{occupation}`\n\n*Tipo:* `{kind}`", "ponyApiEpRes": "*Información del Episodio MLP para* `{input}`*:*\n\n*Nombre:* `{name}`\n*URL del Fandom:* [{url}]({url})\n*Temporada:* `{season}`\n*Episodio:* `{episode}`\n*Episodio General:* `{overall}`\n*Fecha de Lanzamiento:* `{airdate}`\n*Historia por:* `{storyby}`\n*Escrito por:* `{writtenby}`\n*Storyboard:* `{storyboard}`", "ponyApiNoCharName": "Por favor, proporciona el nombre del personaje.", "ponyApiNoCharFound": "Ningún personaje encontrado.",