diff --git a/assets/json/meme.json b/assets/json/meme.json index 683d6cc2..e1106fec 100644 --- a/assets/json/meme.json +++ b/assets/json/meme.json @@ -2,15 +2,15 @@ "memes", "dankmemes", "surrealmemes", - "MemeEconomy", + "memeeconomy", "wholesomememes", "tumblr", "me_irl", "meirl", "blessedimages", - "HistoryMemes", - "WhitePeopleTwitter", + "historymemes", + "whitepeopletwitter", "coaxedintoasnafu", - "Animemes", + "animemes", "programmerhumor" ] diff --git a/commands/random/meme.js b/commands/random/meme.js index 929c7eab..76745f24 100644 --- a/commands/random/meme.js +++ b/commands/random/meme.js @@ -1,6 +1,7 @@ const Command = require('../../structures/Command'); const request = require('node-superfetch'); const { stripIndents } = require('common-tags'); +const { list } = require('../../util/Util'); const subreddits = require('../../assets/json/meme'); module.exports = class MemeCommand extends Command { @@ -10,12 +11,22 @@ module.exports = class MemeCommand extends Command { group: 'random', memberName: 'meme', description: 'Responds with a random meme.', - clientPermissions: ['ATTACH_FILES'] + details: `**Subreddits**: ${subreddits.join(', ')}`, + clientPermissions: ['ATTACH_FILES'], + args: [ + { + key: 'subreddit', + prompt: `What subreddit do you want to get memes from? Either ${list(subreddits, 'or')}.`, + type: 'string', + oneOf: subreddits, + default: () => subreddits[Math.floor(Math.random() * subreddits.length)], + parse: subreddit => subreddit.toLowerCase() + } + ] }); } - async run(msg) { - const subreddit = subreddits[Math.floor(Math.random() * subreddits.length)]; + async run(msg, { subreddit }) { try { const { body } = await request .get(`https://www.reddit.com/r/${subreddit}/top.json`) diff --git a/package.json b/package.json index ff5a770a..0d1a2c7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "90.3.4", + "version": "90.3.5", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {