diff options
author | Starfall <admin@plural.cafe> | 2020-05-18 17:26:39 -0500 |
---|---|---|
committer | Starfall <admin@plural.cafe> | 2020-05-18 17:26:39 -0500 |
commit | 4d8b8d44466dd6312d4914c5a14667ac7eaffbb8 (patch) | |
tree | b2d285555b362acd2ab9893e506062816c957525 /app/lib/activitypub | |
parent | 3de0fecfa24ac57adfdd068c0f565f5c53f621d3 (diff) | |
parent | ce87469d0a085b238646387fb01d78c206b83124 (diff) |
Merge github.com:tootsuite/mastodon
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index c55cfe08e..572b8087e 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -201,7 +201,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity begin 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'], blurhash: supported_blurhash?(attachment['blurhash']) ? attachment['blurhash'] : nil) + media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['summary'].presence || attachment['name'].presence, focus: attachment['focalPoint'], blurhash: supported_blurhash?(attachment['blurhash']) ? attachment['blurhash'] : nil) media_attachments << media_attachment next if unsupported_media_type?(attachment['mediaType']) || skip_download? |