luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-24 07:43:24 +00:00
Code Issues Projects Releases Wiki Activity

Do not ignore unknown media attachments, only skip them (#6948)

Browse source 
That way, they are displayed in a list below the corresponding toot.
This commit is contained in:
ThibG 2018-03-29 00:52:24 +02:00 committed by Eugen Rochko
parent 5021c4e9ca
commit 9ed5eebd7c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/lib/activitypub/activity/create.rb
View file

@ -113,13 +113,13 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
media_attachments = [] media_attachments = []
as_array(@object['attachment']).each do |attachment| as_array(@object['attachment']).each do |attachment|
next if unsupported_media_type?(attachment['mediaType']) || attachment['url'].blank? next if attachment['url'].blank?
href = Addressable::URI.parse(attachment['url']).normalize.to_s href = Addressable::URI.parse(attachment['url']).normalize.to_s
media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['name'].presence, focus: attachment['focalPoint']) media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['name'].presence, focus: attachment['focalPoint'])
media_attachments << media_attachment media_attachments << media_attachment
next if skip_download? next if unsupported_media_type?(attachment['mediaType']) || skip_download?
media_attachment.file_remote_url = href media_attachment.file_remote_url = href
media_attachment.save media_attachment.save