From 3951a77318c7d932279919771d406e6dd8cb9f26 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 18 Jun 2023 16:52:49 +0000
Subject: [PATCH] Set the owner for group posts
---
src/Protocol/ActivityPub/Processor.php | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index ac2e719718..2db9f925a9 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -437,6 +437,18 @@ class Processor
$item['isGroup'] = ($actor['type'] ?? 'Person') == 'Group';
}
+ if (!$item['isGroup'] && !empty($activity['receiver_urls']['as:audience'])) {
+ foreach ($activity['receiver_urls']['as:audience'] as $audience) {
+ $actor = APContact::getByURL($audience, false);
+ if (($actor['type'] ?? 'Person') == 'Group') {
+ Logger::debug('Set owner to audience', ['audience' => $audience, 'actor' => $activity['actor'], 'author' => $activity['author']]);
+ $item['isGroup'] = true;
+ $item['owner-link'] = $audience;
+ $item['owner-id'] = Contact::getIdForURL($audience);
+ }
+ }
+ }
+
$item['uri'] = $activity['id'];
if (empty($activity['published']) || empty($activity['updated'])) {
@@ -1060,9 +1072,9 @@ class Processor
}
if ($item['isGroup'] ?? false) {
- $item['contact-id'] = Contact::getIdForURL($activity['actor'], $receiver);
+ $item['contact-id'] = Contact::getIdForURL($item['owner-link'], $receiver);
} else {
- $item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver);
+ $item['contact-id'] = Contact::getIdForURL($item['author-link'], $receiver);
}
if (($receiver != 0) && empty($item['contact-id'])) {