gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Further improve the media attached status query for accounts (#16106)

Browse source
This commit is contained in:
abcang 2021-04-27 01:57:46 +09:00 • committed by GitHub
parent f78cbc0c32
commit d0fc69d721
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View file

@ -77,7 +77,7 @@ class AccountsController < ApplicationController
end
def only_media_scope
Status.joins(:media_attachments).group(:id)
Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)
end
def no_replies_scope

2
app/controllers/admin/statuses_controller.rb
View file

@ -14,7 +14,7 @@ module Admin
@statuses = @account.statuses.where(visibility: [:public, :unlisted])
if params[:media]
@statuses.merge!(Status.joins(:media_attachments).group(:id))
@statuses.merge!(Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id))
end
@statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PER_PAGE)

2
app/controllers/api/v1/accounts/statuses_controller.rb
View file

@ -42,7 +42,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
end
def only_media_scope
Status.joins(:media_attachments).group(:id)
Status.joins(:media_attachments).merge(@account.media_attachments.reorder(nil)).group(:id)
end
def pinned_scope