Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Limit attachments to MEDIA_ATTACHMENTS_LIMIT when returning posts through the API (#30932)

Browse source
This commit is contained in:
Claire 2024-07-08 09:41:50 +02:00 • committed by GitHub
parent fd3bfc0710
commit d41b43ed4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/status.rb
View file

@ -288,7 +288,7 @@ class Status < ApplicationRecord
else
map = media_attachments.index_by(&:id)
ordered_media_attachment_ids.filter_map { |media_attachment_id| map[media_attachment_id] }
end
end.take(MEDIA_ATTACHMENTS_LIMIT)
end
def replies_count

14
app/models/status_edit.rb
View file

@ -53,12 +53,14 @@ class StatusEdit < ApplicationRecord
def ordered_media_attachments
return @ordered_media_attachments if defined?(@ordered_media_attachments)
@ordered_media_attachments = if ordered_media_attachment_ids.nil?
[]
else
map = status.media_attachments.index_by(&:id)
ordered_media_attachment_ids.map.with_index { |media_attachment_id, index| PreservedMediaAttachment.new(media_attachment: map[media_attachment_id], description: media_descriptions[index]) }
end
@ordered_media_attachments = begin
if ordered_media_attachment_ids.nil?
[]
else
map = status.media_attachments.index_by(&:id)
ordered_media_attachment_ids.map.with_index { |media_attachment_id, index| PreservedMediaAttachment.new(media_attachment: map[media_attachment_id], description: media_descriptions[index]) }
end
end.take(Status::MEDIA_ATTACHMENTS_LIMIT)
end
def proper