Add Contact Object

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index d04ba38ef18069f3d71d841acf79f291e5ba73d4..a1a6c78251c4715fd960825fc190a5d58f109356 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -2,6 +2,8 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
 
 function add_thread($itemid, $onlyshadow = false) {
        $items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
@@ -32,10 +34,10 @@ function add_thread($itemid, $onlyshadow = false) {
  * @param integer $itemid Item ID that should be added
  */
 function add_shadow_thread($itemid) {
-       $items = q("SELECT `uid`, `wall`, `private`, `moderated`, `visible`, `contact-id`, `deleted`, `network`
+       $items = q("SELECT `uid`, `wall`, `private`, `moderated`, `visible`, `contact-id`, `deleted`, `network`, `author-id`, `owner-id`
                FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
-       if (!dbm::is_result($items)) {
+       if (!DBM::is_result($items)) {
                return;
        }
 
@@ -56,13 +58,18 @@ function add_shadow_thread($itemid) {
                return;
        }
 
+       // Is the public contact configured as hidden?
+        if (hiddenContact($item["owner-id"]) || hiddenContact($item["author-id"])) {
+                return;
+        }
+
        // Only do these checks if the post isn't a wall post
        if (!$item["wall"]) {
                // Check, if hide-friends is activated - then don't do a shadow entry
                $r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
                        $item['uid']);
 
-               if (!dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        return;
                }
 
@@ -70,14 +77,14 @@ function add_shadow_thread($itemid) {
                $r = q("SELECT `id` FROM `contact` WHERE NOT `hidden` AND NOT `blocked` AND `id` = %d",
                        $item['contact-id']);
 
-               if (!dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        return;
                }
        }
 
        // Only add a shadow, if the profile isn't hidden
        $r = q("SELECT `uid` FROM `user` where `uid` = %d AND NOT `hidewall`", $item['uid']);
-       if (!dbm::is_result($r)) {
+       if (!DBM::is_result($r)) {
                return;
        }
 
@@ -89,7 +96,7 @@ function add_shadow_thread($itemid) {
                $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1",
                        dbesc($item['uri']));
 
-               if (!dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        // Preparing public shadow (removing user specific data)
                        require_once("include/items.php");
                        require_once("include/Contact.php");
@@ -124,7 +131,7 @@ function add_shadow_entry($itemid) {
 
        $items = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid));
 
-       if (!dbm::is_result($items)) {
+       if (!DBM::is_result($items)) {
                return;
        }
 
@@ -142,12 +149,12 @@ function add_shadow_entry($itemid) {
 
        // Is there a shadow parent?
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri']));
-       if (!dbm::is_result($r))
+       if (!DBM::is_result($r))
                return;
 
        // Is there already a shadow entry?
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri']));
-       if (dbm::is_result($r))
+       if (DBM::is_result($r))
                return;
 
        // Preparing public shadow (removing user specific data)
@@ -174,7 +181,7 @@ function add_shadow_entry($itemid) {
 function update_thread_uri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if (dbm::is_result($messages)) {
+       if (DBM::is_result($messages)) {
                foreach ($messages as $message) {
                        update_thread($message["id"]);
                }
@@ -185,7 +192,7 @@ function update_thread($itemid, $setmention = false) {
        $items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
                        `deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
-       if (!dbm::is_result($items)) {
+       if (!DBM::is_result($items)) {
                return;
        }
 
@@ -213,7 +220,7 @@ function update_thread($itemid, $setmention = false) {
        // Updating a shadow item entry
        $items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"]));
 
-       if (!dbm::is_result($items)) {
+       if (!DBM::is_result($items)) {
                return;
        }
 
@@ -230,7 +237,7 @@ function update_thread($itemid, $setmention = false) {
 function delete_thread_uri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if (dbm::is_result($messages)) {
+       if (DBM::is_result($messages)) {
                foreach ($messages as $message) {
                        delete_thread($message["id"], $itemuri);
                }
@@ -240,7 +247,7 @@ function delete_thread_uri($itemuri, $uid) {
 function delete_thread($itemid, $itemuri = "") {
        $item = q("SELECT `uid` FROM `thread` WHERE `iid` = %d", intval($itemid));
 
-       if (!dbm::is_result($item)) {
+       if (!DBM::is_result($item)) {
                logger('No thread found for id '.$itemid, LOGGER_DEBUG);
                return;
        }
@@ -255,7 +262,7 @@ function delete_thread($itemid, $itemuri = "") {
                                dbesc($itemuri),
                                intval($item["uid"])
                        );
-               if (!dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        dba::delete('item', array('uri' => $itemuri, 'uid' => 0));
                        logger("delete_thread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG);
                }