From e6ea015cb4b826501d4dcfa18d551d00fe3eeed0 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 5 Apr 2022 20:06:04 +0000 Subject: [PATCH] "Person" is "Account" --- src/Protocol/ActivityPub/Processor.php | 4 ++-- src/Protocol/ActivityPub/Receiver.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 89d7604bb4..5604043fa4 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -1212,7 +1212,7 @@ class Processor * @param array $activity * @throws \Exception */ - public static function blockPerson($activity) + public static function blockAccount($activity) { $cid = Contact::getIdForURL($activity['actor']); if (empty($cid)) { @@ -1235,7 +1235,7 @@ class Processor * @param array $activity * @throws \Exception */ - public static function unblockPerson($activity) + public static function unblockAccount($activity) { $cid = Contact::getIdForURL($activity['actor']); if (empty($cid)) { diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 53cab9aafd..caf97231fe 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -670,7 +670,7 @@ class Receiver case 'as:Block': if (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) { - ActivityPub\Processor::blockPerson($object_data); + ActivityPub\Processor::blockAccount($object_data); } else { self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer); } @@ -729,7 +729,7 @@ class Receiver ActivityPub\Processor::rejectFollowUser($object_data); } elseif (($object_data['object_type'] == 'as:Block') && in_array($object_data['object_object_type'], self::ACCOUNT_TYPES)) { - ActivityPub\Processor::unblockPerson($object_data); + ActivityPub\Processor::unblockAccount($object_data); } elseif (in_array($object_data['object_type'], array_merge(self::ACTIVITY_TYPES, ['as:Announce'])) && in_array($object_data['object_object_type'], array_merge(['as:Tombstone'], self::CONTENT_TYPES))) { ActivityPub\Processor::undoActivity($object_data); -- 2.39.5