Merge branch 'master' into glitch-soc/merge-upstream

2019-03-20 17:32:39 +01:00
parent 803c350ef5 80f0910e21
commit cbf1d711ba
11 changed files with 50 additions and 12 deletions
--- 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!