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/remove_status_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/remove_status_service.rb')
-rw-r--r-- | app/services/remove_status_service.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 6e4998e07..98972fc70 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -3,6 +3,7 @@ class RemoveStatusService < BaseService include StreamEntryRenderer include Redisable + include Payloadable def call(status, **options) @payload = Oj.dump(event: :delete, payload: status.id.to_s) @@ -116,15 +117,7 @@ class RemoveStatusService < BaseService end def signed_activity_json - @signed_activity_json ||= Oj.dump(ActivityPub::LinkedDataSignature.new(activity_json).sign!(@account)) - end - - def activity_json - @activity_json ||= ActiveModelSerializers::SerializableResource.new( - @status, - serializer: @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, - adapter: ActivityPub::Adapter - ).as_json + @signed_activity_json ||= Oj.dump(serialize_payload(@status, @status.reblog? ? ActivityPub::UndoAnnounceSerializer : ActivityPub::DeleteSerializer, signer: @account)) end def remove_reblogs |