Browse Source

Merge pull request #914 from bradurani/bu/query_cleanup

Eliminate unnecessary queries and query clauses with none and all
closed-social-glitch-2
Eugen 7 years ago
committed by GitHub
parent
commit
aab818717e
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/models/status.rb

+ 2
- 2
app/models/status.rb View File

@ -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
wherean>('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])

Loading…
Cancel
Save