tobias/friendica
1
0
Fork 0
Code Pull requests Activity

"Person" is "Account"

Browse source
This commit is contained in:
Michael 2022-04-05 20:06:04 +00:00
parent c0b3c527d6
commit e6ea015cb4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/ActivityPub/Processor.php
View file

@ -1212,7 +1212,7 @@ class Processor
* @param array $activity * @param array $activity
* @throws \Exception * @throws \Exception
*/ */
public static function blockPerson($activity) public static function blockAccount($activity)
{ {
$cid = Contact::getIdForURL($activity['actor']); $cid = Contact::getIdForURL($activity['actor']);
if (empty($cid)) { if (empty($cid)) {
@ -1235,7 +1235,7 @@ class Processor
* @param array $activity * @param array $activity
* @throws \Exception * @throws \Exception
*/ */
public static function unblockPerson($activity) public static function unblockAccount($activity)
{ {
$cid = Contact::getIdForURL($activity['actor']); $cid = Contact::getIdForURL($activity['actor']);
if (empty($cid)) { if (empty($cid)) {

4
src/Protocol/ActivityPub/Receiver.php
View file

@ -670,7 +670,7 @@ class Receiver
case 'as:Block': case 'as:Block':
if (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) { if (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
ActivityPub\Processor::blockPerson($object_data); ActivityPub\Processor::blockAccount($object_data);
} else { } else {
self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer); self::storeUnhandledActivity(true, $type, $object_data, $activity, $body, $uid, $trust_source, $push, $signer);
} }
@ -729,7 +729,7 @@ class Receiver
ActivityPub\Processor::rejectFollowUser($object_data); ActivityPub\Processor::rejectFollowUser($object_data);
} elseif (($object_data['object_type'] == 'as:Block') && } elseif (($object_data['object_type'] == 'as:Block') &&
in_array($object_data['object_object_type'], self::ACCOUNT_TYPES)) { 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'])) && } 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))) { in_array($object_data['object_object_type'], array_merge(['as:Tombstone'], self::CONTENT_TYPES))) {
ActivityPub\Processor::undoActivity($object_data); ActivityPub\Processor::undoActivity($object_data);