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

Reduce duplicate code in subreddit commands

Browse Source
This commit is contained in:
Dragon Fire
2020-06-08 16:15:19 -04:00
parent 7ff1de7539
commit 5d6557ff76
7 changed files with 22 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/random-img/awwnime.js
+1 -10
View File
@@ -1,6 +1,4 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { formatNumberK } = require('../../util/Util');
module.exports = class AwwnimeCommand extends SubredditCommand {
constructor(client) {
@@ -18,13 +16,6 @@ module.exports = class AwwnimeCommand extends SubredditCommand {
}
generateText(post, subreddit, icon) {
return new MessageEmbed()
.setColor(0xFF4500)
.setAuthor(`r/${subreddit}`, icon, `https://www.reddit.com/r/${subreddit}/`)
.setTitle(post.title)
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`⬆ ${formatNumberK(post.ups)}`);
return this.makeEmbed(post, subreddit, icon);
}
};
commands/random-img/hentai.js
+2 -10
View File
@@ -1,6 +1,5 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { list, formatNumberK } = require('../../util/Util');
const { list } = require('../../util/Util');
const subreddits = require('../../assets/json/hentai');
module.exports = class HentaiCommand extends SubredditCommand {
@@ -36,13 +35,6 @@ module.exports = class HentaiCommand extends SubredditCommand {
}
generateText(post, subreddit, icon) {
return new MessageEmbed()
.setColor(0xFF4500)
.setAuthor(`r/${subreddit}`, icon, `https://www.reddit.com/r/${subreddit}/`)
.setTitle(post.title)
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`⬆ ${formatNumberK(post.ups)}`);
return this.makeEmbed(post, subreddit, icon);
}
};
commands/random-img/meme.js
+2 -10
View File
@@ -1,6 +1,5 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { list, formatNumberK } = require('../../util/Util');
const { list } = require('../../util/Util');
const subreddits = require('../../assets/json/meme');
module.exports = class MemeCommand extends SubredditCommand {
@@ -28,13 +27,6 @@ module.exports = class MemeCommand extends SubredditCommand {
}
generateText(post, subreddit, icon) {
return new MessageEmbed()
.setColor(0xFF4500)
.setAuthor(`r/${subreddit}`, icon, `https://www.reddit.com/r/${subreddit}/`)
.setTitle(post.title)
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`⬆ ${formatNumberK(post.ups)}`);
return this.makeEmbed(post, subreddit, icon);
}
};
commands/random-img/porn.js
+2 -10
View File
@@ -1,6 +1,5 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { list, formatNumberK } = require('../../util/Util');
const { list } = require('../../util/Util');
const subreddits = require('../../assets/json/porn');
module.exports = class PornCommand extends SubredditCommand {
@@ -37,13 +36,6 @@ module.exports = class PornCommand extends SubredditCommand {
}
generateText(post, subreddit, icon) {
return new MessageEmbed()
.setColor(0xFF4500)
.setAuthor(`r/${subreddit}`, icon, `https://www.reddit.com/r/${subreddit}/`)
.setTitle(post.title)
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`⬆ ${formatNumberK(post.ups)}`);
return this.makeEmbed(post, subreddit, icon);
}
};
commands/random-res/subreddit.js
+1 -10
View File
@@ -1,6 +1,4 @@
const SubredditCommandBase = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { shorten, formatNumberK } = require('../../util/Util');
module.exports = class SubredditCommand extends SubredditCommandBase {
constructor(client) {
@@ -25,14 +23,7 @@ module.exports = class SubredditCommand extends SubredditCommandBase {
}
generateText(post, subreddit, icon) {
const embed = new MessageEmbed()
.setColor(0xFF4500)
.setAuthor(`r/${subreddit}`, icon, `https://www.reddit.com/r/${subreddit}/`)
.setTitle(shorten(post.title, 256))
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`⬆ ${formatNumberK(post.score)}`);
const embed = this.makeEmbed(post, subreddit, icon);
if (post.thumbnail && post.thumbnail !== 'self' && post.post_hint !== 'image') {
embed.setThumbnail(post.thumbnail);
}
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "xiao",
"version": "116.8.1",
"version": "116.8.2",
"description": "Your personal server companion.",
"main": "Xiao.js",
"scripts": {
structures/commands/Subreddit.js
+13
View File
@@ -1,5 +1,7 @@
const request = require('node-superfetch');
const Command = require('../Command');
const { MessageEmbed } = require('discord.js');
const { formatNumberK, shorten } = require('../../util/Util');
module.exports = class SubredditCommand extends Command {
constructor(client, info) {
@@ -34,6 +36,17 @@ module.exports = class SubredditCommand extends Command {
throw new Error('The generateText method is required.');
}
makeEmbed(post, subreddit, icon) {
return new MessageEmbed()
.setColor(0xFF4500)
.setAuthor(`r/${subreddit}`, icon, `https://www.reddit.com/r/${subreddit}/`)
.setTitle(shorten(post.title, 256))
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`⬆ ${formatNumberK(post.ups)}`);
}
async random(subreddit, nsfw) {
let icon = null;
const { body } = await request