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

Fix the "undefined" and set description to embed description if there is one

Browse source
This commit is contained in:
loicbersier 2020-01-06 22:54:14 +01:00
parent e796d14fa1
commit 4dc4019589
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
event/listeners/messageReactionAdd.js
View file

@ -80,8 +80,8 @@ class MessageReactionAddListener extends Listener {
let message = await channel.messages.get(boardID); let message = await channel.messages.get(boardID);
// If the original embed description is empty make this embed empty ( and not undefined ) // If the original embed description is empty make this embed empty ( and not undefined )
let description; let description = message.embeds[0].description;
if (message.embeds[0].description == '') if (!message.embeds[0].description)
description = ''; description = '';
let Embed = client.util.embed() let Embed = client.util.embed()
@ -122,9 +122,15 @@ class MessageReactionAddListener extends Listener {
Embed.setFooter(reactionCount, reaction.message.guild.emojis.find(emoji => emoji.name === emote).url); Embed.setFooter(reactionCount, reaction.message.guild.emojis.find(emoji => emoji.name === emote).url);
} }
let description = reaction.message.content;
// 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
if (!reaction.message.content && reaction.message.embeds[0].description)
description = reaction.message.embeds[0].description;
else if (!reaction.message.content && !reaction.message.embeds[0].description)
description = '';
if (reaction.message.channel.nsfw && !channel.nsfw) { if (reaction.message.channel.nsfw && !channel.nsfw) {
Embed.setDescription(`||${reaction.message.content}||`); Embed.setDescription(`||${description}||`);
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;
@ -134,7 +140,7 @@ class MessageReactionAddListener extends Listener {
messageID[reaction.message.id] = message.id; messageID[reaction.message.id] = message.id;
} }
} else { } else {
Embed.setDescription(reaction.message.content); Embed.setDescription(description);
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;

4
event/listeners/messageReactionRemove.js
View file

@ -78,8 +78,8 @@ class messageReactionRemoveListener extends Listener {
let message = await channel.messages.get(boardID); let message = await channel.messages.get(boardID);
// If the original embed description is empty make this embed empty ( and not undefined ) // If the original embed description is empty make this embed empty ( and not undefined )
let description; let description = message.embeds[0].description;
if (message.embeds[0].description == '') if (!message.embeds[0].description)
description = ''; description = '';
let Embed = client.util.embed() let Embed = client.util.embed()