From 196e474e43b20465d1099bb6e949be05b54ffa26 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sun, 2 Oct 2022 14:01:47 +0200
Subject: fix emojis not showing in spoiler text (#878)

---
 internal/processing/status/util.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'internal/processing/status/util.go')

diff --git a/internal/processing/status/util.go b/internal/processing/status/util.go
index d3fc8f3b1..7617894cc 100644
--- a/internal/processing/status/util.go
+++ b/internal/processing/status/util.go
@@ -250,7 +250,7 @@ func (p *processor) ProcessTags(ctx context.Context, form *apimodel.AdvancedStat
 func (p *processor) ProcessEmojis(ctx context.Context, form *apimodel.AdvancedStatusCreateForm, accountID string, status *gtsmodel.Status) error {
 	// for each emoji shortcode in the text, check if it's an enabled
 	// emoji on this instance, and if so, add it to the status
-	emojiShortcodes := util.DeriveEmojisFromText(form.Status)
+	emojiShortcodes := util.DeriveEmojisFromText(form.SpoilerText + "\n\n" + form.Status)
 	status.Emojis = make([]*gtsmodel.Emoji, 0, len(emojiShortcodes))
 	status.EmojiIDs = make([]string, 0, len(emojiShortcodes))
 
-- 
cgit v1.2.3