clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7306 from annando/perform-activity 

Fix the processing of event activities
This commit is contained in:
Hypolite Petovan 2019-06-22 19:23:09 -04:00 committed by GitHub
parent daaf30e502 449305e527
commit dc25355412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Protocol/ActivityPub/Receiver.php
View File

@ -222,8 +222,7 @@ class Receiver
// We had been able to retrieve the object data - so we can trust the source
$trust_source = true;
} elseif (in_array($type, ['as:Like', 'as:Dislike']) ||
(($type == 'as:Follow') && in_array($object_type, self::CONTENT_TYPES))) {
} elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow'])) && in_array($object_type, self::CONTENT_TYPES)) {
// Create a mostly empty array out of the activity data (instead of the object).
// This way we later don't have to check for the existence of ech individual array element.
$object_data = self::processObject($activity);