From 1caa7352eb4804e21cf638d6dbdc819b5eceaef8 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Fri, 5 Jun 2020 00:19:58 -0400 Subject: [PATCH] Fix anime-character command HTML --- README.md | 2 +- commands/search/{character.js => anime-character.js} | 10 +++++----- package.json | 2 +- util/Util.js | 7 ++++--- 4 files changed, 11 insertions(+), 10 deletions(-) rename commands/search/{character.js => anime-character.js} (91%) diff --git a/README.md b/README.md index 6753642b..055af8d4 100644 --- a/README.md +++ b/README.md @@ -389,10 +389,10 @@ Total: 456 ### Search: +* **anime-character:** Searches AniList for your query, getting character results. * **anime:** Searches AniList for your query, getting anime results. * **book:** Searches Google Books for a book. * **bulbapedia:** Searches Bulbapedia for your query. -* **character:** Searches AniList for your query, getting character results. * **company:** Responds with the name and logo of a company. * **country:** Responds with information on a country. * **danbooru:** Responds with an image from Danbooru, with optional query. (NSFW) diff --git a/commands/search/character.js b/commands/search/anime-character.js similarity index 91% rename from commands/search/character.js rename to commands/search/anime-character.js index d50b1535..4d957de3 100644 --- a/commands/search/character.js +++ b/commands/search/anime-character.js @@ -44,13 +44,13 @@ const types = { MANGA: 'Manga' }; -module.exports = class CharacterCommand extends Command { +module.exports = class AnimeCharacterCommand extends Command { constructor(client) { super(client, { - name: 'character', - aliases: ['anilist-character', 'anime-character', 'manga-character', 'manga-char', 'ani-char', 'char'], + name: 'anime-character', + aliases: ['anilist-character', 'character', 'manga-character', 'manga-char', 'ani-char', 'char'], group: 'search', - memberName: 'character', + memberName: 'anime-character', description: 'Searches AniList for your query, getting character results.', clientPermissions: ['EMBED_LINKS'], credit: [ @@ -82,7 +82,7 @@ module.exports = class CharacterCommand extends Command { .setURL(character.siteUrl) .setThumbnail(character.image.large || character.image.medium || null) .setTitle(`${character.name.first || ''}${character.name.last ? ` ${character.name.last}` : ''}`) - .setDescription(character.description ? cleanAnilistHTML(character.description) : 'No description.') + .setDescription(character.description ? cleanAnilistHTML(character.description, false) : 'No description.') .addField('❯ Appearances', character.media.edges.map(edge => { const title = edge.node.title.english || edge.node.title.userPreferred; return embedURL(`${title} (${types[edge.node.type]})`, edge.node.siteUrl); diff --git a/package.json b/package.json index b8915cf2..98cac466 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "116.1.2", + "version": "116.1.3", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { diff --git a/util/Util.js b/util/Util.js index 0b602e7a..01e9e98c 100644 --- a/util/Util.js +++ b/util/Util.js @@ -175,9 +175,10 @@ module.exports = class Util { return false; } - static cleanAnilistHTML(html) { - let clean = html - .replace(/\r|\n|\f/g, '') + static cleanAnilistHTML(html, removeLineBreaks = true) { + let clean = html; + if (removeLineBreaks) clean = clean.replace(/\r|\n|\f/g, ''); + clean = clean .replace(/
/g, '\n') .replace(/'/g, '\'') .replace(/"/g, '"')