0
0
Fork 0

Revert HTML CW changes (#3020)

* selectively Revert "Fix regressions from #2683 (#2970)"

This reverts commit 72698bc3b4.

* Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)"

This reverts commit e2491680e6.
This commit is contained in:
beatrix 2017-05-12 22:03:43 -04:00 committed by Eugen Rochko
parent 1d5dcfcd46
commit 3dcb5fa28f
8 changed files with 11 additions and 18 deletions

View file

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