Supositware/Haha-Yes
2
1
Fork 1
Code Issues Pull requests Projects Releases Activity

Merge branch 'master' of https://gitlab.com/loicbersier/discordbot

Browse source
This commit is contained in:
Loïc Bersier 2019-07-05 19:04:16 +02:00
commit 082bc340b3
6 changed files with 143 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands/general/tweet.js
View file

@ -43,7 +43,8 @@ class tweetCommand extends Command {
return message.channel.send('You have been blacklisted from this command... be less naughty next time.'); return message.channel.send('You have been blacklisted from this command... be less naughty next time.');
} }
let text = args.text; // remove zero width space
let text = args.text.replace('​', '');
if (!text) if (!text)
return; return;
@ -70,7 +71,7 @@ class tweetCommand extends Command {
.setAuthor(message.author.username, message.author.displayAvatarURL()) .setAuthor(message.author.username, message.author.displayAvatarURL())
.setDescription(args.text) .setDescription(args.text)
.addField('Link', `https://twitter.com/HahaYesDB/status/${tweetid}`) .addField('Link', `https://twitter.com/HahaYesDB/status/${tweetid}`)
.setFooter(`Tweet ID: ${tweetid} | Author ID: ${message.author.id}`) .setFooter(`Tweet ID: ${tweetid} | Author ID: ${message.author.id} | Guild ID: ${message.guild.id}`)
.setTimestamp(); .setTimestamp();
channel.send({embed: Embed}); channel.send({embed: Embed});

2
event/inhibitors/blacklist.js
View file

@ -8,7 +8,7 @@ class BlacklistInhibitor extends Inhibitor {
} }
async exec(message) { async exec(message) {
const blacklist = ['501856229123948545', '497730155691638784', '29476879240658944', '294768792406589440']; const blacklist = ['501856229123948545', '497730155691638784', '29476879240658944', '294768792406589440', '530399670728392737', '595102888796356628'];
return blacklist.includes(message.author.id); return blacklist.includes(message.author.id);
} }
} }

2
event/inhibitors/serverblacklist.js
View file

@ -8,7 +8,7 @@ class serverblacklistInhibitor extends Inhibitor {
} }
async exec(message) { async exec(message) {
const blacklist = []; const blacklist = ['595100178915262464'];
return blacklist.includes(message.guild.id); return blacklist.includes(message.guild.id);
} }
} }

235
event/listeners/message.js
View file

@ -42,146 +42,137 @@ class messageListener extends Listener {
} }
} }
// User autoresponse // User autoresponse
if (fs.existsSync(`./tag/${message.guild.id}.json`)) { if (fs.existsSync(`./tag/${message.guild.id}.json`)) {
let customresponse = require(`../../tag/${message.guild.id}.json`); let customresponse = reload(`../../tag/${message.guild.id}.json`);
try { if(customresponse[message_content]) {
if(customresponse[message_content]) { let text = customresponse[message_content];
let text = customresponse[message_content]; if (text.includes('[ban]')) {
if (text.includes('[ban]')) { message.member.ban('Tag ban :^)');
message.member.ban('Tag ban :^)'); } else if (text.includes('[kick]')) {
} else if (text.includes('[kick]')) { message.member.kick('Tag kick :^)');
message.member.kick('Tag kick :^)'); } else if (text.includes('[delete]')) {
} else if (text.includes('[delete]')) { message.delete('Tag delete :^)');
message.delete('Tag delete :^)'); }
}
text = rand.random(text, message); text = rand.random(text, message);
let attach = ''; let attach = '';
if (text.includes('[attach:')) { if (text.includes('[attach:')) {
attach = text.split(/(\[attach:.*?])/); attach = text.split(/(\[attach:.*?])/);
for (let i = 0, l = attach.length; i < l; i++) { for (let i = 0, l = attach.length; i < l; i++) {
if (attach[i].includes('[attach:')) { if (attach[i].includes('[attach:')) {
attach = attach[i].replace('[attach:', '').slice(0, -1); attach = attach[i].replace('[attach:', '').slice(0, -1);
i = attach.length; i = attach.length;
}
}
text = text.replace(/(\[attach:.*?])/, '');
}
// THIS SECTION IS VERY VERY BAD MUST CHANGE
if (text.includes('[embed]')) {
text = text.replace(/\[embed\]/, ' ');
let title = '';
let desc = '';
let image;
let thumbnail;
let footer = '';
let color;
if (text.includes('[embedImage:')) {
image = text.split(/(\[embedImage:.*?])/);
for (let i = 0, l = image.length; i < l; i++) {
if (image[i].includes('[embedImage:')) {
image = image[i].replace('[embedImage:', '').slice(0, -1);
text = text.replace(/(\[embedimage:.*?])/g, '');
i = image.length;
} }
} }
text = text.replace(/(\[attach:.*?])/, '');
} }
// THIS SECTION IS VERY VERY BAD MUST CHANGE
if (text.includes('[embed]')) {
text = text.replace(/\[embed\]/, ' ');
let title = '';
let desc = '';
let image;
let thumbnail;
let footer = '';
let color;
if (text.includes('[embedImage:')) {
image = text.split(/(\[embedImage:.*?])/);
for (let i = 0, l = image.length; i < l; i++) {
if (image[i].includes('[embedImage:')) {
image = image[i].replace('[embedImage:', '').slice(0, -1);
text = text.replace(/(\[embedimage:.*?])/g, '');
i = image.length;
}
}
}
if (text.includes('[embedThumbnail:')) { if (text.includes('[embedThumbnail:')) {
thumbnail = text.split(/(\[embedThumbnail:.*?])/); thumbnail = text.split(/(\[embedThumbnail:.*?])/);
for (let i = 0, l = thumbnail.length; i < l; i++) { for (let i = 0, l = thumbnail.length; i < l; i++) {
if (thumbnail[i].includes('[embedThumbnail:')) { if (thumbnail[i].includes('[embedThumbnail:')) {
thumbnail = thumbnail[i].replace('[embedThumbnail:', '').slice(0, -1); thumbnail = thumbnail[i].replace('[embedThumbnail:', '').slice(0, -1);
text = text.replace(/(\[embedThumbnail:.*?])/g, ''); text = text.replace(/(\[embedThumbnail:.*?])/g, '');
i = thumbnail.length; i = thumbnail.length;
}
} }
} }
if (text.includes('[embedColor:')) {
color = text.split(/(\[embedColor:.*?])/);
for (let i = 0, l = color.length; i < l; i++) {
if (color[i].includes('[embedColor:')) {
color = color[i].replace('[embedColor:', '').slice(0, -1);
text = text.replace(/(\[embedColor:.*?])/g, '');
i = color.length;
}
}
}
if (text.includes('[embedTitle:')) {
title = text.split(/(\[embedTitle:.*?])/);
for (let i = 0, l = title.length; i < l; i++) {
if (title[i].includes('[embedTitle:')) {
title = title[i].replace('[embedTitle:', '').slice(0, -1);
text = text.replace(/(\[embedTitle:.*?])/g, '');
i = title.length;
}
}
}
if (text.includes('[embedFooter:')) {
footer = text.split(/(\[embedFooter:.*?])/);
for (let i = 0, l = footer.length; i < l; i++) {
if (footer[i].includes('[embedFooter:')) {
footer = footer[i].replace('[embedFooter:', '').slice(0, -1);
text = text.replace(/(\[embedFooter:.*?])/g, '');
i = footer.length;
}
}
}
if (text.includes('[embedDesc:')) {
desc = text.split(/(\[embedDesc:.*?])/);
for (let i = 0, l = desc.length; i < l; i++) {
if (desc[i].includes('[embedDesc:')) {
desc = desc[i].replace('[embedDesc:', '').slice(0, -1);
i = desc.length;
}
}
}
const embed = new MessageEmbed()
.setColor(color)
.setTitle(title)
.setImage(image)
.setThumbnail(thumbnail)
.setDescription(desc)
.setFooter(footer)
.setTimestamp();
if (attach) {
return message.channel.send(embed, {files: [attach]});
} else {
return message.channel.send(embed);
}
} }
if (text.includes('[embedColor:')) {
color = text.split(/(\[embedColor:.*?])/);
for (let i = 0, l = color.length; i < l; i++) {
if (color[i].includes('[embedColor:')) {
color = color[i].replace('[embedColor:', '').slice(0, -1);
text = text.replace(/(\[embedColor:.*?])/g, '');
i = color.length;
}
}
}
if (text.includes('[embedTitle:')) {
title = text.split(/(\[embedTitle:.*?])/);
for (let i = 0, l = title.length; i < l; i++) {
if (title[i].includes('[embedTitle:')) {
title = title[i].replace('[embedTitle:', '').slice(0, -1);
text = text.replace(/(\[embedTitle:.*?])/g, '');
i = title.length;
}
}
}
if (text.includes('[embedFooter:')) {
footer = text.split(/(\[embedFooter:.*?])/);
for (let i = 0, l = footer.length; i < l; i++) {
if (footer[i].includes('[embedFooter:')) {
footer = footer[i].replace('[embedFooter:', '').slice(0, -1);
text = text.replace(/(\[embedFooter:.*?])/g, '');
i = footer.length;
}
}
}
if (text.includes('[embedDesc:')) {
desc = text.split(/(\[embedDesc:.*?])/);
for (let i = 0, l = desc.length; i < l; i++) {
if (desc[i].includes('[embedDesc:')) {
desc = desc[i].replace('[embedDesc:', '').slice(0, -1);
i = desc.length;
}
}
}
const embed = new MessageEmbed()
.setColor(color)
.setTitle(title)
.setImage(image)
.setThumbnail(thumbnail)
.setDescription(desc)
.setFooter(footer)
.setTimestamp();
if (attach) { if (attach) {
return message.channel.send(text, {files: [attach]}); return message.channel.send(embed, {files: [attach]});
} else { } else {
return message.channel.send(text); return message.channel.send(embed);
} }
} }
} catch (err) { if (attach) {
null; return message.channel.send(text, {files: [attach]});
} } else {
return message.channel.send(text);
}
}
} }
} }
} }
} }

46
event/listeners/messageReactionAdd.js
View file

@ -15,38 +15,40 @@ class MessageReactionAddListener extends Listener {
async exec(reaction, user) { async exec(reaction, user) {
if (reaction.message.author == user) return; if (reaction.message.author == user) return;
let starboardChannel, shameboardChannel, staremote, starcount, shameemote, shamecount; let starboardChannel, shameboardChannel, staremote, starcount, shameemote, shamecount;
if (fs.existsSync(`./board/star${reaction.message.guild.id}.json`)) {
starboardChannel = require(`../../board/star${reaction.message.guild.id}.json`);
staremote = starboardChannel['emote'];
starcount = starboardChannel['count'];
}
if (fs.existsSync(`./board/shame${reaction.message.guild.id}.json`)) {
shameboardChannel = require(`../../board/shame${reaction.message.guild.id}.json`);
shameemote = shameboardChannel['emote'];
shamecount = shameboardChannel['count'];
}
let messageContent = reaction.message.content; let messageContent = reaction.message.content;
let messageAttachments = reaction.message.attachments.map(u=> u.url); let messageAttachments = reaction.message.attachments.map(u=> u.url);
// Starboard if (fs.existsSync(`./board/star${reaction.message.guild.id}.json`)) {
if (reaction.emoji.name == staremote && reaction.count == starcount) { starboardChannel = require(`../../board/star${reaction.message.guild.id}.json`);
if (messageID.includes(reaction.message.id)) staremote = starboardChannel['emote'];
return console.log('Message already in starboard!'); starcount = starboardChannel['count'];
messageID.push(reaction.message.id); // Starboard
if (reaction.emoji.name == staremote && reaction.count == starcount) {
if (messageID.includes(reaction.message.id))
return console.log('Message already in starboard!');
sendEmbed('starboard', staremote, this.client); messageID.push(reaction.message.id);
sendEmbed('starboard', staremote, this.client);
}
} }
//Shameboard if (fs.existsSync(`./board/shame${reaction.message.guild.id}.json`)) {
if (reaction.emoji.name == shameemote && reaction.count == shamecount) { shameboardChannel = require(`../../board/shame${reaction.message.guild.id}.json`);
if (messageID.includes(reaction.message.id)) shameemote = shameboardChannel['emote'];
return console.log('Message already in starboard!'); shamecount = shameboardChannel['count'];
messageID.push(reaction.message.id); //Shameboard
if (reaction.emoji.name == shameemote && reaction.count == shamecount) {
if (messageID.includes(reaction.message.id))
return console.log('Message already in starboard!');
sendEmbed('shameboard', shameemote, this.client); messageID.push(reaction.message.id);
sendEmbed('shameboard', shameemote, this.client);
}
} }
function sendEmbed(name, emote, client) { function sendEmbed(name, emote, client) {

2
json/twiBlacklist.json
View file

@ -1 +1 @@
["217043728127229953", "153320466134728705", "483373304162287626", "383804893154115586", "541860755700449290", "411207629533347850", "549419255511253003", "241374139745566730", "439158164433141773", "214860284446244864", "329390383131787274", "215681880899584000", "223279666067275776", "94879945473392640", "408282444597297152", "175799889089789952", "262054068002750465"] ["217043728127229953", "153320466134728705", "483373304162287626", "383804893154115586", "541860755700449290", "411207629533347850", "549419255511253003", "241374139745566730", "439158164433141773", "214860284446244864", "329390383131787274", "215681880899584000", "223279666067275776", "94879945473392640", "408282444597297152", "175799889089789952", "262054068002750465", "530399670728392737", "427889181121839106"]