arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-03 23:36:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in various commands

Browse Source
This commit is contained in:
Dragon Fire
2020-11-07 10:59:00 -05:00
parent 5b5487674f
commit 14c36e5314
7 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/events/horoscope.js
+5
View File
@@ -42,6 +42,7 @@ module.exports = class HoroscopeCommand extends Command {
.setTitle(`Horoscope for ${firstUpperCase(sign)}...`)
.setURL(`https://astrology.tv/horoscope/signs/${sign}/`)
.setFooter('© Kelli Fox, The Astrologer')
.setThumbnail(this.getImageURL(sign))
.setTimestamp()
.setDescription(horoscope);
return msg.embed(embed);
@@ -55,4 +56,8 @@ module.exports = class HoroscopeCommand extends Command {
const $ = cheerio.load(text);
return $('div[class="ct-text-block day-tabs-content_horoscope"]').eq(1).text();
}
getImageURL(sign) {
return `https://astrology.tv/wp-content/uploads/2019/07/astrology_tv_${sign}_cover-768x768.jpg`;
}
};
commands/random-res/superpower.js
+5 -6
View File
@@ -1,7 +1,6 @@
const Command = require('../../structures/Command');
const request = require('node-superfetch');
const { stripIndents } = require('common-tags');
const { shorten } = require('../../util/Util');
module.exports = class SuperpowerCommand extends Command {
constructor(client) {
@@ -32,7 +31,7 @@ module.exports = class SuperpowerCommand extends Command {
const article = await this.fetchSuperpower(id);
return msg.reply(stripIndents`
Your superpower is... **${article.title}**!
_${shorten(article.content.map(section => section.text).join('\n\n'), 1950)}_
_${article.abstract}_
`);
} catch (err) {
return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`);
@@ -41,7 +40,7 @@ module.exports = class SuperpowerCommand extends Command {
async random() {
const { body } = await request
.get('http://powerlisting.wikia.com/api.php')
.get('http://powerlisting.fandom.com/api.php')
.query({
action: 'query',
list: 'random',
@@ -55,8 +54,8 @@ module.exports = class SuperpowerCommand extends Command {
async fetchSuperpower(id) {
const { body } = await request
.get('http://powerlisting.wikia.com/api/v1/Articles/AsSimpleJson/')
.query({ id });
return body.sections[0];
.get('https://powerlisting.fandom.com/api/v1/Articles/Details')
.query({ ids: id });
return body.items[id.toString()];
}
};
commands/search/mayo-clinic.js
+1 -1
View File
@@ -66,7 +66,7 @@ module.exports = class MayoClinicCommand extends Command {
return {
name: $('h1').first().text().trim(),
url: location,
description: $('p').first().text().trim()
description: $('p').eq(2).text().trim()
};
}
return location;
commands/search/poem.js
+2 -1
View File
@@ -1,6 +1,7 @@
const Command = require('../../structures/Command');
const request = require('node-superfetch');
const { html } = require('common-tags');
const { shorten } = require('../../util/Util');
module.exports = class PoemCommand extends Command {
constructor(client) {
@@ -42,7 +43,7 @@ module.exports = class PoemCommand extends Command {
const data = body[0];
return msg.say(html`
**${data.title}** by **${data.author}**
${data.lines.join('\n')}
${shorten(data.lines.join('\n'), 1750)}
`);
} catch (err) {
if (err.status === 404) return msg.say('Could not find any results.');
commands/search/pornhub.js
+1 -1
View File
@@ -43,7 +43,7 @@ module.exports = class PornhubCommand extends Command {
.query({ search: query });
if (text.includes('<div class="noResultsWrapper">')) return null;
const $ = cheerio.load(text);
const video = $('li[class="pcVideoListItem js-pop videoblock videoBox"]').eq(5);
const video = $('li[class="pcVideoListItem js-pop videoblock videoBox]').eq(5);
return `https://www.pornhub.com/view_video.php?viewkey=${video.attr('_vkey')}`;
}
};
commands/search/wikia.js
+8 -9
View File
@@ -1,7 +1,6 @@
const Command = require('../../structures/Command');
const { MessageEmbed } = require('discord.js');
const request = require('node-superfetch');
const { shorten } = require('../../util/Util');
module.exports = class WikiaCommand extends Command {
constructor(client) {
@@ -44,19 +43,19 @@ module.exports = class WikiaCommand extends Command {
.setColor(0x002D54)
.setTitle(data.title)
.setURL(url)
.setAuthor('Wikia', 'https://i.imgur.com/15A34JT.png', 'http://www.wikia.com/fandom')
.setDescription(shorten(data.content.map(section => section.text).join('\n\n')))
.setThumbnail(data.images.length ? data.images[0].src : null);
.setAuthor('FANDOM', 'https://i.imgur.com/15A34JT.png', 'https://www.fandom.com/')
.setDescription(data.abstract)
.setThumbnail(data.thumbnail);
return msg.embed(embed);
} catch (err) {
if (err.status === 404) return msg.say('Could not find any results');
if (err.status === 404) return msg.say('Could not find any results.');
return msg.say(`Oh no, an error occurred: \`${err.message}\`. Perhaps you entered an invalid wiki?`);
}
}
async search(wiki, query) {
const { body } = await request
.get(`https://${wiki}.wikia.com/api/v1/Search/List/`)
.get(`https://${wiki}.fandom.com/api/v1/Search/List/`)
.query({
query,
limit: 1,
@@ -68,8 +67,8 @@ module.exports = class WikiaCommand extends Command {
async fetchArticle(wiki, id) {
const { body } = await request
.get(`https://${wiki}.wikia.com/api/v1/Articles/AsSimpleJson/`)
.query({ id });
return body.sections[0];
.get(`https://${wiki}.fandom.com/api/v1/Articles/Details`)
.query({ ids: id });
return body.items[id.toString()];
}
};
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "xiao",
"version": "119.38.1",
"version": "119.38.2",
"description": "Your personal server companion.",
"main": "Xiao.js",
"scripts": {