"Person" is "Account"

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 89d7604bb40e10744812aeb5fbbb8beb7c6cfad4..5604043fa42e49acbd44ddc8dc0e26f381523276 100644 (file)
--- 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 53cab9aafd368cd75341712af3d59acf0d824dcc..caf97231fea267b06f0d298ce04172320836d8e9 100644 (file)
--- 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);