diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-20 18:38:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 18:38:36 +0200 |
| commit | 4dcabe6f9c776ea230b23dc60ec9b8a8fbed82df (patch) | |
| tree | c7f4b75274ae46db55b585a39ca427940d8fc218 /app/lib/activitypub | |
| parent | b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a (diff) | |
| parent | 27b5143dc4289fa87481899f6658f927e833ff9e (diff) | |
Merge pull request #1331 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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? |