Bugfix: The own avatar was (sometimes?) changed back when it was changed.

[friendica.git] / include / ostatus.php

diff --git a/include/ostatus.php b/include/ostatus.php
index a086177a7a0258578b578613cf7f5a36bfc9f0a2..0dd462d3e16a4aa9c435dc331e6c7b99f5b3ae75 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -26,6 +26,7 @@ function ostatus_check_follow_friends() {
        }
 }
 
+// This function doesn't work reliable by now.
 function ostatus_follow_friends($uid, $url) {
        $contact = probe_url($url);
 
@@ -47,7 +48,7 @@ function ostatus_follow_friends($uid, $url) {
                $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND
                        (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
                        `network` != '%s' LIMIT 1",
-                       intval($uid), dbesc(normalise_link($url)),
+                       intval($uid), dbesc(normalise_link($url)),
                        dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
                if (!$r) {
                        $data = probe_url($friend->statusnet_profile_url);
@@ -314,7 +315,7 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
                        $orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
                        logger("Favorite ".$orig_uri." ".print_r($item, true));
 
-                       $item["verb"] = ACTIVITY_LIKE;
+                       $item["verb"] = ACTIVITY_LIKE;
                        $item["parent-uri"] = $orig_uri;
                        $item["gravity"] = GRAVITY_LIKE;
                }
@@ -701,9 +702,13 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                $conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
                $conv_as = json_decode($conv_as);
 
+               $no_of_items = sizeof($items);
+
                if (@is_array($conv_as->items))
-                       $items = array_merge($items, $conv_as->items);
-               else
+                       foreach ($conv_as->items AS $single_item)
+                               $items[$single_item->id] = $single_item;
+
+               if ($no_of_items == sizeof($items))
                        break;
 
                $pageno++;