Remove DI dependency in Object\Api\Mastodon\Instance

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

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 9cf85b6feb2d105dd44cd55e0dbe887076064d6e..517a364b6e71840b8de299ab004df5275f406e17 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -251,19 +251,21 @@ class Conversation
        /**
         * Format the activity text for an item/photo/video
         *
-        * @param array  $links = array of pre-linked names of actors
-        * @param string $verb  = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
-        * @param int    $id    = item id
+        * @param array  $links    array of pre-linked names of actors
+        * @param string $verb     one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
+        * @param int    $id       item id
+        * @param string $activity Activity URI
+        * @param array  $emojis   Array with emoji reactions
         * @return string formatted text
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function formatActivity(array $links, string $verb, int $id): string
+       public function formatActivity(array $links, string $verb, int $id, string $activity, array $emojis): string
        {
                $this->profiler->startRecording('rendering');
                $expanded = '';
 
                $phrase = $this->getLikerPhrase($verb, $links);
-               $total  = count($links);
+               $total  = max(count($links), $emojis[$activity]['total'] ?? 0);
 
                if ($total > 1) {
                        $spanatts  = "class=\"btn btn-link fakelink\" onclick=\"openClose('{$verb}list-$id');\"";
@@ -567,7 +569,7 @@ class Conversation
                        $live_update_div = '<div id="live-search"></div>' . "\r\n";
                }
 
-               $page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid && $mode != self::MODE_SEARCH;
+               $page_dropping = $this->session->getLocalUserId() && $this->pConfig->get($this->session->getLocalUserId(), 'system', 'show_page_drop', true) && ($this->session->getLocalUserId() == $uid && $mode != self::MODE_SEARCH);
 
                if (!$update) {
                        $_SESSION['return_path'] = $this->args->getQueryString();
@@ -889,8 +891,10 @@ class Conversation
                        $condition['author-hidden'] = false;
                }
 
-               if ($this->config->get('system', 'emoji_activities')) {
-                       $emojis = $this->getEmojis($uriids);
+               $emojis      = $this->getEmojis($uriids);
+               $quoteshares = $this->getQuoteShares($uriids);
+
+               if (!$this->config->get('system', 'legacy_activities')) {
                        $condition = DBA::mergeConditions($condition, ["(`gravity` != ? OR `origin`)", ItemModel::GRAVITY_ACTIVITY]);
                }
 
@@ -1012,7 +1016,8 @@ class Conversation
                }
 
                foreach ($items as $key => $row) {
-                       $items[$key]['emojis'] = $emojis[$key] ?? [];
+                       $items[$key]['emojis']      = $emojis[$key] ?? [];
+                       $items[$key]['quoteshares'] = $quoteshares[$key] ?? [];
 
                        $always_display = in_array($mode, [self::MODE_CONTACTS, self::MODE_CONTACT_POSTS]);
 
@@ -1089,6 +1094,31 @@ class Conversation
                return $emojis;
        }
 
+       /**
+        * Fetch quote shares from the conversation
+        *
+        * @param array $uriids
+        * @return array
+        */
+       private function getQuoteShares(array $uriids): array
+       {
+               $condition = DBA::mergeConditions(['quote-uri-id' => $uriids], ["NOT `quote-uri-id` IS NULL"]);
+               $separator = chr(255) . chr(255) . chr(255);
+
+               $sql = "SELECT `quote-uri-id`, COUNT(*) AS `total`, GROUP_CONCAT(REPLACE(`name`, '" . $separator . "', ' ') SEPARATOR '" . $separator . "' LIMIT 50) AS `title` FROM `post-content` INNER JOIN `post` ON `post`.`uri-id` = `post-content`.`uri-id` INNER JOIN `contact` ON `post`.`author-id` = `contact`.`id` WHERE " . array_shift($condition) . " GROUP BY `quote-uri-id`";
+
+               $quotes = [];
+
+               $rows = DBA::p($sql, $condition);
+               while ($row = DBA::fetch($rows)) {
+                       $quotes[$row['quote-uri-id']]['total'] = $row['total'];
+                       $quotes[$row['quote-uri-id']]['title'] = array_unique(explode($separator, $row['title']));
+               }
+               DBA::close($rows);
+
+               return $quotes;
+       }
+
        /**
         * Plucks the children of the given parent from a given item list.
         *