diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-10-11 10:43:10 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-10-11 10:43:10 -0700 |
| commit | 8d6b9ba4946b5b159af0fbd130637a226a286796 (patch) | |
| tree | 9def26711682d29338cfa1b081822029a01669eb /app/services/activitypub/process_collection_service.rb | |
| parent | f0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37 (diff) | |
| parent | 476e79b8e340c9103352a0799e102e4aca1a5593 (diff) | |
Merge upstream 2.0ish #165
Diffstat (limited to 'app/services/activitypub/process_collection_service.rb')
| -rw-r--r-- | app/services/activitypub/process_collection_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb index 59cb65c65..db4d1b4bc 100644 --- a/app/services/activitypub/process_collection_service.rb +++ b/app/services/activitypub/process_collection_service.rb @@ -3,9 +3,10 @@ class ActivityPub::ProcessCollectionService < BaseService include JsonLdHelper - def call(body, account) + def call(body, account, options = {}) @account = account @json = Oj.load(body, mode: :strict) + @options = options return unless supported_context? return if different_actor? && verify_account!.nil? @@ -38,7 +39,7 @@ class ActivityPub::ProcessCollectionService < BaseService end def process_item(item) - activity = ActivityPub::Activity.factory(item, @account) + activity = ActivityPub::Activity.factory(item, @account, @options) activity&.perform end |