arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-03 23:36:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Meme Changes

Browse Source
This commit is contained in:
Daniel Odendahl Jr
2017-03-22 00:49:52 +00:00
parent 8f012ee415
commit cb7c76cf14
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/imageedit/meme.js
+3 -5
View File
@@ -25,11 +25,9 @@ module.exports = class MemeCommand extends commando.Command {
message.channel.send("**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]+$/)) {
let bottomrow = message.content.toLowerCase().split("|").slice(1).join("-");
let toprow = " " + message.content.toLowerCase().replace(bottomrow, "").split(" ").slice(2).join("-");
toprow = toprow.split("|").join("");
bottomrow = bottomrow.split("?").join("~q");
toprow = toprow.split("?").join("~q");
let memeQuery = message.content.split(" ").slice(1).join("-").split(' | ');
let toprow = memeQuery[0].split("?").join("~q");
let bottomrow = memeQuery[1].split("?").join("~q");
let link = "https://memegen.link/" + type + "/" + toprow + "/" + bottomrow + ".jpg";
if(bottomrow.length > 100) {
message.channel.send(":x: Error! Bottom text is over 100 characters!");
commands/response/choose.js
+1 -1
View File
@@ -25,7 +25,7 @@ module.exports = class ChooseCommand extends commando.Command {
let choice2 = choices[1];
let randomChoice = [choice1, choice2];
randomChoice = randomChoice[Math.floor(Math.random() * randomChoice.length)];
message.channel.send("I choose " + randomChoice);
message.channel.send("I choose " + randomChoice + "!");
} else {
message.channel.send(":x: Split your two choices with a ' | '!");
}