fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 23:49:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove default_scope from StatusEdit class (#28042)

Browse source
This commit is contained in:
Matt Jankowski 2023-11-23 04:26:11 -05:00 committed by GitHub
parent 990c63b440
commit 4be12791e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ module Admin
private private
def batched_ordered_status_edits 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 end
helper_method :batched_ordered_status_edits helper_method :batched_ordered_status_edits

2
app/controllers/api/v1/statuses/histories_controller.rb
View file

@ -11,6 +11,6 @@ class Api::V1::Statuses::HistoriesController < Api::V1::Statuses::BaseController
private private
def status_edits 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
end end

2
app/models/status_edit.rb
View file

@ -39,7 +39,7 @@ class StatusEdit < ApplicationRecord
belongs_to :status belongs_to :status
belongs_to :account, optional: true belongs_to :account, optional: true
default_scope { order(id: :asc) } scope :ordered, -> { order(id: :asc) }
delegate :local?, :application, :edited?, :edited_at, delegate :local?, :application, :edited?, :edited_at,
:discarded?, :visibility, to: :status :discarded?, :visibility, to: :status