Only update contact data for OStatus contacts

[friendica.git] / include / ostatus.php

diff --git a/include/ostatus.php b/include/ostatus.php
index d39059eb6f88c0ebdb9f8c9082e1e5be974e455a..523ccfe510e55144255fb0052dd693db7425c976 100644 (file)
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -48,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);
@@ -137,9 +137,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
                        if ($value != "")
                                $contact["location"] = $value;
 
-                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
 
                        poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
                                        "", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
@@ -152,9 +152,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 
                        $photos = import_profile_photo($author["author-avatar"], $importer["uid"], $contact["id"]);
 
-                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
                }
        }
 
@@ -315,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;
                }
@@ -702,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++;