diff --git a/README.md b/README.md index 4a6a8e43..0ce273c7 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,6 @@ Xiao is a Discord bot coded in JavaScript with * **butt:** Determines a user's butt quality. * **coolness:** Determines a user's coolness. -* **dick:** Determines your dick size. * **guess-looks:** Guesses what a user looks like. * **iq:** Determines a user's IQ. * **psycho-pass:** Determines your Crime Coefficient. @@ -191,11 +190,9 @@ Xiao is a Discord bot coded in JavaScript with * **book:** Searches Google Books for a book. * **bulbapedia:** Searches Bulbapedia for your query. * **character:** Searches AniList for your query, getting character results. -* **danbooru:** Responds with an image from Danbooru, with optional query. * **define:** Defines a word. * **derpibooru:** Responds with an image from Derpibooru. * **deviantart:** Responds with an image from a DeviantArt section, with optional query. -* **flickr:** Searches Flickr for your query. * **giphy:** Searches Giphy for your query. * **github:** Responds with information on a GitHub repository. * **google-autofill:** Responds with a list of the Google Autofill results for a particular query. @@ -298,7 +295,6 @@ Xiao is a Discord bot coded in JavaScript with * **achievement:** Sends a Minecraft achievement with the text of your choice. * **approved:** Draws an "approved" stamp over an image or a user's avatar. -* **brazzers:** Draws an image with the Brazzers logo in the corner. * **circle:** Draws an image or a user's avatar as a circle. * **color:** Sends an image of the color you choose. * **contrast:** Draws an image or a user's avatar but with contrast. @@ -431,6 +427,13 @@ Xiao is a Discord bot coded in JavaScript with * **scientific-notation:** Converts a number to scientific notation. * **units:** Converts units to/from other units. +### NSFW: + +* **brazzers:** Draws an image with the Brazzers logo in the corner. +* **danbooru:** Responds with an image from Danbooru, with optional query. +* **dick:** Determines your dick size. +* **flickr:** Searches Flickr for your query... Maybe. + ### Other: * **cleverbot:** Talk to Cleverbot. diff --git a/Xiao.js b/Xiao.js index 4e69c203..7fa22a8e 100644 --- a/Xiao.js +++ b/Xiao.js @@ -31,6 +31,7 @@ client.registry ['meme-gen', 'Meme Generators'], ['text-edit', 'Text Manipulation'], ['number-edit', 'Number Manipulation'], + ['nsfw', 'NSFW'], ['other', 'Other'], ['roleplay', 'Roleplay'] ]) diff --git a/commands/image-edit/brazzers.js b/commands/nsfw/brazzers.js similarity index 98% rename from commands/image-edit/brazzers.js rename to commands/nsfw/brazzers.js index 3b4c5be3..321c2f4b 100644 --- a/commands/image-edit/brazzers.js +++ b/commands/nsfw/brazzers.js @@ -7,9 +7,10 @@ module.exports = class BrazzersCommand extends Command { constructor(client) { super(client, { name: 'brazzers', - group: 'image-edit', + group: 'nsfw', memberName: 'brazzers', description: 'Draws an image with the Brazzers logo in the corner.', + nsfw: true, throttling: { usages: 1, duration: 10 diff --git a/commands/search/danbooru.js b/commands/nsfw/danbooru.js similarity index 96% rename from commands/search/danbooru.js rename to commands/nsfw/danbooru.js index 685bf8a9..44b78b98 100644 --- a/commands/search/danbooru.js +++ b/commands/nsfw/danbooru.js @@ -5,7 +5,8 @@ module.exports = class DanbooruCommand extends Command { constructor(client) { super(client, { name: 'danbooru', - group: 'search', + aliases: ['hentai'], + group: 'nsfw', memberName: 'danbooru', description: 'Responds with an image from Danbooru, with optional query.', nsfw: true, diff --git a/commands/seeded/dick.js b/commands/nsfw/dick.js similarity index 94% rename from commands/seeded/dick.js rename to commands/nsfw/dick.js index 6a37b376..942ecdaa 100644 --- a/commands/seeded/dick.js +++ b/commands/nsfw/dick.js @@ -5,8 +5,8 @@ module.exports = class DickCommand extends Command { constructor(client) { super(client, { name: 'dick', - aliases: ['dick-size', 'penis', 'penis-size', 'pee-pee', 'pee-pee-size'], - group: 'seeded', + aliases: ['dick-size', 'penis', 'penis-size', 'pee-pee', 'pee-pee-size', 'cock', 'cock-size'], + group: 'nsfw', memberName: 'dick', description: 'Determines your dick size.', nsfw: true, diff --git a/commands/search/flickr.js b/commands/nsfw/flickr.js similarity index 93% rename from commands/search/flickr.js rename to commands/nsfw/flickr.js index e4aa8508..14b37e4c 100644 --- a/commands/search/flickr.js +++ b/commands/nsfw/flickr.js @@ -6,9 +6,9 @@ module.exports = class FlickrCommand extends Command { constructor(client) { super(client, { name: 'flickr', - group: 'search', + group: 'nsfw', memberName: 'flickr', - description: 'Searches Flickr for your query.', + description: 'Searches Flickr for your query... Maybe.', nsfw: true, credit: [ { diff --git a/package.json b/package.json index ec164615..eca74646 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "109.4.2", + "version": "109.5.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { @@ -40,7 +40,7 @@ "discord.js-commando": "github:discordjs/Commando", "dotenv": "^8.2.0", "gifencoder": "^2.0.1", - "mathjs": "^6.2.5", + "mathjs": "^6.4.0", "moment": "^2.24.0", "moment-duration-format": "^2.3.2", "moment-timezone": "^0.5.27", @@ -51,7 +51,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "eslint": "^6.7.2", + "eslint": "^6.8.0", "eslint-config-amber": "^2.0.1", "eslint-plugin-json": "^2.0.1" },