keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12534 from annando/activity-types

Browse source 
Cleanup work with the activity types
This commit is contained in:
Hypolite Petovan 2022-12-26 10:26:45 -05:00 committed by GitHub
commit fa579c2346
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ class Receiver
const PUBLIC_COLLECTION = 'as:Public'; const PUBLIC_COLLECTION = 'as:Public';
const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application']; const ACCOUNT_TYPES = ['as:Person', 'as:Organization', 'as:Service', 'as:Group', 'as:Application'];
const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event', 'as:Audio', 'as:Page', 'as:Question']; const CONTENT_TYPES = ['as:Note', 'as:Article', 'as:Video', 'as:Image', 'as:Event', 'as:Audio', 'as:Page', 'as:Question'];
const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept', 'as:Read']; const ACTIVITY_TYPES = ['as:Like', 'as:Dislike', 'as:Accept', 'as:Reject', 'as:TentativeAccept', 'as:View', 'as:Read', 'litepub:EmojiReact'];
const TARGET_UNKNOWN = 0; const TARGET_UNKNOWN = 0;
const TARGET_TO = 1; const TARGET_TO = 1;
@ -449,7 +449,7 @@ class Receiver
} else { } else {
$object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage'); $object_data['directmessage'] = JsonLD::fetchElement($activity, 'litepub:directMessage');
} }
} elseif (in_array($type, array_merge(self::ACTIVITY_TYPES, ['as:Follow', 'litepub:EmojiReact', 'as:View'])) && 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). // 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 each individual array element. // This way we later don't have to check for the existence of each individual array element.
$object_data = self::processObject($activity); $object_data = self::processObject($activity);
@ -726,8 +726,8 @@ class Receiver
ActivityPub\Processor::addTag($object_data); ActivityPub\Processor::addTag($object_data);
} elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) { } elseif (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::addToFeaturedCollection($object_data); ActivityPub\Processor::addToFeaturedCollection($object_data);
} elseif ($object_data['object_type'] == '') { } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
// The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity. // We don't have the object here or it is deleted. We ignore this activity.
Queue::remove($object_data); Queue::remove($object_data);
} else { } else {
return false; return false;
@ -781,8 +781,8 @@ class Receiver
case 'as:Like': case 'as:Like':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, Activity::LIKE); ActivityPub\Processor::createActivity($object_data, Activity::LIKE);
} elseif (in_array($object_data['object_type'], ['', 'as:Tombstone'])) { } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
// The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity. // We don't have the object here or it is deleted. We ignore this activity.
Queue::remove($object_data); Queue::remove($object_data);
} else { } else {
return false; return false;
@ -792,8 +792,8 @@ class Receiver
case 'as:Dislike': case 'as:Dislike':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, Activity::DISLIKE); ActivityPub\Processor::createActivity($object_data, Activity::DISLIKE);
} elseif (in_array($object_data['object_type'], ['', 'as:Tombstone'])) { } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
// The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity. // We don't have the object here or it is deleted. We ignore this activity.
Queue::remove($object_data); Queue::remove($object_data);
} else { } else {
return false; return false;
@ -861,8 +861,8 @@ class Receiver
case 'as:Remove': case 'as:Remove':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::removeFromFeaturedCollection($object_data); ActivityPub\Processor::removeFromFeaturedCollection($object_data);
} elseif ($object_data['object_type'] == '') { } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
// The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity. // We don't have the object here or it is deleted. We ignore this activity.
Queue::remove($object_data); Queue::remove($object_data);
} else { } else {
return false; return false;
@ -945,8 +945,8 @@ class Receiver
case 'as:View': case 'as:View':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, Activity::VIEW); ActivityPub\Processor::createActivity($object_data, Activity::VIEW);
} elseif ($object_data['object_type'] == '') { } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
// The object type couldn't be determined. Most likely we don't have it here. We ignore this activity. // We don't have the object here or it is deleted. We ignore this activity.
Queue::remove($object_data); Queue::remove($object_data);
} else { } else {
return false; return false;
@ -955,8 +955,8 @@ class Receiver
case 'as:Read': case 'as:Read':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, Activity::READ); ActivityPub\Processor::createActivity($object_data, Activity::READ);
} elseif ($object_data['object_type'] == '') { } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
// The object type couldn't be determined. Most likely we don't have it here. We ignore this activity. // We don't have the object here or it is deleted. We ignore this activity.
Queue::remove($object_data); Queue::remove($object_data);
} else { } else {
return false; return false;
@ -966,8 +966,8 @@ class Receiver
case 'litepub:EmojiReact': case 'litepub:EmojiReact':
if (in_array($object_data['object_type'], self::CONTENT_TYPES)) { if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
ActivityPub\Processor::createActivity($object_data, Activity::EMOJIREACT); ActivityPub\Processor::createActivity($object_data, Activity::EMOJIREACT);
} elseif ($object_data['object_type'] == '') { } elseif (in_array($object_data['object_type'], ['as:Tombstone', ''])) {
// The object type couldn't be determined. We don't have it and we can't fetch it. We ignore this activity. // We don't have the object here or it is deleted. We ignore this activity.
Queue::remove($object_data); Queue::remove($object_data);
} else { } else {
return false; return false;