forked from treehouse/mastodon
Ignore media validation when attaching to status during processing (#6822)
Fix #6821rebase/4.0.0rc2
parent
a568e3ca8e
commit
f02411da40
|
@ -53,7 +53,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
||||||
visibility: visibility_from_audience,
|
visibility: visibility_from_audience,
|
||||||
thread: replied_to_status,
|
thread: replied_to_status,
|
||||||
conversation: conversation_from_uri(@object['conversation']),
|
conversation: conversation_from_uri(@object['conversation']),
|
||||||
media_attachments: process_attachments.take(4),
|
media_attachment_ids: process_attachments.take(4).map(&:id),
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
|
||||||
visibility: visibility_scope,
|
visibility: visibility_scope,
|
||||||
conversation: find_or_create_conversation,
|
conversation: find_or_create_conversation,
|
||||||
thread: thread? ? find_status(thread.first) || find_activitypub_status(thread.first, thread.second) : nil,
|
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)
|
save_mentions(status)
|
||||||
|
|
Loading…
Reference in New Issue