Merge pull request #13541 from MrPetovan/bug/13534-image-blurred

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

diff --git a/src/Model/Post.php b/src/Model/Post.php
index 770ab083178f41b3ee8d3a14021bbb433581ca33..fe484502212ae67895d4cadc888f3555c4163ba6 100644 (file)
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -36,10 +36,10 @@ class Post
         *
         * @param integer $uri_id
         * @param array   $fields
-        * @return int    ID of inserted post
+        * @return bool   Success of the insert process
         * @throws \Exception
         */
-       public static function insert(int $uri_id, array $data = []): int
+       public static function insert(int $uri_id, array $data = []): bool
        {
                if (empty($uri_id)) {
                        throw new BadMethodCallException('Empty URI_id');
@@ -50,11 +50,7 @@ class Post
                // Additionally assign the key fields
                $fields['uri-id'] = $uri_id;
 
-               if (!DBA::insert('post', $fields, Database::INSERT_IGNORE)) {
-                       return 0;
-               }
-
-               return DBA::lastInsertId();
+               return DBA::insert('post', $fields, Database::INSERT_IGNORE);
        }
 
        /**
@@ -453,12 +449,10 @@ class Post
                        AND (NOT `causer-blocked` OR `causer-id` = ? OR `causer-id` IS NULL) AND NOT `contact-blocked`
                        AND ((NOT `contact-readonly` AND NOT `contact-pending` AND (`contact-rel` IN (?, ?)))
                                OR `self` OR `contact-uid` = ?)
-                       AND NOT `" . $view . "`.`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `uid` = ? AND `hidden`)
-                       AND NOT `author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `blocked` AND `cid` = `author-id`)
-                       AND NOT `owner-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `blocked` AND `cid` = `owner-id`)
-                       AND NOT `author-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `ignored` AND `cid` = `author-id`)
-                       AND NOT `owner-id` IN (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `ignored` AND `cid` = `owner-id`)",
-                               0, Contact::SHARING, Contact::FRIEND, 0, $uid, $uid, $uid, $uid, $uid]);
+                       AND NOT EXISTS(SELECT `uri-id` FROM `post-user`    WHERE `uid` = ? AND `uri-id` = " . DBA::quoteIdentifier($view) . ".`uri-id` AND `hidden`)
+                       AND NOT EXISTS(SELECT `cid`    FROM `user-contact` WHERE `uid` = ? AND `cid` IN (`author-id`, `owner-id`) AND (`blocked` OR `ignored`))
+                       AND NOT EXISTS(SELECT `gsid`   FROM `user-gserver` WHERE `uid` = ? AND `gsid` IN (`author-gsid`, `owner-gsid`, `causer-gsid`) AND `ignored`)",
+                               0, Contact::SHARING, Contact::FRIEND, 0, $uid, $uid, $uid]);
 
                $select_string = implode(', ', array_map([DBA::class, 'quoteIdentifier'], $selected));