mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 12:05:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix regression from #3842 (#3892)

Browse Source 
* Fix regression from #3842

Simplify the query by omitting all direct statuses. Private statuses
are allowed because they are from accounts we are following (so
by definition)

Resolves #3887 (alternative)

* Adjust test
This commit is contained in:
Eugen Rochko 2017-06-22 02:38:50 +02:00 committed by GitHub
parent cc382c5006
commit 0190aac240
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/status.rb
View File

@ -131,15 +131,7 @@ class Status < ApplicationRecord
end end
def as_home_timeline(account) def as_home_timeline(account)
# 'references' is a workaround for the following issue: where(account: [account] + account.following).where(visibility: [:public, :unlisted, :private])
# Inconsistent results with #or in ActiveRecord::Relation with respect to documentation Issue #24055 rails/rails
# https://github.com/rails/rails/issues/24055
references(:mentions)
.where.not(visibility: :direct)
.or(where(mentions: { account: account }))
.where(follows: { account_id: account })
.or(references(:mentions, :follows).where(account: account))
.left_outer_joins(account: :followers).left_outer_joins(:mentions).group(:id)
end end
def as_public_timeline(account = nil, local_only = false) def as_public_timeline(account = nil, local_only = false)

8
spec/models/status_spec.rb
View File

@ -201,17 +201,17 @@ RSpec.describe Status, type: :model do
expect(@results).to include(@self_status) expect(@results).to include(@self_status)
end end
it 'includes direct statuses from self' do it 'does not include direct statuses from self' do
expect(@results).to include(@self_direct_status) expect(@results).to_not include(@self_direct_status)
end end
it 'includes statuses from followed' do it 'includes statuses from followed' do
expect(@results).to include(@followed_status) expect(@results).to include(@followed_status)
end end
it 'includes direct statuses mentioning recipient from followed' do it 'does not include direct statuses mentioning recipient from followed' do
Fabricate(:mention, account: account, status: @followed_direct_status) Fabricate(:mention, account: account, status: @followed_direct_status)
expect(@results).to include(@followed_direct_status) expect(@results).to_not include(@followed_direct_status)
end end
it 'does not include direct statuses not mentioning recipient from followed' do it 'does not include direct statuses not mentioning recipient from followed' do