diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-09 13:00:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 13:00:24 +0200 |
| commit | 3287a10fe9658a6c370431a925abc50d4f68ea08 (patch) | |
| tree | 88a408a943aa421a6ba844d309f673150cd92434 /app/workers/activitypub | |
| parent | f328f2faa3fbdb182921366c6a20e745c069b840 (diff) | |
| parent | e9d7ca7645fc37534df1222e8d7ab8f3d533b852 (diff) | |
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/distribution_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/activitypub/reply_distribution_worker.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb index 11b6a6111..e4997ba0e 100644 --- a/app/workers/activitypub/distribution_worker.rb +++ b/app/workers/activitypub/distribution_worker.rb @@ -43,7 +43,7 @@ class ActivityPub::DistributionWorker end def payload - @payload ||= Oj.dump(serialize_payload(@status, ActivityPub::ActivitySerializer, signer: @account)) + @payload ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @account)) end def relay! diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb index 1ff8a657e..d4d0148ac 100644 --- a/app/workers/activitypub/reply_distribution_worker.rb +++ b/app/workers/activitypub/reply_distribution_worker.rb @@ -29,6 +29,6 @@ class ActivityPub::ReplyDistributionWorker end def payload - @payload ||= Oj.dump(serialize_payload(@status, ActivityPub::ActivitySerializer, signer: @status.account)) + @payload ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @status.account)) end end |