diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-20 20:13:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 20:13:22 +0100 |
| commit | bde9196b70299405ebe9b16500b7a3f65539b2c3 (patch) | |
| tree | 4bec904a28c70b916d18055f8291f17c2e58e07b /app/models/status.rb | |
| parent | b9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff) | |
| parent | 8b5b686f087f99d1a2b54e0760add8180d77fa7e (diff) | |
Merge pull request #964 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 95f336820..c049401e8 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -218,7 +218,11 @@ class Status < ApplicationRecord end def emojis - @emojis ||= CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain) + return @emojis if defined?(@emojis) + fields = [spoiler_text, text] + fields += owned_poll.options unless owned_poll.nil? + @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + @emojis end def mark_for_mass_destruction! |