joan/Haha-Yes
1
0
Fork 0
forked from Supositware/Haha-Yes
Code Pull requests Activity

Make people not able to make themselves enter a board ( and some cleanup )

Browse source
This commit is contained in:
loicbersier 2019-12-27 22:06:16 +01:00
parent bbb6e21f51
commit 01db4e719f
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
event/listeners/messageReactionAdd.js
View file

@ -11,9 +11,15 @@ class MessageReactionAddListener extends Listener {
}); });
} }
async exec(reaction, user) { async exec(reaction) {
if (reaction.message.author == user) return;
let starboardChannel, shameboardChannel; let starboardChannel, shameboardChannel;
let reactionCount = reaction.count;
// If one of the reaction is the author of the message remove 1 to the reaction count
reaction.users.forEach(user => {
if (reaction.message.author == user) reactionCount--;
});
// Starboard // Starboard
if (fs.existsSync(`./board/star${reaction.message.guild.id}.json`)) { if (fs.existsSync(`./board/star${reaction.message.guild.id}.json`)) {
@ -22,14 +28,15 @@ class MessageReactionAddListener extends Listener {
let starcount = starboardChannel.count; let starcount = starboardChannel.count;
delete require.cache[require.resolve(`../../board/star${reaction.message.guild.id}.json`)]; // Delete the boardChannel cache so it can reload it next time delete require.cache[require.resolve(`../../board/star${reaction.message.guild.id}.json`)]; // Delete the boardChannel cache so it can reload it next time
// Get name of the custom emoji
if (this.client.util.resolveEmoji(staremote, reaction.message.guild.emojis)) { if (this.client.util.resolveEmoji(staremote, reaction.message.guild.emojis)) {
staremote = this.client.util.resolveEmoji(staremote, reaction.message.guild.emojis).name; staremote = this.client.util.resolveEmoji(staremote, reaction.message.guild.emojis).name;
} }
if (reaction.emoji.name == staremote) { if (reaction.emoji.name == staremote) {
if (messageID[reaction.message.id] && reaction.count > starcount) { if (messageID[reaction.message.id] && reactionCount > starcount) {
return editEmbed('starboard', staremote, messageID[reaction.message.id], this.client); return editEmbed('starboard', staremote, messageID[reaction.message.id], this.client);
} else if (reaction.count == starcount) { } else if (reactionCount == starcount) {
return sendEmbed('starboard', staremote, this.client); return sendEmbed('starboard', staremote, this.client);
} }
} }
@ -41,15 +48,16 @@ class MessageReactionAddListener extends Listener {
let shameemote = shameboardChannel.emote; let shameemote = shameboardChannel.emote;
let shamecount = shameboardChannel.count; let shamecount = shameboardChannel.count;
delete require.cache[require.resolve(`../../board/shame${reaction.message.guild.id}.json`)]; // Delete the boardChannel cache so it can reload it next time delete require.cache[require.resolve(`../../board/shame${reaction.message.guild.id}.json`)]; // Delete the boardChannel cache so it can reload it next time
// Get name of the custom emoji
if (this.client.util.resolveEmoji(shameemote, reaction.message.guild.emojis)) { if (this.client.util.resolveEmoji(shameemote, reaction.message.guild.emojis)) {
shameemote = this.client.util.resolveEmoji(shameemote, reaction.message.guild.emojis).name; shameemote = this.client.util.resolveEmoji(shameemote, reaction.message.guild.emojis).name;
} }
if (reaction.emoji.name == shameemote) { if (reaction.emoji.name == shameemote) {
if (messageID[reaction.message.id] && reaction.count > shamecount) { if (messageID[reaction.message.id] && reactionCount > shamecount) {
return editEmbed('shameboard', shameemote, messageID[reaction.message.id], this.client); return editEmbed('shameboard', shameemote, messageID[reaction.message.id], this.client);
} else if (reaction.count == shamecount) { } else if (reactionCount == shamecount) {
return sendEmbed('shameboard', shameemote, this.client); return sendEmbed('shameboard', shameemote, this.client);
} }
} }
@ -71,11 +79,11 @@ class MessageReactionAddListener extends Listener {
.addField('Jump to', `[message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})`, true) .addField('Jump to', `[message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})`, true)
.addField('Channel', reaction.message.channel, true) .addField('Channel', reaction.message.channel, true)
.setDescription(message.embeds[0].description) .setDescription(message.embeds[0].description)
.setFooter(reaction.count + ' ' + emote) .setFooter(reactionCount + ' ' + emote)
.setTimestamp(); .setTimestamp();
if (reaction.message.guild.emojis.find(emoji => emoji.name === emote)) { if (reaction.message.guild.emojis.find(emoji => emoji.name === emote)) {
Embed.setFooter(reaction.count, reaction.message.guild.emojis.find(emoji => emoji.name === emote).url); Embed.setFooter(reactionCount, reaction.message.guild.emojis.find(emoji => emoji.name === emote).url);
} }
message.edit({ embed: Embed }); message.edit({ embed: Embed });
@ -96,11 +104,11 @@ class MessageReactionAddListener extends Listener {
.setAuthor(reaction.message.author.username, reaction.message.author.displayAvatarURL()) .setAuthor(reaction.message.author.username, reaction.message.author.displayAvatarURL())
.addField('Jump to', `[message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})`, true) .addField('Jump to', `[message](https://discordapp.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id})`, true)
.addField('Channel', reaction.message.channel, true) .addField('Channel', reaction.message.channel, true)
.setFooter(reaction.count + ' ' + emote) .setFooter(reactionCount + ' ' + emote)
.setTimestamp(); .setTimestamp();
if (reaction.message.guild.emojis.find(emoji => emoji.name === emote)) { if (reaction.message.guild.emojis.find(emoji => emoji.name === emote)) {
Embed.setFooter(reaction.count, reaction.message.guild.emojis.find(emoji => emoji.name === emote).url); Embed.setFooter(reactionCount, reaction.message.guild.emojis.find(emoji => emoji.name === emote).url);
} }
// if message come from nsfw channel and the star/shameboard channel isn't nsfw put it in spoiler // if message come from nsfw channel and the star/shameboard channel isn't nsfw put it in spoiler
@ -109,20 +117,16 @@ class MessageReactionAddListener extends Listener {
if (messageAttachments != '') { if (messageAttachments != '') {
let message = await channel.send(`||${messageAttachments}||`, { embed: Embed }); let message = await channel.send(`||${messageAttachments}||`, { embed: Embed });
messageID[reaction.message.id] = message.id; messageID[reaction.message.id] = message.id;
//boardMessage.push({ reactionID: reaction.message.id, boardID: message.id });
} }
else { else {
let message = await channel.send({embed: Embed}); let message = await channel.send({embed: Embed});
messageID[reaction.message.id] = message.id; messageID[reaction.message.id] = message.id;
//boardMessage.push({ reactionID: reaction.message.id, boardID: message.id });
} }
} else { } else {
Embed.setDescription(reaction.message.content); Embed.setDescription(reaction.message.content);
let message = await channel.send({ files: messageAttachments, embed: Embed }) let message = await channel.send({ files: messageAttachments, embed: Embed })
.catch(async () => channel.send(messageAttachments, { embed: Embed })); .catch(async () => channel.send(messageAttachments, { embed: Embed }));
messageID[reaction.message.id] = message.id; messageID[reaction.message.id] = message.id;
//boardMessage.push({ reactionID: reaction.message.id, boardID: message.id });
} }
} }
} }