tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert DM support in HomeFeed#from_database

Browse Source 
Fixes #1746

Queries could get prohibitively expensive.
This commit is contained in:
Claire
2022-04-16 21:20:07 +02:00
parent 5db3a14388
commit ec4a8d81b1
2 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/home_feed.rb
View File

@ -44,10 +44,8 @@ class HomeFeed < Feed
protected
def from_database(limit, max_id, since_id, min_id)
scope = Status.where(account: @account.following)
scope = scope.left_outer_joins(:mentions)
scope = scope.where(visibility: %i(public unlisted private)).or(scope.where(mentions: { account_id: @account.id })).group(Status.arel_table[:id])
scope = scope.or(Status.where(account: @account))
scope = Status.where(account: @account).or(Status.where(account: @account.following))
scope = scope.where(visibility: %i(public unlisted private))
scope
.to_a_paginated_by_id(limit, min_id: min_id, max_id: max_id, since_id: since_id)
.reject { |status| FeedManager.instance.filter?(:home, status, @account) }