Merge pull request #11159 from annando/api-finally-moved

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 628cc95f7a6b856089d8afccd3670f17b785c415..0561f5506c7a2680b245a34ede7bdd0e65e7a15e 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -105,7 +105,7 @@ class Post
                                // Only add will be displayed
                                if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
                                        continue;
-                               } elseif (!visible_activity($item)) {
+                               } elseif (!DI::contentItem()->visibleActivity($item)) {
                                        continue;
                                }
 
@@ -125,6 +125,7 @@ class Post
         * Get data in a form usable by a conversation template
         *
         * @param array   $conv_responses conversation responses
+        * @param string $formSecurityToken A security Token to avoid CSF attacks
         * @param integer $thread_level   default = 1
         *
         * @return mixed The data requested on success
@@ -132,10 +133,8 @@ class Post
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function getTemplateData(array $conv_responses, $thread_level = 1)
+       public function getTemplateData(array $conv_responses, string $formSecurityToken, $thread_level = 1)
        {
-               $a = DI::app();
-
                $item = $this->getData();
                $edited = false;
                // If the time between "created" and "edited" differs we add
@@ -176,6 +175,8 @@ class Post
                        ? DI::l10n()->t('Private Message')
                        : false);
 
+               $connector = !$item['global'] ? DI::l10n()->t('Connector Message') : false;
+
                $shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != Item::PRIVATE;
                $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]);
 
@@ -278,7 +279,7 @@ class Post
                foreach ($response_verbs as $value => $verb) {
                        $responses[$verb] = [
                                'self'   => $conv_responses[$verb][$item['uri-id']]['self'] ?? 0,
-                               'output' => !empty($conv_responses[$verb][$item['uri-id']]) ? format_activity($conv_responses[$verb][$item['uri-id']]['links'], $verb, $item['uri-id']) : '',
+                               'output' => !empty($conv_responses[$verb][$item['uri-id']]) ? DI::conversation()->formatActivity($conv_responses[$verb][$item['uri-id']]['links'], $verb, $item['uri-id']) : '',
                        ];
                }
 
@@ -362,7 +363,7 @@ class Post
                        $shiny = 'shiny';
                }
 
-               localize_item($item);
+               DI::contentItem()->localize($item);
 
                $body_html = Item::prepareBody($item, true);
 
@@ -458,7 +459,7 @@ class Post
                        'vwall'           => DI::l10n()->t('via Wall-To-Wall:'),
                        'profile_url'     => $profile_link,
                        'name'            => $profile_name,
-                       'item_photo_menu_html' => item_photo_menu($item),
+                       'item_photo_menu_html' => DI::contentItem()->photoMenu($item, $formSecurityToken),
                        'thumb'           => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['author-link'], $item['uid'], Proxy::SIZE_THUMB)),
                        'osparkle'        => $osparkle,
                        'sparkle'         => $sparkle,
@@ -468,6 +469,7 @@ class Post
                        'app'             => $item['app'],
                        'created'         => $ago,
                        'lock'            => $lock,
+                       'connector'       => $connector,
                        'location_html'   => $location_html,
                        'indent'          => $indent,
                        'shiny'           => $shiny,
@@ -476,6 +478,7 @@ class Post
                        'owner_photo'     => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
                        'owner_name'      => $this->getOwnerName(),
                        'plink'           => Item::getPlink($item),
+                       'browsershare'    => DI::l10n()->t('Share'),
                        'edpost'          => $edpost,
                        'ispinned'        => $ispinned,
                        'pin'             => $pin,
@@ -532,7 +535,7 @@ class Post
                $nb_children = count($children);
                if ($nb_children > 0) {
                        foreach ($children as $child) {
-                               $result['children'][] = $child->getTemplateData($conv_responses, $thread_level + 1);
+                               $result['children'][] = $child->getTemplateData($conv_responses, $formSecurityToken, $thread_level + 1);
                        }
 
                        // Collapse
@@ -593,10 +596,10 @@ class Post
        {
                $item_id = $item->getId();
                if (!$item_id) {
-                       Logger::log('[ERROR] Post::addChild : Item has no ID!!', Logger::DEBUG);
+                       Logger::info('[ERROR] Post::addChild : Item has no ID!!');
                        return false;
                } elseif ($this->getChild($item->getId())) {
-                       Logger::log('[WARN] Post::addChild : Item already exists (' . $item->getId() . ').', Logger::DEBUG);
+                       Logger::info('[WARN] Post::addChild : Item already exists (' . $item->getId() . ').');
                        return false;
                }
 
@@ -695,7 +698,7 @@ class Post
                                return true;
                        }
                }
-               Logger::log('[WARN] Item::removeChild : Item is not a child (' . $id . ').', Logger::DEBUG);
+               Logger::info('[WARN] Item::removeChild : Item is not a child (' . $id . ').');
                return false;
        }
 
@@ -759,7 +762,7 @@ class Post
        public function getDataValue($name)
        {
                if (!isset($this->data[$name])) {
-                       // Logger::log('[ERROR] Item::getDataValue : Item has no value name "'. $name .'".', Logger::DEBUG);
+                       // Logger::info('[ERROR] Item::getDataValue : Item has no value name "'. $name .'".');
                        return false;
                }
 
@@ -776,7 +779,7 @@ class Post
        private function setTemplate($name)
        {
                if (empty($this->available_templates[$name])) {
-                       Logger::log('[ERROR] Item::setTemplate : Template not available ("' . $name . '").', Logger::DEBUG);
+                       Logger::info('[ERROR] Item::setTemplate : Template not available ("' . $name . '").');
                        return false;
                }