diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-08-17 20:59:10 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:45:19 -0500 |
| commit | e00b64943b14e903a89bd952e36907b623a3ffb2 (patch) | |
| tree | 0c248ff06bdad9d69643d57a7f99b00bc06cd156 /app/models | |
| parent | 2ab28aec9da49cc07de866148573307fdcd6cae4 (diff) | |
[Emoji] Include custom emoji in footer text
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |