* 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:
parent
65027657ec
commit
72698bc3b4
14 changed files with 88 additions and 49 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
class ProcessHashtagsService < BaseService
|
||||
def call(status, tags = [])
|
||||
text = [status.text, status.spoiler_text].reject(&:empty?).join(' ')
|
||||
text = [status.text, status.spoiler_text].reject(&:blank?).join(' ')
|
||||
tags = text.scan(Tag::HASHTAG_RE).map(&:first) if status.local?
|
||||
|
||||
tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |tag|
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue