diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 19:51:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 19:51:00 +0200 |
| commit | 50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d (patch) | |
| tree | 2d0f4954a3077e3e0bb2d02f671af41b69672e2a /app/controllers/admin/statuses_controller.rb | |
| parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
| parent | e08b31a70624fe069d2f26bf2078a69e2d48f6aa (diff) | |
Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/statuses_controller.rb')
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index d7c192f0d..ef279509d 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -14,8 +14,7 @@ module Admin @statuses = @account.statuses.where(visibility: [:public, :unlisted]) if params[:media] - account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).group(:status_id) - @statuses.merge!(Status.where(id: account_media_status_ids)) + @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) |