diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-05 10:29:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 10:29:52 +0200 |
| commit | 8b8839978a222ed53a3dc33eb99f87edc8794000 (patch) | |
| tree | e140ef9317152e6e40e9cb7061413736605158fe /app/models | |
| parent | 29efeecb9ebd4eac0ec65040b2f688d7a5c77283 (diff) | |
| parent | 78cf0fe1c7981bd3770b80772eb7295bc2a0b753 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/status.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index daf128572..6948ad77c 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -161,9 +161,9 @@ class Status < ApplicationRecord return where.not(visibility: [:private, :direct]) if account.nil? if target_account.blocking?(account) # get rid of blocked peeps - where('1 = 0') + none elsif account.id == target_account.id # author can see own stuff - where('1 = 1') + all elsif account.following?(target_account) # followers can see followers-only stuff, but also things they are mentioned in joins('LEFT OUTER JOIN mentions ON statuses.id = mentions.status_id AND mentions.account_id = ' + account.id.to_s) .where('statuses.visibility != ? OR mentions.id IS NOT NULL', Status.visibilities[:direct]) |