AP: Avoid a misleading log entry / unneeded field removed

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index a85123817aeb788ad6d65dcd9fb99c606912a36a..05e59fd3c10ea1b2dfcf9bd78dd8f14520f4c4e8 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -196,12 +196,15 @@ class Processor
 
                $item['network'] = Protocol::ACTIVITYPUB;
                $item['private'] = !in_array(0, $activity['receiver']);
+               $item['author-link'] = $activity['author'];
                $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
 
                if (empty($activity['thread-completion'])) {
+                       $item['owner-link'] = $activity['actor'];
                        $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
                } else {
                        logger('Ignoring actor because of thread completion.', LOGGER_DEBUG);
+                       $item['owner-link'] = $item['author-link'];
                        $item['owner-id'] = $item['author-id'];
                }
 

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 476c63a58f80790623bf0dd05b5688dfbd7a9149..96c069e589c94d503845e77cff7dc4d44809eceb 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -778,7 +778,6 @@ class Transmitter
 
                $data['url'] = $item['plink'];
                $data['attributedTo'] = $item['author-link'];
-               $data['actor'] = $item['author-link'];
                $data['sensitive'] = self::isSensitive($item['id']);
                $data['context'] = self::fetchContextURLForItem($item);