From 085e39a5966658c62002c480de5b9585deb2c0db Mon Sep 17 00:00:00 2001
From: dragonfire535 <danielbodendahl@gmail.com>
Date: Tue, 7 Mar 2017 20:56:42 -0500
Subject: [PATCH] Allow apostrophes in Meme Command

---
 commands/imageedit/meme.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/commands/imageedit/meme.js b/commands/imageedit/meme.js
index 93d78976..8d939888 100644
--- a/commands/imageedit/meme.js
+++ b/commands/imageedit/meme.js
@@ -23,17 +23,17 @@ 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("|")) {
-            if(message.content.split(" ").slice(1).join(" ").match(/^[a-zA-Z0-9|.,!?\s]+$/)) {
+            if(message.content.split(" ").slice(1).join(" ").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("|", "");
                 bottomrow = bottomrow.replace("?", "~q");
                 toprow = toprow.replace("?", "~q");
                 let link = "https://memegen.link/" + type + "/" + toprow + "/" + bottomrow + ".jpg";
-                if(bottomrow.length > 80) {
-                    message.channel.sendMessage(":x: Error! Bottom text is over 80 characters!");
-                } else if(toprow.length > 80) {
-                    message.channel.sendMessage(":x: Error! Top text is over 80 characters!");
+                if(bottomrow.length > 100) {
+                    message.channel.sendMessage(":x: Error! Bottom text is over 100 characters!");
+                } else if(toprow.length > 100) {
+                    message.channel.sendMessage(":x: Error! Top text is over 100 characters!");
                 } else {
                     if(memecodes.memecodes[type]) { 
                         message.channel.sendFile(link);
@@ -42,7 +42,7 @@ class MemeCommand extends commando.Command {
                     }
                 }
             } else {
-                message.channel.sendMessage(":x: Error! Only letters, numbers, periods, commas, exclamation points, and question marks are allowed!");
+                message.channel.sendMessage(":x: Error! Only letters, numbers, periods, commas, apostrophes, exclamation points, and question marks are allowed!");
             }
         } else {
             message.channel.sendMessage(":x: Split your two choices with a ' | '!");