diff options
| author | Starfall <us@starfall.systems> | 2020-12-07 10:11:37 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-12-07 10:11:37 -0600 |
| commit | e68391fbaaf409cc01f74c8cf7076520a43ae06e (patch) | |
| tree | 212b6e373f91dec2dce0b2c33b0cb38b4c6087f0 /app/controllers/admin | |
| parent | 0f6d41052652c4fee87a19900795c8588d9a2174 (diff) | |
| parent | 48bef17cc990afda95c4de657f7643c321e62650 (diff) | |
Merge remote-tracking branch 'vanilla/master' into main
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index 650195034..d7c192f0d 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -14,7 +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).distinct + 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)) end |