From b6268d8d8d641d1a897a4a044d35fe811dc8dcbc Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 17 Aug 2024 03:04:00 +0000
Subject: [PATCH] Issue 14364: Fix delivery of group posts to Friendica
 contacts

---
 src/Content/Item.php                     |  6 +++---
 src/Protocol/ActivityPub/Transmitter.php | 12 ------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 08ba3d6fa8..6befe978ff 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -547,9 +547,9 @@ class Item
 			$item['private'] = $private_group ? ItemModel::PRIVATE : ItemModel::UNLISTED;
 
 			if ($only_to_group) {
-				$ucid = Contact::getUserContactId($group_contact['id'], $item['uid']);
-				if ($ucid) {
-					$item['owner-id'] = $ucid;
+				$pcid = Contact::getPublicContactId($group_contact['id'], $item['uid']);
+				if ($pcid) {
+					$item['owner-id'] = $pcid;
 					unset($item['owner-link']);
 					unset($item['owner-name']);
 					unset($item['owner-avatar']);
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index fe801980f2..20ff0e6f3b 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1028,14 +1028,6 @@ class Transmitter
 	{
 		$inboxes = [];
 
-		$isGroup = false;
-		if (!empty($uid)) {
-			$profile = User::getOwnerDataById($uid);
-			if (!empty($profile)) {
-				$isGroup = $profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY;
-			}
-		}
-
 		if ($all_ap) {
 			// Will be activated in a later step
 			$networks = Protocol::FEDERATED;
@@ -1064,10 +1056,6 @@ class Transmitter
 				continue;
 			}
 
-			if ($isGroup && ($contact['network'] == Protocol::DFRN)) {
-				continue;
-			}
-
 			if (Network::isUrlBlocked($contact['url'])) {
 				continue;
 			}