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

Meme Fix

Browse Source
This commit is contained in:
Daniel Odendahl Jr
2017-03-22 00:56:37 +00:00
parent 94dfe6a0b5
commit 1063b7e3c2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/botinfo/contact.js
+8 -2
View File
@@ -1,5 +1,6 @@
const commando = require('discord.js-commando');
const banlist = require('./banlist.json');
const config = require('../../config.json');
module.exports = class ContactCommand extends commando.Command {
constructor(Client){
@@ -23,11 +24,16 @@ module.exports = class ContactCommand extends commando.Command {
}
console.log("[Command] " + message.content);
let banID = message.author.id;
let messageToReport = message.content.split(" ").slice(1).join(" ");
if (message.author.id === banlist.banned[banID]) {
message.channel.send("Sorry, you've been banned from using this command.");
} else {
this.client.users.get('242699360352206850').send("**" + message.author.username + '#' + message.author.discriminator + " (" + message.author.id + ")" + ":**\n" + message.content.split(" ").slice(1).join(" "));
message.channel.send('Message Sent! Thanks for your support!');
if(messageToReport === '') {
message.channel.send(':x: Error! Please do not report nothing!');
} else {
this.client.users.get(config.owner).send("**" + message.author.username + '#' + message.author.discriminator + " (" + message.author.id + ")" + ":**\n" + messageToReport);
message.channel.send('Message Sent! Thanks for your support!');
}
}
}
};
commands/imageedit/meme.js
+1 -1
View File
@@ -25,7 +25,7 @@ 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 memeQuery = message.content.split(" ").slice(1).join("-").split('-|-');
let memeQuery = message.content.split(" ").slice(2).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";