diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
| commit | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (patch) | |
| tree | 589ed30bd629a305a28eeb5a458fa0f83945eca3 /app/lib/activitypub | |
| parent | 6a6f680d98d114e3bb26e414ad7e3787a62bd129 (diff) | |
| parent | f02411da404f730e3c05dc7dca1ac0f2d631315e (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: config/i18n-tasks.yml
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 5a1c13d67..676e885c0 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -53,7 +53,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity visibility: visibility_from_audience, thread: replied_to_status, conversation: conversation_from_uri(@object['conversation']), - media_attachments: process_attachments.take(4), + media_attachment_ids: process_attachments.take(4).map(&:id), } end |