diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-19 01:51:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-19 01:51:19 +0100 |
commit | f02411da404f730e3c05dc7dca1ac0f2d631315e (patch) | |
tree | 1d7138c183d536425c2f57682245bd2839eb0da8 /app/lib | |
parent | a568e3ca8e754b690224ae79e75aeb60efa49b78 (diff) |
Ignore media validation when attaching to status during processing (#6822)
Fix #6821
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 | ||||
-rw-r--r-- | app/lib/ostatus/activity/creation.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb index aa46267dc..6235127b2 100644 --- a/app/lib/ostatus/activity/creation.rb +++ b/app/lib/ostatus/activity/creation.rb @@ -45,7 +45,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base visibility: visibility_scope, conversation: find_or_create_conversation, thread: thread? ? find_status(thread.first) || find_activitypub_status(thread.first, thread.second) : nil, - media_attachments: media_attachments + media_attachment_ids: media_attachments.map(&:id) ) save_mentions(status) |