diff options
| author | Matt Jankowski <matt@jankowski.online> | 2023-11-23 04:26:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-23 09:26:11 +0000 |
| commit | 4be12791e6f1b4488920b66ded35310cc34477cc (patch) | |
| tree | 0ddf07026cb7c0a35cd7deeedc622fd2011baa2d | |
| parent | 990c63b4407115dad5f69af24094987a52501507 (diff) | |
Remove `default_scope` from `StatusEdit` class (#28042)
| -rw-r--r-- | app/controllers/admin/statuses_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/statuses/histories_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/status_edit.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index 5712dea888b..e53b22dca32 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -32,7 +32,7 @@ module Admin private def batched_ordered_status_edits - @status.edits.reorder(nil).includes(:account, status: [:account]).find_each(order: :asc) + @status.edits.includes(:account, status: [:account]).find_each(order: :asc) end helper_method :batched_ordered_status_edits diff --git a/app/controllers/api/v1/statuses/histories_controller.rb b/app/controllers/api/v1/statuses/histories_controller.rb index dcb21ef0438..e381ea2c670 100644 --- a/app/controllers/api/v1/statuses/histories_controller.rb +++ b/app/controllers/api/v1/statuses/histories_controller.rb @@ -11,6 +11,6 @@ class Api::V1::Statuses::HistoriesController < Api::V1::Statuses::BaseController private def status_edits - @status.edits.includes(:account, status: [:account]).to_a.presence || [@status.build_snapshot(at_time: @status.edited_at || @status.created_at)] + @status.edits.ordered.includes(:account, status: [:account]).to_a.presence || [@status.build_snapshot(at_time: @status.edited_at || @status.created_at)] end end diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb index 2b3248bb2cc..50dabb91f5b 100644 --- a/app/models/status_edit.rb +++ b/app/models/status_edit.rb @@ -39,7 +39,7 @@ class StatusEdit < ApplicationRecord belongs_to :status belongs_to :account, optional: true - default_scope { order(id: :asc) } + scope :ordered, -> { order(id: :asc) } delegate :local?, :application, :edited?, :edited_at, :discarded?, :visibility, to: :status |