Continued:

[friendica.git] / src / Content / Item.php

diff --git a/src/Content/Item.php b/src/Content/Item.php
index d28ec4066d66e250eea7f047219710f30598892d..c7438d2593b57ec0f939f643bcc1c4e067590430 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -383,7 +383,7 @@ class Item
                        'url'     => $item['author-link'],
                        'alias'   => $item['author-alias'],
                ];
-               $profile_link = Contact::magicLinkByContact($author, $item['author-link']);
+               $profile_link = Contact::magicLinkByContact($author, Contact::getProfileLink($author));
                if (strpos($profile_link, 'contact/redir/') === 0) {
                        $status_link  = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/status']);
                        $photos_link  = $profile_link . '?' . http_build_query(['url' => $item['author-link'] . '/photos']);
@@ -1049,8 +1049,6 @@ class Item
                        Tag::createImplicitMentions($post['uri-id'], $post['thr-parent-id']);
                }
 
-               ActivityPub\Transmitter::storeReceiversForItem($post);
-
                Hook::callAll('post_local_end', $post);
 
                $author = DBA::selectFirst('contact', ['thumb'], ['uid' => $post['uid'], 'self' => true]);
@@ -1072,17 +1070,32 @@ class Item
                }
        }
 
-       public function copyPermissions(int $fromUriId, int $toUriId)
+       public function copyPermissions(int $fromUriId, int $toUriId, int $parentUriId)
        {
-               $from        = Post::selectFirstPost(['author-id'], ['uri-id' => $fromUriId]);
-               $from_author = DBA::selectFirst('account-view', ['ap-followers'], ['id' => $from['author-id']]);
-               $to          = Post::selectFirstPost(['author-id'], ['uri-id' => $toUriId]);
-               $to_author   = DBA::selectFirst('account-view', ['ap-followers'], ['id' => $to['author-id']]);
+               $from          = Post::selectFirstPost(['author-id'], ['uri-id' => $fromUriId]);
+               $from_author   = DBA::selectFirst('account-view', ['ap-followers'], ['id' => $from['author-id']]);
+               $to            = Post::selectFirstPost(['author-id'], ['uri-id' => $toUriId]);
+               $to_author     = DBA::selectFirst('account-view', ['ap-followers'], ['id' => $to['author-id']]);
+               $parent        = Post::selectFirstPost(['author-id'], ['uri-id' => $parentUriId]);
+               $parent_author = DBA::selectFirst('account-view', ['ap-followers'], ['id' => $parent['author-id']]);
+               
+               $followers = '';
+               foreach (array_column(Tag::getByURIId($parentUriId, [Tag::TO, Tag::CC, Tag::BCC]), 'url') as $url) {
+                       if ($url == $parent_author['ap-followers']) {
+                               $followers = $url;
+                               break;
+                       }
+               }
 
                $existing = array_column(Tag::getByURIId($toUriId, [Tag::TO, Tag::CC, Tag::BCC]), 'url');
 
                foreach (Tag::getByURIId($fromUriId, [Tag::TO, Tag::CC, Tag::BCC]) as $receiver) {
                        if ($receiver['url'] == $from_author['ap-followers']) {
+                               if (!empty($followers)) {
+                                       $receiver['url']  = $followers;
+                                       $receiver['name'] = trim(parse_url($receiver['url'], PHP_URL_PATH), '/');
+                                       Tag::store($toUriId, $receiver['type'], $receiver['name'], $receiver['url']);
+                               }
                                $receiver['url']  = $to_author['ap-followers'];
                                $receiver['name'] = trim(parse_url($receiver['url'], PHP_URL_PATH), '/');
                        }