LenPayne
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #914 from bradurani/bu/query_cleanup 

Eliminate unnecessary queries and query clauses with none and all
This commit is contained in:
Eugen 2017-04-05 10:23:10 +02:00 committed by GitHub
parent ccb6a658fd 6a1da87cd3
commit aab818717e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/status.rb
View File

@ -161,9 +161,9 @@ class Status < ApplicationRecord
return where.not(visibility: [:private, :direct]) if account.nil? return where.not(visibility: [:private, :direct]) if account.nil?
if target_account.blocking?(account) # get rid of blocked peeps 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 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 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) 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]) .where('statuses.visibility != ? OR mentions.id IS NOT NULL', Status.visibilities[:direct])