diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-07 17:00:36 +0200 |
commit | 34b8346e7f1274d40734f9da3100a4343cf9f81c (patch) | |
tree | 1a851db65a949df937de0a3eb4fce1e9f83e5301 /app/services/process_mentions_service.rb | |
parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
parent | a60364ca7d26c82c9353980d0966d37e9aa66014 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
Diffstat (limited to 'app/services/process_mentions_service.rb')
-rw-r--r-- | app/services/process_mentions_service.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 989cc19a6..1804e0c93 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -2,6 +2,7 @@ class ProcessMentionsService < BaseService include StreamEntryRenderer + include Payloadable # Scan status for mentions and fetch remote mentioned users, create # local mention pointers, send Salmon notifications to mentioned @@ -61,12 +62,7 @@ class ProcessMentionsService < BaseService def activitypub_json return @activitypub_json if defined?(@activitypub_json) - payload = ActiveModelSerializers::SerializableResource.new( - @status, - serializer: ActivityPub::ActivitySerializer, - adapter: ActivityPub::Adapter - ).as_json - @activitypub_json = Oj.dump(@status.distributable? ? ActivityPub::LinkedDataSignature.new(payload).sign!(@status.account) : payload) + @activitypub_json = Oj.dump(serialize_payload(@status, ActivityPub::ActivitySerializer, signer: @status.account)) end def resolve_account_service |