diff --git a/README.md b/README.md index 71fbc3de..3beaf51c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Xiao is a Discord bot coded in JavaScript with 300 commands, she is one of the most feature-filled bots out there, and formerly served over 10,000 servers with a uniquely devoted fanbase. -## Commands (295) +## Commands (296) ### Utility: * **prefix**: Shows or sets the command prefix. @@ -150,6 +150,7 @@ served over 10,000 servers with a uniquely devoted fanbase. * **pokedex**: Searches the Pokédex for a Pokémon. * **recipe**: Searches for recipes based on your query. * **rotten-tomatoes**: Searches Rotten Tomatoes for your query. +* **rule-of-the-internet**: Responds with a rule of the internet. * **safebooru**: Responds with an image from Safebooru, with optional query. * **spoopy-link**: Determines if a link is spoopy or not. * **stack-overflow**: Searches Stack Overflow for your query. diff --git a/assets/json/rule-of-the-internet.json b/assets/json/rule-of-the-internet.json new file mode 100644 index 00000000..3ba3b472 --- /dev/null +++ b/assets/json/rule-of-the-internet.json @@ -0,0 +1,49 @@ +[ + "Do not talk about /b/", + "Do NOT talk about /b/", + "We are Anonymous", + "Anonymous is legion", + "Anonymous never forgives", + "Anonymous can be a horrible, senseless, uncaring monster", + "Anonymous is still able to deliver", + "There are no real rules about posting", + "There are no real rules about moderation either - enjoy your ban", + "If you enjoy any rival sites - DON'T", + "All your carefully picked arguments can easily be ignored", + "Anything you say can and will be used against you", + "Anything you say can be turned into something else - fixed", + "Do not argue with trolls - it means that they win", + "The harder you try the harder you will fail", + "If you fail in epic proportions, it may just become a winning failure", + "Every win fails eventually", + "Everything that can be labeled can be hated", + "The more you hate it the stronger it gets", + "Nothing is to be taken seriously", + "Original content is original only for a few seconds before getting old", + "Copypasta is made to ruin every last bit of originality", + "Copypasta is made to ruin every last bit of originality", + "Every repost is always a repost of a repost", + "Relation to the original topic decreases with every single post", + "Any topic can be easily turned into something totally unrelated", + "Always question a person's sexual preferences without any real reason", + "Always question a person's gender - just in case it's really a man", + "In the internet all girls are men and all kids are undercover FBI agents", + "There are no girls on the internet", + "TITS or GTFO - the choice is yours", + "You must have pictures to prove your statements", + "Lurk more - it's never enough", + "There is porn of it, no exceptions", + "If no porn is found at the moment, it will be made", + "There will always be even more fucked up shit than what you just saw", + "You cannot divide by zero (just because the calculator says so)", + "No real limits of any kind apply here - not even the sky", + "CAPSLOCK IS CRUISE CONTROL FOR COOL", + "EVEN WITH CRUISE CONTROL YOU STILL HAVE TO STEER", + "Desu isn't funny. Seriously guys. It's worse than Chuck Norris jokes.", + "Nothing is Sacred", + "The more beautiful and pure a thing is - the more satisfying it is to corrupt it", + "Even one positive comment about Japanese things can make you a weeaboo", + "When one sees a lion, one must get into the car.", + "There is always furry porn of it.", + "The pool is always closed." +] diff --git a/commands/number-edit/units.js b/commands/number-edit/units.js index 4530b7ba..d6a8b573 100644 --- a/commands/number-edit/units.js +++ b/commands/number-edit/units.js @@ -33,8 +33,8 @@ module.exports = class UnitsCommand extends Command { run(msg, { base, target, amount }) { try { - const value = math.unit(amount, base).to(target).toString(); - return msg.say(value); + const value = math.unit(amount, base).toNumber(target); + return msg.say(`${amount} ${base} is ${value} ${target}.`); } catch (err) { return msg.say('Either an invalid unit type was provided or the unit types do not match.'); } diff --git a/commands/search/rule-of-the-internet.js b/commands/search/rule-of-the-internet.js new file mode 100644 index 00000000..db0591d9 --- /dev/null +++ b/commands/search/rule-of-the-internet.js @@ -0,0 +1,29 @@ +const { Command } = require('discord.js-commando'); +const rules = require('../../assets/json/rule-of-the-internet'); + +module.exports = class RuleOfTheInternetCommand extends Command { + constructor(client) { + super(client, { + name: 'rule-of-the-internet', + aliases: ['rules-of-the-internet', 'internet-rule', 'rule'], + group: 'search', + memberName: 'rule-of-the-internet', + description: 'Responds with a rule of the internet.', + args: [ + { + key: 'rule', + prompt: 'Which rule would you like to view?', + type: 'integer', + default: '', + min: 1, + max: rules.length + } + ] + }); + } + + run(msg, { rule }) { + if (!rule) return msg.say({ files: ['https://i.imgur.com/vGw29EQ.jpg'] }); + return msg.say(`**Rule #${rule}**: ${rules[rule - 1]}`); + } +}; diff --git a/package.json b/package.json index 73a81d08..447696fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "70.1.1", + "version": "70.2.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {