Fix custom emojis not detected when used in content warning (#5049)

2017-09-23 01:50:17 +02:00
parent 846cd4e838
commit 9c8e602163
4 changed files with 9 additions and 3 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -132,7 +132,7 @@ class Status < ApplicationRecord
  end

  def emojis
-    CustomEmoji.from_text(text, account.domain)
+    CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain)
  end

  after_create :store_uri, if: :local?