diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-05-12 22:03:43 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-13 04:03:43 +0200 |
| commit | 3dcb5fa28f13f597d49b5b442f61d12bc2be6152 (patch) | |
| tree | 50d9b18404756964d7c368e6d79562be478a61f4 /app/services | |
| parent | 1d5dcfcd46b973791c4f19f1dd66f33f3498800a (diff) | |
Revert HTML CW changes (#3020)
* selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/process_hashtags_service.rb | 3 | ||||
| -rw-r--r-- | app/services/process_mentions_service.rb | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb index 8904e2cf8..617a38159 100644 --- a/app/services/process_hashtags_service.rb +++ b/app/services/process_hashtags_service.rb @@ -2,8 +2,7 @@ class ProcessHashtagsService < BaseService def call(status, tags = []) - text = [status.text, status.spoiler_text].reject(&:blank?).join(' ') - tags = text.scan(Tag::HASHTAG_RE).map(&:first) if status.local? + tags = status.text.scan(Tag::HASHTAG_RE).map(&:first) if status.local? tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |tag| status.tags << Tag.where(name: tag).first_or_initialize(name: tag) diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index fd45810fb..aa0a4d71b 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -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) |