From 2dff10cfb942eba29577c98035ede05b2a9e63f2 Mon Sep 17 00:00:00 2001 From: dragonfire535 Date: Tue, 7 Mar 2017 18:23:30 -0500 Subject: [PATCH] Meme command regex check --- commands/imageedit/meme.js | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/commands/imageedit/meme.js b/commands/imageedit/meme.js index 15719d47..2d2ebaec 100644 --- a/commands/imageedit/meme.js +++ b/commands/imageedit/meme.js @@ -23,18 +23,22 @@ class MemeCommand extends commando.Command { if(type === "list") { message.channel.sendMessage("**Type Codes:** tenguy, afraid, older, aag, tried, biw, blb, kermit, bd, ch, cbg, wonka, cb, keanu, dsm, live, ants, doge, alwaysonbeat, ermg, facepalm, fwp, fa, fbf, fry, hipster, icanhas, crazypills, mw, noidea, regret, boat, hagrid, sohappy, captain, inigo, iw, ackbar, happening, joker, ive, ll, morpheus, mb, badchoice, mmm, jetpack, red, mordor, oprah, oag, remembers, philosoraptor, jw, patrick, rollsafe, sad-obama, sad-clinton, sadfrog, sad-bush, sad-biden, sad-boehner, saltbae, sarcasticbear, dwight, sb, ss, sf, dodgson, money, sohot, nice, awesome-awkward, awesome, awkward-awesome, awkward, fetch, success, scc, ski, officespace, interesting, toohigh, bs, center, both, winter, xy, buzz, yodawg, uno, yallgot, bad, elf, chosen"); } else if(message.content.includes("|")) { - let bottomrow = message.content.toLowerCase().split("|").slice(1).join("-"); - let toprow = " " + message.content.toLowerCase().replace(bottomrow, "").split(" ").slice(2).join("-"); - toprow = toprow.replace("|", ""); - let link = "https://memegen.link/" + type + "/" + toprow + "/" + bottomrow + ".jpg"; - if(type !== "") { - if(memecodes.memecodes[type]) { - message.channel.sendFile(link); + if(message.content.match(/^[a-zA-Z0-9\s]+$/)) { + let bottomrow = message.content.toLowerCase().split("|").slice(1).join("-"); + let toprow = " " + message.content.toLowerCase().replace(bottomrow, "").split(" ").slice(2).join("-"); + toprow = toprow.replace("|", ""); + let link = "https://memegen.link/" + type + "/" + toprow + "/" + bottomrow + ".jpg"; + if(type !== "") { + if(memecodes.memecodes[type]) { + message.channel.sendFile(link); + } else { + message.channel.sendMessage(":x: Error! Meme type not found!"); + } } else { - message.channel.sendMessage(":x: Error! Meme type not found!"); + message.channel.sendMessage(":x: Error! No meme type set! (View list with ;meme list)"); } } else { - message.channel.sendMessage(":x: Error! No meme type set! (View list with ;meme list)"); + message.channel.sendMessage(":x: Error! Only Letters and Numbers are allowed!"); } } else { message.channel.sendMessage(":x: Split your two choices with a ' | '!");