From 1a8badd5f42d3070494b7e48327cb0436bd2f83a Mon Sep 17 00:00:00 2001 From: Anthony M <47640864+IDeletedSystem64@users.noreply.github.com> Date: Sat, 6 Feb 2021 12:15:55 -0600 Subject: [PATCH] Fix action command GIF issue (I hope) --- commands/bonk.js | 2 +- commands/cuddle.js | 2 +- commands/kiss.js | 18 ++++++++------ commands/leskiss.js | 2 +- commands/lick.js | 15 ++++++++++-- commands/nom.js | 2 +- commands/pat.js | 2 +- commands/poke.js | 2 +- commands/slap.js | 2 +- commands/snuggle.js | 58 ++++++++++++++++++++++----------------------- 10 files changed, 60 insertions(+), 45 deletions(-) diff --git a/commands/bonk.js b/commands/bonk.js index 073c39c..41c7d5d 100644 --- a/commands/bonk.js +++ b/commands/bonk.js @@ -28,7 +28,7 @@ module.exports = { const embed = { "title": " Bonk", "description": "<@" + taggedUser + ">" + " You have been bonked by <@" + messageAuthor + ">!", - "color": 3272562, + "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" diff --git a/commands/cuddle.js b/commands/cuddle.js index bb945ef..15f1e41 100644 --- a/commands/cuddle.js +++ b/commands/cuddle.js @@ -20,7 +20,7 @@ module.exports = { const embed = { "title": ":heart: Cuddle", "description": "<@" + taggedUser + ">" + " You have been cuddled by " + "<@" + messageAuthor + ">!", - "color": 8311585, + "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" diff --git a/commands/kiss.js b/commands/kiss.js index 37c49c6..2e80494 100644 --- a/commands/kiss.js +++ b/commands/kiss.js @@ -9,12 +9,11 @@ module.exports = { // -------------------------------------- const gifchoices = [ - "https://thumbs.gfycat.com/SlowGlossyBlackcrappie-small.gif", - "https://media0.giphy.com/media/12VXIxKaIEarL2/giphy.gif", - "https://cutewallpaper.org/21/anime-kiss-girl/Anime-Kissing-GIF-Anime-Kissing-Girl-Discover-Share-GIFs.gif", - "https://i.makeagif.com/media/4-29-2017/orH05W.gif", - "https://31.media.tumblr.com/ea7842aad07c00b098397bf4d00723c6/tumblr_n570yg0ZIv1rikkvpo1_500.gif" - + "https://cdn.discordapp.com/attachments/803658122299572255/807671954055626812/kiss5.gif", + "https://cdn.discordapp.com/attachments/803658122299572255/807671956236140554/kiss2.gif", + "https://cdn.discordapp.com/attachments/803658122299572255/807671964599713862/kiss1.gif", + "https://cdn.discordapp.com/attachments/803658122299572255/807671971168387082/kiss4.gif", + "https://cdn.discordapp.com/attachments/803658122299572255/807672017217781840/kiss3.gif" ]; const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); var gif = (gifchoices[index]); @@ -37,10 +36,15 @@ module.exports = { if(!taggedUser) { return message.channel.send({ embed: errorembed}); } + + if(!taggedUser) { + return message.channel.send({ embed: errorembed}); + // Checks if a user was mentioned. If not, returns error message. + } const embed = { "title": ":heart: Kiss", "description": "<@" + taggedUser + ">" + ", You have been kissed by <@" + messageAuthor + ">!", - "color": 8311585, + "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" diff --git a/commands/leskiss.js b/commands/leskiss.js index 45a347d..9412e16 100644 --- a/commands/leskiss.js +++ b/commands/leskiss.js @@ -32,7 +32,7 @@ module.exports = { // --------------------------------------- const errorembed = { "title": "<:NyabotError:697145462347661412> Error", - "color": 13632027, + "color": 9442302, "footer": { "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" diff --git a/commands/lick.js b/commands/lick.js index 19dca35..4851bbf 100644 --- a/commands/lick.js +++ b/commands/lick.js @@ -6,11 +6,22 @@ module.exports = { const messageAuthor = message.author const taggedUser = message.mentions.users.first(); //--------------------------------------------------- + // -------------------------------------- + const gifchoices = [ + "https://cdn.discordapp.com/attachments/803658122299572255/805314244123951114/cef569820773b0f5d54ee34cfa18e1f8.gif", + "https://cdn.lowgif.com/full/2027501b8fa5225c-.gif", + "https://i.gifer.com/36Nx.gif", + "https://media.tenor.com/images/e8bbe712a5f36bbe9545930894b08bf9/tenor.gif" + +]; +const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); +var gif = (gifchoices[index]); +// --------------------------------------- //--------------------------------------------------- const errorembed = { "title": "<:NyabotError:697145462347661412> Error", - "color": 13632027, + "color": 9442302, "footer": { "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" @@ -29,7 +40,7 @@ if(!taggedUser) { } const embed = { - "title": "Lick", + "title": " Lick", "description": "<@" + taggedUser + "> You have been licked by <@" + messageAuthor + ">!", "color": 8311585, "footer": { diff --git a/commands/nom.js b/commands/nom.js index 3449231..4956020 100644 --- a/commands/nom.js +++ b/commands/nom.js @@ -20,7 +20,7 @@ module.exports = { // --------------------------------------- const errorembed = { "title": "<:NyabotError:697145462347661412> Error", - "color": 13632027, + "color": 9442302, "footer": { "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" diff --git a/commands/pat.js b/commands/pat.js index a876ba4..033b062 100644 --- a/commands/pat.js +++ b/commands/pat.js @@ -19,7 +19,7 @@ module.exports = { // --------------------------------------- const errorembed = { "title": "<:NyabotError:697145462347661412> Error", - "color": 13632027, + "color": 9442302, "footer": { "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" diff --git a/commands/poke.js b/commands/poke.js index 1c98e1d..eb04bfb 100644 --- a/commands/poke.js +++ b/commands/poke.js @@ -19,7 +19,7 @@ module.exports = { // --------------------------------------- const errorembed = { "title": "<:NyabotError:697145462347661412> Error", - "color": 13632027, + "color": 9442302, "footer": { "icon_url": "https://images-ext-2.discordapp.net/external/-qaO3jaZLojhEnjrHiKABdXD7gLWqFvdUqHdskNGWhE/https/media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64" diff --git a/commands/slap.js b/commands/slap.js index 78d33b6..0582203 100644 --- a/commands/slap.js +++ b/commands/slap.js @@ -31,7 +31,7 @@ if(!taggedUser) { const embed = { "title": ":anger: Slap", "description": "<@" + taggedUser + "> You have been slapped by <@" + messageAuthor + ">!", - "color": 8311585, + "color": 9442302, "footer": { "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" diff --git a/commands/snuggle.js b/commands/snuggle.js index ce4b82a..4a5f982 100644 --- a/commands/snuggle.js +++ b/commands/snuggle.js @@ -1,36 +1,36 @@ module.exports = { - name: "snuggle", - description: "Snuggle an user!", - execute(client, message, args) { - const messageAuthor = message.author - const taggedUser = message.mentions.users.first(); + name: "snuggle", + description: "Snuggle an user!", + execute(client, message, args) { + const messageAuthor = message.author + const taggedUser = message.mentions.users.first(); + + // -------------------------------------- + const gifchoices = [ + "https://media.discordapp.net/attachments/803658122299572255/806775382995894282/anime-couple-snuggle-gif-5.gif?width=450&height=238", + "https://media.discordapp.net/attachments/803658122299572255/806775411928989726/snuggl1.gif", + "https://cdn.discordapp.com/attachments/803658122299572255/806775422833786911/ImpureDeepAmbushbug-small.gif" - // -------------------------------------- - const gifchoices = [ - "https://media.discordapp.net/attachments/803658122299572255/806775382995894282/anime-couple-snuggle-gif-5.gif?width=450&height=238", - "https://media.discordapp.net/attachments/803658122299572255/806775411928989726/snuggl1.gif", - "https://cdn.discordapp.com/attachments/803658122299572255/806775422833786911/ImpureDeepAmbushbug-small.gif" - - ]; - const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); - var gif = (gifchoices[index]); - // --------------------------------------- + ]; + const index = Math.floor(Math.random() * (gifchoices.length - 1) + 1); + var gif = (gifchoices[index]); + // --------------------------------------- - const embed = { - "title": "<:BlobSnuggleCat:806759753450782731> Snuggle", - "description": "<@" + taggedUser + ">" + " You have been snuggled by " + "<@" + messageAuthor + ">!", - "color": 8311585, - "footer": { - "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", - "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" - }, - "image": { - "url": gif - } + const embed = { + "title": "<:BlobSnuggleCat:806759753450782731> Snuggle", + "description": "<@" + taggedUser + ">" + " You have been snuggled by " + "<@" + messageAuthor + ">!", + "color": 9442302, + "footer": { + "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png", + "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021" + }, + "image": { + "url": gif } + } - message.channel.send({ embed: embed }); - } - } + message.channel.send({ embed: embed }); + } + } \ No newline at end of file