diff --git a/functions/!DetectMessageType.js b/functions/!DetectMessageType.js index 2582ba4..1b06788 100644 --- a/functions/!DetectMessageType.js +++ b/functions/!DetectMessageType.js @@ -6,6 +6,7 @@ const fetch = require('node-fetch'); //Import the FETCH API const cat = require('./cmd-cat.js') const poll = require('./cmd-poll.js') const gay = require('./cmd-gay.js') +const catpion = require('./cmd-catpion.js') const nerdreact = require('./react-nerd.js') const clownreact = require('./react-clown.js') const wreact = require('./react-w.js') @@ -29,6 +30,10 @@ module.exports = async (message, author, guild, client) => { return gay(message, author, guild, client) } + if(message.content.includes("cmd captioncat")){ + return catpion(message, author, guild, client) + } + if(message.content.includes("convert image to gif")){ return togif(message, author, guild, client) } diff --git a/functions/Help.js b/functions/Help.js index 7d27738..9ad7d80 100644 --- a/functions/Help.js +++ b/functions/Help.js @@ -15,7 +15,7 @@ module.exports = async (message, author, guild, client) => { const embedcommands = new Discord.MessageEmbed() .setColor("YELLOW") .setAuthor("commands", client.user.displayAvatarURL()) - .setDescription("sexbot also has some useful commands!\n \n```@sexbot cmd cat - Get a random cat image\n@sexbot cmd gay - Become gay\n@sexbot poll - Create a poll```\n```@sexbot convert image to gif \n@sexbot convert gif to image \n@sexbot convert video to gif```\n```@sexbot react nerd \n@sexbot react clown \n@sexbot react l \n@sexbot react w ```") + .setDescription("sexbot also has some useful commands!\n \n```@sexbot cmd cat - Get a random cat image\n@sexbot cmd captioncat - Generate a cat image that says something\n@sexbot cmd gay - Become gay\n@sexbot poll - Create a poll```\n```@sexbot convert image to gif \n@sexbot convert gif to image \n@sexbot convert video to gif```\n```@sexbot react nerd \n@sexbot react clown \n@sexbot react l \n@sexbot react w ```") message.lineReplyNoMention(embedhelp) message.channel.send(embedcommands) diff --git a/functions/cmd-catpion.js b/functions/cmd-catpion.js new file mode 100644 index 0000000..063f701 --- /dev/null +++ b/functions/cmd-catpion.js @@ -0,0 +1,27 @@ +const Discord = require('discord.js') //Import Discord API +require('discord-inline-reply'); //Import inline replies for Discord API +const fetch = require('node-fetch'); //Import the FETCH API + +module.exports = async (message, author, guild, client) => { + var content = message.content.replace(`<@${client.user.id}> `, '') + content = content.replace("cmd captioncat ", '') + fetch(`https://cataas.com/cat/cute/says/${content}?json=true`) + .then((response) => response.json()) + .then((data) => { + const embedload = new Discord.MessageEmbed() + .setColor("GREY") + .setAuthor("cmd captioncat", client.user.displayAvatarURL()) + .setDescription(" *Loading...*") + + const embedresult = new Discord.MessageEmbed() + .setColor("2f3136") + .setAuthor("cmd captioncat", client.user.displayAvatarURL()) + .setImage(`https://cataas.com${data.url}`) + + message.lineReply(embedload).then(m => { + setTimeout(function(){ + m.edit(':3', embedresult) + }, 1000); + }) + }); +} \ No newline at end of file diff --git a/index.js b/index.js index 21479e7..8900726 100644 --- a/index.js +++ b/index.js @@ -5,18 +5,18 @@ const client = new Client(); //New Discord client const botconfig = require('./data/botconfig.json') //Login info for the bot, you will have to provide your own info there client.on("ready", () => { - console.log(`The bot is online!`) - - client.user.setActivity(`${client.guilds.cache.size} servers • discord.gg/memee`, { + console.log(`The bot is online!`) + + client.user.setActivity(`${client.guilds.cache.size} servers • discord.gg/memee`, { + type: "WATCHING" + }); +}); + +client.on("guildCreate", function(guild){ + client.user.setActivity(`${client.guilds.cache.size} servers • discord.gg/memee`, { type: "WATCHING" }); - }); - - client.on("guildCreate", function(guild){ - client.user.setActivity(`${client.guilds.cache.size} servers • discord.gg/memee`, { - type: "WATCHING" - }); - }); +}); client.on("message", async (message) => { const DetectMessageType = require('./functions/!DetectMessageType.js') diff --git a/package-lock.json b/package-lock.json index e748fbb..2efc7f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "sexbot v3", + "name": "sexbot", "lockfileVersion": 2, "requires": true, "packages": {