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

16
app/models/report.rb
View file

@ -63,8 +63,20 @@ class Report < ApplicationRecord
Status.with_discarded.where(id: status_ids)
end
def media_attachments
MediaAttachment.where(status_id: status_ids)
def media_attachments_count
statuses_to_query = []
count = 0
statuses.pluck(:id, :ordered_media_attachment_ids).each do |id, ordered_ids|
if ordered_ids.nil?
statuses_to_query << id
else
count += ordered_ids.size
end
end
count += MediaAttachment.where(status_id: statuses_to_query).count unless statuses_to_query.empty?
count
end
def rules