restore jotplugins

[friendica.git] / include / ostatus_conversation.php

diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index f40c4827b94759b8e416ce7181c9a6ce8a19b159..cbf0163b7cf5cbcd56f7dc4a6300139c6f0a8f18 100644 (file)
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -53,8 +53,9 @@ function check_conversations($override = false) {
         logger('cron_start');
 
         $start = date("Y-m-d H:i:s", time() - ($poll_timeframe * 60));
-        $conversations = q("SELECT * FROM `term` WHERE `type` = 7 AND `term` > '%s'",
+        $conversations = q("SELECT `oid`, `url` FROM `term` WHERE `type` = 7 AND `term` > '%s' GROUP BY `url` ORDER BY `term` DESC",
                                 dbesc($start));
+
         foreach ($conversations AS $conversation) {
                 $id = $conversation['oid'];
                 $url = $conversation['url'];
@@ -137,13 +138,13 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                if (isset($single_conv->object->id))
                        $single_conv->id = $single_conv->object->id;
 
-               logger("Got id ".$single_conv->id, LOGGER_DEBUG);
+               //logger("Got id ".$single_conv->id, LOGGER_DEBUG);
 
                $plink = ostatus_convert_href($single_conv->id);
                if (isset($single_conv->object->url))
                        $plink = ostatus_convert_href($single_conv->object->url);
 
-               logger("Got url ".$plink, LOGGER_DEBUG);
+               //logger("Got url ".$plink, LOGGER_DEBUG);
 
                if (@!$single_conv->id)
                        continue;
@@ -151,12 +152,16 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                if ($first_id == "") {
                        $first_id = $single_conv->id;
 
+                       // To-Do:
+                       // Only fetch a new parent if the new one doesn't have parents
+                       // It can happen that OStatus servers have incomplete threads.
                        $new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
                                intval($message["uid"]), dbesc($first_id),
                                dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
                        if ($new_parents) {
                                $parent = $new_parents[0];
-                               logger('adopting new parent '.$parent["id"].' for '.$itemid);
+                               if ($parent["id"] != $message["parent"])
+                                       logger('Fetch new parent id '.$parent["id"].' for '.$itemid.' Old parent: '.$message["parent"]);
                        } else {
                                $parent["id"] = 0;
                                $parent["uri"] = $first_id;
@@ -168,12 +173,12 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                else
                        $parent_uri = $parent["uri"];
 
-               $message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `plink` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
+               $message_exists = q("SELECT `id`, `parent` FROM `item` WHERE `uid` = %d AND `plink` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
                                                        intval($message["uid"]), dbesc($plink),
                                                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
 
                if (!$message_exists)
-                       $message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
+                       $message_exists = q("SELECT `id`, `parent` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
                                                        intval($message["uid"]), dbesc($single_conv->id),
                                                        dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
 
@@ -181,14 +186,17 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                        if ($parent["id"] != 0) {
                                $existing_message = $message_exists[0];
 
-                               logger('updating id '.$existing_message["id"].' to parent '.$parent["id"].' uri '.$parent["uri"].' thread '.$parent_uri, LOGGER_DEBUG);
-
-                               // This is partly bad, since the entry in the thread table isn't updated
-                               $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d",
-                                       intval($parent["id"]),
-                                       dbesc($parent["uri"]),
-                                       dbesc($parent_uri),
-                                       intval($existing_message["id"]));
+                               // Normally this shouldn't happen anymore, since we improved the way we fetch OStatus messages
+                               if ($existing_message["parent"] != $parent["id"]) {
+                                       logger('updating id '.$existing_message["id"].' to parent '.$parent["id"].' uri '.$parent["uri"].' thread '.$parent_uri, LOGGER_DEBUG);
+
+                                       // This is partly bad, since the entry in the thread table isn't updated
+                                       $r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d",
+                                               intval($parent["id"]),
+                                               dbesc($parent["uri"]),
+                                               dbesc($parent_uri),
+                                               intval($existing_message["id"]));
+                               }
                        }
                        continue;
                }
@@ -241,7 +249,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                $arr["author-name"] = $arr["owner-name"];
                $arr["author-link"] = $actor;
                $arr["author-avatar"] = $single_conv->actor->image->url;
-               $arr["body"] = html2bbcode($single_conv->content);
+               $arr["body"] = add_page_info_to_body(html2bbcode($single_conv->content));
 
                if (isset($single_conv->status_net->notice_info->source))
                        $arr["app"] = strip_tags($single_conv->status_net->notice_info->source);
@@ -273,6 +281,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
                complete_conversation($newitem, $conversation_url, true);
 
                // If the newly created item is the top item then change the parent settings of the thread
+               // This shouldn't happen anymore. This could is supposed to be absolote.
                if ($newitem AND ($arr["uri"] == $first_id)) {
                        logger('setting new parent to id '.$newitem);
                        $new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",