Issue 14364: Fix delivery of group posts to Friendica contacts

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 08ba3d6fa811e5b9ad5dde614899f666f2451e47..6befe978ff4edf085957886c4b2b588c480ec19f 100644 (file)
--- 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 fe801980f25d8ee975e9f7ce4457b950d8f02c5c..20ff0e6f3b47e1841cfc8f68b60f64cf6380a0c7 100644 (file)
--- 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;
                        }