Change how changes to media attachments are stored for edits (#17696)
* Change how changes to media attachments are stored for edits Fix not being able to re-order media attachments * Fix not broadcasting updates when polls/media is changed through ActivityPub * Various fixes and improvements * Update app/models/report.rb Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Add tracking of media attachment description changes * Change poll in status edit to have a structure closer to the real one Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
		@@ -13,7 +13,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
 | 
			
		||||
  attribute :content_map, if: :language?
 | 
			
		||||
  attribute :updated, if: :edited?
 | 
			
		||||
 | 
			
		||||
  has_many :media_attachments, key: :attachment
 | 
			
		||||
  has_many :virtual_attachments, key: :attachment
 | 
			
		||||
  has_many :virtual_tags, key: :tag
 | 
			
		||||
 | 
			
		||||
  has_one :replies, serializer: ActivityPub::CollectionSerializer, if: :local?
 | 
			
		||||
@@ -106,6 +106,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
 | 
			
		||||
    object.account.sensitized? || object.sensitive
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def virtual_attachments
 | 
			
		||||
    object.ordered_media_attachments
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def virtual_tags
 | 
			
		||||
    object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis
 | 
			
		||||
  end
 | 
			
		||||
 
 | 
			
		||||
@@ -3,12 +3,18 @@
 | 
			
		||||
class REST::StatusEditSerializer < ActiveModel::Serializer
 | 
			
		||||
  has_one :account, serializer: REST::AccountSerializer
 | 
			
		||||
 | 
			
		||||
  attributes :content, :spoiler_text,
 | 
			
		||||
             :media_attachments_changed, :created_at
 | 
			
		||||
  attributes :content, :spoiler_text, :sensitive, :created_at
 | 
			
		||||
 | 
			
		||||
  has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
 | 
			
		||||
  has_many :emojis, serializer: REST::CustomEmojiSerializer
 | 
			
		||||
 | 
			
		||||
  attribute :poll, if: -> { object.poll_options.present? }
 | 
			
		||||
 | 
			
		||||
  def content
 | 
			
		||||
    Formatter.instance.format(object)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def poll
 | 
			
		||||
    { options: object.poll_options.map { |title| { title: title } } }
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
 | 
			
		||||
  belongs_to :application, if: :show_application?
 | 
			
		||||
  belongs_to :account, serializer: REST::AccountSerializer
 | 
			
		||||
 | 
			
		||||
  has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
 | 
			
		||||
  has_many :ordered_media_attachments, key: :media_attachments, serializer: REST::MediaAttachmentSerializer
 | 
			
		||||
  has_many :ordered_mentions, key: :mentions
 | 
			
		||||
  has_many :tags
 | 
			
		||||
  has_many :emojis, serializer: REST::CustomEmojiSerializer
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user