X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FProcessor.php;h=41aed2fe3be883d03e41f8c9a03540b919b134e3;hb=496910e750adb48827fe1ce06c766d5f9f067478;hp=61f6389cad04b1e80d4aa74257de0f5990369f97;hpb=dc95d7c4f0634c3de9b1b19f6f0bf27e16d5fd61;p=friendica.git%2F.git diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 61f6389cad..41aed2fe3b 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -370,12 +370,15 @@ class Processor $item['private'] = !in_array(0, $activity['receiver']); $item['author-link'] = $activity['author']; $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true); + $item['owner-link'] = $activity['actor']; + $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); - if (empty($activity['thread-completion'])) { - $item['owner-link'] = $activity['actor']; - $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); - } else { - Logger::info('Ignoring actor because of thread completion.'); + if (!empty($activity['thread-completion'])) { + // Store the original actor in the "causer" fields to enable the check for ignored or blocked contacts + $item['causer-link'] = $item['owner-link']; + $item['causer-id'] = $item['owner-id']; + + Logger::info('Ignoring actor because of thread completion.', ['actor' => $item['owner-link']]); $item['owner-link'] = $item['author-link']; $item['owner-id'] = $item['author-id']; }