From e00b64943b14e903a89bd952e36907b623a3ffb2 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Mon, 17 Aug 2020 20:59:10 -0500 Subject: [Emoji] Include custom emoji in footer text --- app/models/status.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/models/status.rb b/app/models/status.rb index 3a7cce14c..e84a0a864 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -269,7 +269,7 @@ class Status < ApplicationRecord def emojis return @emojis if defined?(@emojis) - fields = [spoiler_text, text] + fields = [spoiler_text, text, footer || ''] fields += preloadable_poll.options unless preloadable_poll.nil? @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) -- cgit