Fix regressions from #2683 (#2970)

* Fix regressions from #2683

Properly format spoiler text HTML, while keeping old logic for blankness intact
Process hashtags and mentions in spoiler text
Format spoiler text for Atom
Change "show more" toggle into a button instead of anchor
Fix style regression on dropdowns for detailed statuses

* Fix lint issue

* Convert spoiler text to plaintext in desktop notifications
This commit is contained in:
Eugen Rochko 2017-05-11 00:28:10 +02:00 committed by GitHub
parent 65027657ec
commit 72698bc3b4
14 changed files with 88 additions and 49 deletions

View file

@ -10,7 +10,9 @@ class ProcessMentionsService < BaseService
def call(status)
return unless status.local?
status.text.scan(Account::MENTION_RE).each do |match|
text = [status.text, status.spoiler_text].reject(&:blank?).join(' ')
text.scan(Account::MENTION_RE).each do |match|
username, domain = match.first.split('@')
mentioned_account = Account.find_remote(username, domain)