diff options
| author | Starfall <us@starfall.systems> | 2021-05-11 11:19:04 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-05-11 11:19:04 -0500 |
| commit | d56731a0b9d73c48bbfbced8732e25587ba892a4 (patch) | |
| tree | d3830ce2e0292ce07336496e40882c222f455a33 /app/controllers/admin/statuses_controller.rb | |
| parent | 459a36ab7303db4ee59945b4b2121b25cc86eb38 (diff) | |
| parent | ffc3f8eebe134ca9b18af73aa29eaa1627082e40 (diff) | |
Merge branch 'glitch'
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) |