summaryrefslogtreecommitdiff
path: root/internal/processing/status/util.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-10-02 14:01:47 +0200
committerLibravatar GitHub <noreply@github.com>2022-10-02 13:01:47 +0100
commit196e474e43b20465d1099bb6e949be05b54ffa26 (patch)
tree32012935bb021d5f3612bac0ffe8fdbb04245248 /internal/processing/status/util.go
parent[chore] Normalize domain blocks to punycode (#873) (diff)
downloadgotosocial-196e474e43b20465d1099bb6e949be05b54ffa26.tar.xz
fix emojis not showing in spoiler text (#878)
Diffstat (limited to 'internal/processing/status/util.go')
-rw-r--r--internal/processing/status/util.go2
1 files changed, 1 insertions, 1 deletions
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))