logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: e482595a5dfd69efacffeddbd48f48c5b92deaea
parent: 9c04fadec9d7b98d8c3ce942418fcd15455eda76
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri,  1 Sep 2017 21:54:42 +0200

Add ActivityPub handler for Delete->Actor activities (#4761)


Diffstat:

Mapp/lib/activitypub/activity/delete.rb16++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb @@ -2,6 +2,20 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity def perform + if @account.uri == object_uri + delete_person + else + delete_note + end + end + + private + + def delete_person + SuspendAccountService.new.call(@account) + end + + def delete_note status = Status.find_by(uri: object_uri, account: @account) status ||= Status.find_by(uri: @object['_:atomUri'], account: @account) if @object.is_a?(Hash) && @object['_:atomUri'].present? @@ -13,8 +27,6 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity delete_now!(status) end - private - def forward_for_reblogs(status) return if @json['signature'].blank?