vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change how changes to media attachments are stored for edits (#17696)

Browse source 
* 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:
Eugen Rochko 2022-03-09 09:06:17 +01:00 • committed by GitHub
parent bd53dd5210
commit d17fb70131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 190 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/serializers/activitypub/note_serializer.rb
View file

@ -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

10
app/serializers/rest/status_edit_serializer.rb
View file

@ -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

2
app/serializers/rest/status_serializer.rb
View file

@ -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