about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-05 18:44:33 +0200
committerGitHub <noreply@github.com>2017-04-05 18:44:33 +0200
commit3d8b80e1cc8206d3a2d9904eb216269f0e38e66a (patch)
tree0bef7e42e35c04b2a4243f458909b86edf5aa278 /app/models
parent7bed4e51db18c864c36c6b48eb22c65f11c16b1c (diff)
parentb142a2ebf51fb140062e52cb283736b6d4abe725 (diff)
Merge branch 'master' into broadcast-to-worker
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb4
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])