Merge pull request #10283 from very-ape/fix-message-button

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

diff --git a/src/Model/Post.php b/src/Model/Post.php
index 3727d29a36860d600b05072f9e088ba92f435f34..aae847664db2093efee10ebc45575a2fa44a39ad 100644 (file)
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -127,12 +127,13 @@ class Post
         * Check if post data exists
         *
         * @param array $condition array of fields for condition
+        * @param bool  $user_mode true = post-user-view, false = post-view
         *
         * @return boolean Are there rows for that condition?
         * @throws \Exception
         */
-       public static function exists($condition) {
-               return DBA::exists('post-user-view', $condition);
+       public static function exists($condition, bool $user_mode = true) {
+               return DBA::exists($user_mode ? 'post-user-view' : 'post-view', $condition);
        }
 
        /**
@@ -140,6 +141,7 @@ class Post
         *
         * @param array        $condition array of fields for condition
         * @param array        $params    Array of several parameters
+        * @param bool         $user_mode true = post-user-view, false = post-view
         *
         * @return int
         *
@@ -151,9 +153,9 @@ class Post
         * $count = Post::count($condition);
         * @throws \Exception
         */
-       public static function count(array $condition = [], array $params = [])
+       public static function count(array $condition = [], array $params = [], bool $user_mode = true)
        {
-               return DBA::count('post-user-view', $condition, $params);
+               return DBA::count($user_mode ? 'post-user-view' : 'post-view', $condition, $params);
        }
 
        /**
@@ -265,13 +267,14 @@ class Post
         * @param array $selected  Array of selected fields, empty for all
         * @param array $condition Array of fields for condition
         * @param array $params    Array of several parameters
+        * @param bool  $user_mode true = post-user-view, false = post-view
         *
         * @return boolean|object
         * @throws \Exception
         */
-       public static function select(array $selected = [], array $condition = [], $params = [])
+       public static function select(array $selected = [], array $condition = [], $params = [], bool $user_mode = true)
        {
-               return self::selectView('post-user-view', $selected, $condition, $params);
+               return self::selectView($user_mode ? 'post-user-view' : 'post-view', $selected, $condition, $params);
        }
 
        /**
@@ -320,17 +323,7 @@ class Post
                        AND NOT EXISTS (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `owner-id` AND `ignored` AND `gravity` = ?)",
                        0, Contact::SHARING, Contact::FRIEND, GRAVITY_PARENT, 0, $uid, $uid, $uid, $uid, GRAVITY_PARENT, $uid, GRAVITY_PARENT]);
 
-               $select_string = '';
-
-               if (in_array('pinned', $selected)) {
-                       $selected = array_flip($selected);
-                       unset($selected['pinned']);
-                       $selected = array_flip($selected);      
-
-                       $select_string = "(SELECT `pinned` FROM `post-thread-user` WHERE `uri-id` = `" . $view . "`.`uri-id` AND uid=`" . $view . "`.`uid`) AS `pinned`, ";
-               }
-
-               $select_string .= implode(', ', array_map([DBA::class, 'quoteIdentifier'], $selected));
+               $select_string = implode(', ', array_map([DBA::class, 'quoteIdentifier'], $selected));
 
                $condition_string = DBA::buildCondition($condition);
                $param_string = DBA::buildParameter($params);
@@ -416,7 +409,7 @@ class Post
                if (!DBA::isResult($postthreaduser)) {
                        return $postthreaduser;
                }
-       
+
                $pinned = [];
                while ($useritem = DBA::fetch($postthreaduser)) {
                        $pinned[] = $useritem['uri-id'];