Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 07:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11959 from annando/notice

Browse source 
Fix: Undefined array key "object_object_type"
This commit is contained in:
Philipp 2022-10-03 22:21:18 +02:00 committed by GitHub
commit e1bf708552
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -887,13 +887,13 @@ class Receiver
} 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::unblockAccount($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);
} elseif (in_array($object_data['object_type'], array_merge(self::ACTIVITY_TYPES, ['as:Announce', 'as:Create', ''])) && } elseif (in_array($object_data['object_type'], array_merge(self::ACTIVITY_TYPES, ['as:Announce', 'as:Create', ''])) &&
empty($object_data['object_object_type'])) { empty($object_data['object_object_type'])) {
// We cannot detect the target object. So we can ignore it. // We cannot detect the target object. So we can ignore it.
Queue::remove($object_data); Queue::remove($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);
} elseif (in_array($object_data['object_type'], ['as:Create']) && } elseif (in_array($object_data['object_type'], ['as:Create']) &&
in_array($object_data['object_object_type'], ['pt:CacheFile'])) { in_array($object_data['object_object_type'], ['pt:CacheFile'])) {
// Unhandled Peertube activity // Unhandled Peertube activity