diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-28 21:48:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 21:48:28 -0400 |
| commit | c027a7bd4d7b5af21f4b201d656f7251fa3606a1 (patch) | |
| tree | ce2c2327b26358c26cb899ea918988af373ca6d6 /app/services/process_mentions_service.rb | |
| parent | 210e6776fce016666ecfd248b2208c487f3440f9 (diff) | |
| parent | 53f829dfa8bc376041a442dc84c22aa1cbfcb9d0 (diff) | |
Merge pull request #157 from glitch-soc/merging-upstream
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
Diffstat (limited to 'app/services/process_mentions_service.rb')
| -rw-r--r-- | app/services/process_mentions_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index f123bf869..1c3eea369 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -39,7 +39,7 @@ class ProcessMentionsService < BaseService if mentioned_account.local? NotifyService.new.call(mentioned_account, mention) - elsif mentioned_account.ostatus? && (Rails.configuration.x.use_ostatus_privacy || !status.stream_entry.hidden?) + elsif mentioned_account.ostatus? && !status.stream_entry.hidden? NotificationWorker.perform_async(stream_entry_to_xml(status.stream_entry), status.account_id, mentioned_account.id) elsif mentioned_account.activitypub? ActivityPub::DeliveryWorker.perform_async(build_json(mention.status), mention.status.account_id, mentioned_account.inbox_url) |