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/lib/activitypub/activity.rb | |
| parent | f0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37 (diff) | |
| parent | 476e79b8e340c9103352a0799e102e4aca1a5593 (diff) | |
Merge upstream 2.0ish #165
Diffstat (limited to 'app/lib/activitypub/activity.rb')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index b06dd6194..9688f57a6 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -3,10 +3,11 @@ class ActivityPub::Activity include JsonLdHelper - def initialize(json, account) + def initialize(json, account, options = {}) @json = json @account = account @object = @json['object'] + @options = options end def perform @@ -14,9 +15,9 @@ class ActivityPub::Activity end class << self - def factory(json, account) + def factory(json, account, options = {}) @json = json - klass&.new(json, account) + klass&.new(json, account, options) end private |