gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

12
app/helpers/statuses_helper.rb
View file

@ -132,7 +132,7 @@ module StatusesHelper
end
def render_video_component(status, **options)
video = status.media_attachments.first
video = status.ordered_media_attachments.first
meta = video.file.meta || {}
@ -150,12 +150,12 @@ module StatusesHelper
}.merge(**options)
react_component :video, component_params do
render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
end
end
def render_audio_component(status, **options)
audio = status.media_attachments.first
audio = status.ordered_media_attachments.first
meta = audio.file.meta || {}
@ -170,7 +170,7 @@ module StatusesHelper
}.merge(**options)
react_component :audio, component_params do
render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
end
end
@ -178,11 +178,11 @@ module StatusesHelper
component_params = {
sensitive: sensitized?(status, current_account),
autoplay: prefers_autoplay?,
media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
}.merge(**options)
react_component :media_gallery, component_params do
render partial: 'statuses/attachment_list', locals: { attachments: status.media_attachments }
render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
end
end