Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Optimize Status#permitted_for 24x (#3069)

Browse source 
* Build query with arel node

* Add spec for current Status#permitted_for implementation

* Refactor status.rb

* Order by visibility to optimize query
This commit is contained in:
alpaca-tc 2017-05-16 09:54:17 +09:00 • committed by Eugen Rochko
parent cb50ecdb07
commit a2a2af244c
2 changed files with 66 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/models/status.rb
View file

@ -55,7 +55,7 @@ class Status < ApplicationRecord
validates_with StatusLengthValidator
validates :reblog, uniqueness: { scope: :account }, if: 'reblog?'
default_scope { order('id desc') }
default_scope { order(id: :desc) }
scope :remote, -> { where.not(uri: nil) }
scope :local, -> { where(uri: nil) }
@ -202,18 +202,22 @@ class Status < ApplicationRecord
end
def permitted_for(target_account, account)
return where.not(visibility: [:private, :direct]) if account.nil?
visibility = [:public, :unlisted]
if target_account.blocking?(account) # get rid of blocked peeps
if account.nil?
where(visibility: visibility)
elsif target_account.blocking?(account) # get rid of blocked peeps
none
elsif account.id == target_account.id # author can see own stuff
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])
else # non-followers can see everything that isn't private/direct, but can see stuff 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 NOT IN (?) OR mentions.id IS NOT NULL', [Status.visibilities[:direct], Status.visibilities[:private]])
else
# followers can see followers-only stuff, but also things they are mentioned in.
# non-followers can see everything that isn't private/direct, but can see stuff they are mentioned in.
visibility.push(:private) if account.following?(target_account)
joins("LEFT OUTER JOIN mentions ON statuses.id = mentions.status_id AND mentions.account_id = #{account.id}")
.where(arel_table[:visibility].in(visibility).or(Mention.arel_table[:id].not_eq(nil)))
.order(visibility: :desc)
end
end