fix(MessageUtils): embedStrings.finish.endMessage is being unused (#6)

shadowplay1 · Oct 9, 2024 · f99de7b · f99de7b
2 parents 040f806 + b92d396
commit f99de7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/lib/Giveaway.ts b/src/lib/Giveaway.ts
@@ -677,7 +677,7 @@ export class Giveaway<
 
         giveawayMessage.reply({
             content: rerollMessage?.messageContent,
-            embeds: Object.keys(rerollMessage).length && rerollMessage?.messageContent ? [] : [rerolledEmbed]
+            embeds: Object.keys(rerollMessage).length === 1 && rerollMessage?.messageContent ? [] : [rerolledEmbed]
         })
 
         this._giveaways.emit('giveawayReroll', {

diff --git a/src/lib/util/classes/MessageUtils.ts b/src/lib/util/classes/MessageUtils.ts
@@ -268,7 +268,6 @@ export class MessageUtils {
 
         const finishDefaultedEmbedStrings: Partial<IGiveawayEmbedOptions> = {
             ...finishEmbedStrings,
-
             color: finishEmbedStrings?.color || '#d694ff',
             description: finishEmbedStrings?.description || 'Giveaway is over!'
         }
@@ -287,7 +286,7 @@ export class MessageUtils {
 
         const giveawayEndEmbed = this.buildGiveawayEmbed(
             giveaway,
-            winnersCondition ? finishDefaultedEmbedStrings : embedStrings?.noWinnersEndMessage,
+            winnersCondition ? (embedStrings?.endMessage || embedStrings?.newGiveawayMessage || {}) : embedStrings?.noWinnersEndMessage,
             winners
         )