From 1743682153e713ae9ee69d3813bae0b646d008c6 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 28 Feb 2020 09:46:53 +0000 Subject: [PATCH] We don't need to pass the protocol that way --- src/Protocol/ActivityPub/Processor.php | 5 +++-- src/Protocol/ActivityPub/Receiver.php | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index f184bb405b..724ac3092d 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -29,6 +29,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\APContact; use Friendica\Model\Contact; +use Friendica\Model\Conversation; use Friendica\Model\Event; use Friendica\Model\Item; use Friendica\Model\Mail; @@ -448,9 +449,9 @@ class Processor $item['owner-link'] = $activity['actor']; $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); - if (!empty($activity['raw']) && isset($activity['protocol'])) { + if (!empty($activity['raw'])) { $item['source'] = $activity['raw']; - $item['protocol'] = $activity['protocol']; + $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB; $item['conversation-href'] = $activity['context'] ?? ''; $item['conversation-uri'] = $activity['conversation'] ?? ''; } diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index b7622e962f..a6d3d6479e 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -28,7 +28,6 @@ use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Model\Contact; use Friendica\Model\APContact; -use Friendica\Model\Conversation; use Friendica\Model\Item; use Friendica\Model\User; use Friendica\Protocol\Activity; @@ -355,7 +354,6 @@ class Receiver if (!empty($body)) { $object_data['raw'] = $body; - $object_data['protocol'] = Conversation::PARCEL_ACTIVITYPUB; } // Internal flag for thread completion. See Processor.php