From 37d15b47e83c993c1b0f266f2c948e1f04104c24 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 8 Apr 2021 19:38:16 +0000 Subject: [PATCH] Issue 10126: Transmit "adjust" --- src/Protocol/ActivityPub/Processor.php | 2 +- src/Protocol/ActivityPub/Receiver.php | 1 + src/Protocol/ActivityPub/Transmitter.php | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index c30a4ccc99..66aedf65b0 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -513,7 +513,7 @@ class Processor $event['finish'] = $activity['end-time']; $event['nofinish'] = empty($event['finish']); $event['location'] = $activity['location']; - $event['adjust'] = true; + $event['adjust'] = $activity['adjust'] ?? true; $event['cid'] = $item['contact-id']; $event['uid'] = $item['uid']; $event['uri'] = $item['uri']; diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index a8c997c60c..c98e701439 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -1372,6 +1372,7 @@ class Receiver $object_data = self::getSource($object, $object_data); $object_data['start-time'] = JsonLD::fetchElement($object, 'as:startTime', '@value'); $object_data['end-time'] = JsonLD::fetchElement($object, 'as:endTime', '@value'); + $object_data['adjust'] = JsonLD::fetchElement($object, 'dfrn:adjust', '@value'); $object_data['location'] = $location; $object_data['latitude'] = JsonLD::fetchElement($object, 'as:location', 'as:latitude', '@type', 'as:Place'); $object_data['latitude'] = JsonLD::fetchElement($object_data, 'latitude', '@value'); diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 8adc7c4963..65a3c9167a 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -1408,7 +1408,7 @@ class Transmitter * @return array with the event data * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function createEvent($item) + private static function createEvent($item) { $event = []; $event['name'] = $item['event-summary']; @@ -1424,6 +1424,8 @@ class Transmitter $event['location'] = self::createLocation($item); } + $event['dfrn:adjust'] = (bool)$item['event-adjust']; + return $event; }