Use short form array syntax everywhere

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index 4cb881569389a7093f72d6d2b42502dec9a5fbd3..7c20018259e005a0ea4d2a10a6b359f74460e896 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\Model\Contact;
 
 function add_thread($itemid, $onlyshadow = false) {
        $items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
@@ -16,11 +18,7 @@ function add_thread($itemid, $onlyshadow = false) {
        $item['iid'] = $itemid;
 
        if (!$onlyshadow) {
-               $result = dbq("INSERT INTO `thread` (`"
-                               .implode("`, `", array_keys($item))
-                               ."`) VALUES ('"
-                               .implode("', '", array_values($item))
-                               ."')");
+               $result = dba::insert('thread', $item);
 
                logger("Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
        }
@@ -36,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,17 +54,22 @@ function add_shadow_thread($itemid) {
        }
 
        // is it an entry from a connector? Only add an entry for natively connected networks
-       if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+       if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
                return;
        }
 
+       // Is the public contact configured as hidden?
+        if (Contact::isHidden($item["owner-id"]) || Contact::isHidden($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;
                }
 
@@ -74,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;
        }
 
@@ -93,18 +96,17 @@ 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");
 
                        unset($item[0]['id']);
                        $item[0]['uid'] = 0;
                        $item[0]['origin'] = 0;
                        $item[0]['wall'] = 0;
-                       $item[0]['contact-id'] = get_contact($item[0]['author-link'], 0);
+                       $item[0]['contact-id'] = Contact::getIdForURL($item[0]['author-link'], 0);
 
-                       if (in_array($item[0]['type'], array("net-comment", "wall-comment"))) {
+                       if (in_array($item[0]['type'], ["net-comment", "wall-comment"])) {
                                $item[0]['type'] = 'remote-comment';
                        } elseif ($item[0]['type'] == 'wall') {
                                $item[0]['type'] = 'remote';
@@ -128,7 +130,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;
        }
 
@@ -146,25 +148,24 @@ 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)
        require_once("include/items.php");
-       require_once("include/Contact.php");
 
        unset($item['id']);
        $item['uid'] = 0;
        $item['origin'] = 0;
        $item['wall'] = 0;
-       $item['contact-id'] = get_contact($item['author-link'], 0);
+       $item['contact-id'] = Contact::getIdForURL($item['author-link'], 0);
 
-       if (in_array($item['type'], array("net-comment", "wall-comment"))) {
+       if (in_array($item['type'], ["net-comment", "wall-comment"])) {
                $item['type'] = 'remote-comment';
        } elseif ($item['type'] == 'wall') {
                $item['type'] = 'remote';
@@ -178,7 +179,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"]);
                }
@@ -189,7 +190,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;
        }
 
@@ -202,7 +203,7 @@ function update_thread($itemid, $setmention = false) {
        $sql = "";
 
        foreach ($item AS $field => $data)
-               if (!in_array($field, array("guid", "title", "body", "rendered-html", "rendered-hash"))) {
+               if (!in_array($field, ["guid", "title", "body", "rendered-html", "rendered-hash"])) {
                        if ($sql != "") {
                                $sql .= ", ";
                        }
@@ -217,7 +218,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;
        }
 
@@ -234,7 +235,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);
                }
@@ -244,18 +245,24 @@ function delete_thread_uri($itemuri, $uid) {
 function delete_thread($itemid, $itemuri = "") {
        $item = q("SELECT `uid` FROM `thread` WHERE `iid` = %d", intval($itemid));
 
-       $result = q("DELETE FROM `thread` WHERE `iid` = %d", intval($itemid));
+       if (!DBM::is_result($item)) {
+               logger('No thread found for id '.$itemid, LOGGER_DEBUG);
+               return;
+       }
+
+       // Using dba::delete at this time could delete the associated item entries
+       $result = dba::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
 
        logger("delete_thread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 
        if ($itemuri != "") {
-               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT (`uid` IN (%d, 0))",
+               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT `deleted` AND NOT (`uid` IN (%d, 0))",
                                dbesc($itemuri),
                                intval($item["uid"])
                        );
-               if (!dbm::is_result($r)) {
-                       dba::delete('item', array('uri' => $itemuri, 'uid' => 0));
-                       logger("delete_thread: Deleted shadow for item ".$itemuri." - ".print_r($result, true), LOGGER_DEBUG);
+               if (!DBM::is_result($r)) {
+                       dba::delete('item', ['uri' => $itemuri, 'uid' => 0]);
+                       logger("delete_thread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG);
                }
        }
 }
@@ -263,7 +270,7 @@ function delete_thread($itemid, $itemuri = "") {
 function update_threads() {
        logger("update_threads: start");
 
-       $messages = dba::select('item', array('id'), array("`id` = `parent`"));
+       $messages = dba::select('item', ['id'], ["`id` = `parent`"]);
 
        logger("update_threads: fetched messages: ".dba::num_rows($messages));
 
@@ -294,8 +301,8 @@ function update_shadow_copy() {
        logger("start");
 
        $condition = "`uid` != 0 AND `network` IN ('', ?, ?, ?) AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private`";
-       $messages = dba::select('thread', array('iid'), array($condition, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS),
-                               array('order' => 'created'));
+       $messages = dba::select('thread', ['iid'], [$condition, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS],
+                               ['order' => 'created']);
 
        logger("fetched messages: ".dba::num_rows($messages));
        while ($message = dba::fetch($messages))