Funkwhale context file moved

[friendica.git] / src / Model / Tag.php

diff --git a/src/Model/Tag.php b/src/Model/Tag.php
index c7dbbb336b42c637f9564f403c69cfe4c5919d44..1381f686119fdc197cd5e86faadde60dd9812e43 100644 (file)
--- a/src/Model/Tag.php
+++ b/src/Model/Tag.php
@@ -73,7 +73,7 @@ class Tag
        /**
         * Store tag/mention elements
         *
-        * @param integer $uriId URI id
+        * @param integer $uriId
         * @param integer $type Tag type
         * @param string  $name Tag name
         * @param string  $url Contact URL (optional)
@@ -217,7 +217,7 @@ class Tag
         * Get a tag id for a given tag name and URL
         *
         * @param string $name Name of tag
-        * @param string $url URL
+        * @param string $url
         * @param int    $type Type of tag
         * @return int Tag id
         */
@@ -243,9 +243,8 @@ class Tag
                        return $tid;
                }
 
-               // Also log type and tag id
+               // Also log type
                $fields['type'] = $type;
-               $fields['tid'] = $tid;
 
                Logger::error('No tag id created', $fields);
                return 0;
@@ -254,10 +253,10 @@ class Tag
        /**
         * Store tag/mention elements
         *
-        * @param integer $uriId URI id
-        * @param string $hash Hash
-        * @param string $name Name
-        * @param string $url URL
+        * @param integer $uriId
+        * @param string $hash
+        * @param string $name
+        * @param string $url
         * @param boolean $probing Whether probing is active
         * @return void
         */
@@ -372,7 +371,7 @@ class Tag
        /**
         * Remove tag/mention
         *
-        * @param integer $uriId URI id
+        * @param integer $uriId
         * @param integer $type Type
         * @param string $name Name
         * @param string $url URL
@@ -397,10 +396,10 @@ class Tag
        /**
         * Remove tag/mention
         *
-        * @param integer $uriId URI id
-        * @param string $hash Hash
-        * @param string $name Name
-        * @param string $url URL
+        * @param integer $uriId
+        * @param string $hash
+        * @param string $name
+        * @param string $url
         * @return void
         */
        public static function removeByHash(int $uriId, string $hash, string $name, string $url = '')
@@ -416,7 +415,7 @@ class Tag
        /**
         * Get the type for the given hash
         *
-        * @param string $hash Hash
+        * @param string $hash
         * @return integer Tag type
         */
        private static function getTypeForHash(string $hash): int
@@ -437,8 +436,8 @@ class Tag
        /**
         * Create implicit mentions for a given post
         *
-        * @param integer $uriId URI Id
-        * @param integer $parentUriId Parent URI id
+        * @param integer $uriId
+        * @param integer $parentUriId
         * @return void
         */
        public static function createImplicitMentions(int $uriId, int $parentUriId)
@@ -461,7 +460,7 @@ class Tag
        /**
         * Retrieves the terms from the provided type(s) associated with the provided item ID.
         *
-        * @param int       $uriId URI id
+        * @param int   $uriId
         * @param array $type Tag type(s)
         * @return array|bool Array on success, false on error
         * @throws \Exception
@@ -475,7 +474,7 @@ class Tag
        /**
         * Return a string with all tags and mentions
         *
-        * @param integer $uriId URI id
+        * @param integer $uriId
         * @param array   $type Tag type(s)
         * @return string tags and mentions
         * @throws \Exception
@@ -565,15 +564,8 @@ class Tag
        {
                $condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
                        AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
-                       $search,
-                       0,
-                       $uid,
-                       Protocol::ACTIVITYPUB,
-                       Protocol::DFRN,
-                       Protocol::DIASPORA,
-                       Protocol::OSTATUS,
-                       $uid,
-                       0,
+                       $search, 0, $uid,
+                       Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0,
                ];
 
                return DBA::count('tag-search-view', $condition);
@@ -593,15 +585,8 @@ class Tag
        {
                $condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
                        AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
-                       $search,
-                       0,
-                       $uid,
-                       Protocol::ACTIVITYPUB,
-                       Protocol::DFRN,
-                       Protocol::DIASPORA,
-                       Protocol::OSTATUS,
-                       $uid,
-                       0,
+                       $search, 0, $uid,
+                       Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0,
                ];
 
                if (!empty($last_uriid)) {
@@ -686,9 +671,7 @@ class Tag
                        FROM `tag-search-view`
                        WHERE `private` = ? AND `uid` = ? AND `uri-id` > ? $block_sql
                        GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
-                       Item::PUBLIC,
-                       0,
-                       $post['uri-id'],
+                       Item::PUBLIC, 0, $post['uri-id'],
                        $limit
                );
 
@@ -743,8 +726,7 @@ class Tag
                        FROM `tag-search-view`
                        WHERE `private` = ? AND `wall` AND `origin` AND `uri-id` > ? $block_sql
                        GROUP BY `term` ORDER BY `authors` DESC, `score` DESC LIMIT ?",
-                       Item::PUBLIC,
-                       $post['uri-id'],
+                       Item::PUBLIC, $post['uri-id'],
                        $limit
                );
 
@@ -797,7 +779,7 @@ class Tag
        /**
         * Fetch user who subscribed to the tags of the given item
         *
-        * @param integer $uriId URI Id
+        * @param integer $uriId
         * @return array User list
         */
        public static function getUIDListByURIId(int $uriId): array