huh? missed again

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index 79340ab2cbe359ab985e26f3fbd636f9129d5adf..c214cf264487a6f89ddecab8248e7b81909ed5b8 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -23,7 +23,7 @@ function add_thread($itemid, $onlyshadow = false) {
 }
 
 /**
- * @brief Add a shadow entry for a given item id
+ * @brief Add a shadow entry for a given item id that is a thread starter
  *
  * We store every public item entry additionally with the user id "0".
  * This is used for the community page and for the search.
@@ -97,7 +97,15 @@ function add_shadow_thread($itemid) {
                        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);
+
+                       if (in_array($item[0]['type'], array("net-comment", "wall-comment"))) {
+                               $item[0]['type'] = 'remote-comment';
+                       } elseif ($item[0]['type'] == 'wall') {
+                               $item[0]['type'] = 'remote';
+                       }
+
                        $public_shadow = item_store($item[0], false, false, true);
 
                        logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
@@ -105,7 +113,28 @@ function add_shadow_thread($itemid) {
        }
 }
 
-function add_shadow_entry($item) {
+/**
+ * @brief Add a shadow entry for a given item id that is a comment
+ *
+ * This function does the same like the function above - but for comments
+ *
+ * @param integer $itemid Item ID that should be added
+ */
+function add_shadow_entry($itemid) {
+
+       $items = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid));
+
+       if (!dbm::is_result($items)) {
+               return;
+       }
+
+       $item = $items[0];
+
+       // Is it a toplevel post?
+       if ($item['id'] == $item['parent']) {
+               add_shadow_thread($itemid);
+               return;
+       }
 
        // Is this a shadow entry?
        if ($item['uid'] == 0)
@@ -113,12 +142,12 @@ function add_shadow_entry($item) {
 
        // Is there a shadow parent?
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri']));
-       if (!count($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 (count($r))
+       if (dbm::is_result($r))
                return;
 
        // Preparing public shadow (removing user specific data)
@@ -127,7 +156,16 @@ function add_shadow_entry($item) {
 
        unset($item['id']);
        $item['uid'] = 0;
+       $item['origin'] = 0;
+       $item['wall'] = 0;
        $item['contact-id'] = get_contact($item['author-link'], 0);
+
+       if (in_array($item['type'], array("net-comment", "wall-comment"))) {
+               $item['type'] = 'remote-comment';
+       } elseif ($item['type'] == 'wall') {
+               $item['type'] = 'remote';
+       }
+
        $public_shadow = item_store($item, false, false, true);
 
        logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);
@@ -136,7 +174,7 @@ function add_shadow_entry($item) {
 function update_thread_uri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if(count($messages))
+       if (dbm::is_result($messages))
                foreach ($messages as $message)
                        update_thread($message["id"]);
 }
@@ -145,7 +183,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 (!$items)
+       if (!dbm::is_result($items))
                return;
 
        $item = $items[0];
@@ -203,7 +241,7 @@ function delete_thread($itemid, $itemuri = "") {
                                dbesc($itemuri),
                                intval($item["uid"])
                        );
-               if (!count($r)) {
+               if (!dbm::is_result($r)) {
                        $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0",
                                dbesc($itemuri)
                        );
@@ -229,12 +267,10 @@ function update_threads() {
 }
 
 function update_threads_mention() {
-       $a = get_app();
-
        $users = q("SELECT `uid`, `nickname` FROM `user` ORDER BY `uid`");
 
        foreach ($users AS $user) {
-               $self = normalise_link($a->get_baseurl() . '/profile/' . $user['nickname']);
+               $self = normalise_link(App::get_baseurl() . '/profile/' . $user['nickname']);
                $selfhttps = str_replace("http://", "https://", $self);
                $parents = q("SELECT DISTINCT(`parent`) FROM `item` WHERE `uid` = %d AND
                                ((`owner-link` IN ('%s', '%s')) OR (`author-link` IN ('%s', '%s')))",