// Only update the contacts if it is an OStatus contact
if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) {
+
// Update contact data
- $value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue;
- if ($value != "")
- $contact["notify"] = $value;
+ // This query doesn't seem to work
+ // $value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue;
+ // if ($value != "")
+ // $contact["notify"] = $value;
+
+ // This query doesn't seem to work as well - I hate these queries
+ // $value = $xpath->query("atom:link[@rel='self' and @type='application/atom+xml']", $context)->item(0)->nodeValue;
+ // if ($value != "")
+ // $contact["poll"] = $value;
- $value = $xpath->evaluate('atom:author/uri/text()', $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
if ($value != "")
$contact["alias"] = $value;
update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
}
+ // Ensure that we are having this contact (with uid=0)
+ $cid = get_contact($author["author-link"], 0);
+
+ if ($cid) {
+ // Update it with the current values
+ q("UPDATE `contact` SET `url` = '%s', `name` = '%s', `nick` = '%s', `alias` = '%s',
+ `about` = '%s', `location` = '%s',
+ `success_update` = '%s', `last-update` = '%s'
+ WHERE `id` = %d",
+ dbesc($author["author-link"]), dbesc($contact["name"]), dbesc($contact["nick"]),
+ dbesc($contact["alias"]), dbesc($contact["about"]), dbesc($contact["location"]),
+ dbesc(datetime_convert()), dbesc(datetime_convert()), intval($cid));
+
+ // Update the avatar
+ update_contact_avatar($author["author-avatar"], 0, $cid);
+ }
+
$contact["generation"] = 2;
+ $contact["hide"] = false; // OStatus contacts are never hidden
$contact["photo"] = $author["author-avatar"];
update_gcontact($contact);
}
$orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
$orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
+ $orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
$orig_contact = $contact;
$orig_author = self::fetchauthor($xpath, $activityobjects, $importer, $orig_contact, false);
$item["author-avatar"] = $orig_author["author-avatar"];
$item["body"] = add_page_info_to_body(html2bbcode($orig_body));
$item["created"] = $orig_created;
+ $item["edited"] = $orig_edited;
$item["uri"] = $orig_uri;
$item["plink"] = $orig_link;
}
}
+ $contact["hide"] = false; // OStatus contacts are never hidden
update_gcontact($contact);
}
}
// Get the parent
+ $parents = q("SELECT `item`.`id`, `item`.`parent`, `item`.`uri`, `item`.`contact-id`, `item`.`type`,
+ `item`.`verb`, `item`.`visible` FROM `term`
+ STRAIGHT_JOIN `item` AS `thritem` ON `thritem`.`parent` = `term`.`oid`
+ STRAIGHT_JOIN `item` ON `item`.`parent` = `thritem`.`parent`
+ WHERE `term`.`uid` = %d AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`url` = '%s'",
+ intval($uid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($conversation_url));
+
+/* 2016-10-23: The old query will be kept until we are sure that the query above is a good and fast replacement
+
$parents = q("SELECT `id`, `parent`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `id` IN
(SELECT `parent` FROM `item` WHERE `id` IN
(SELECT `oid` FROM `term` WHERE `uid` = %d AND `otype` = %d AND `type` = %d AND `url` = '%s'))",
intval($uid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc($conversation_url));
-
+*/
if ($parents)
$parent = $parents[0];
elseif (count($item) > 0) {
if (!isset($contact["poll"])) {
$data = probe_url($url);
- $contact["alias"] = $data["alias"];
$contact["poll"] = $data["poll"];
+
+ if (!$contact["alias"])
+ $contact["alias"] = $data["alias"];
}
if (!isset($contact["alias"]))
$as_object = $doc->createElement("activity:object");
- $parent = q("SELECT * FROM `item` WHERE `id` = %d", intval($item["parent"]));
+ $parent = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
+ dbesc($item["thr-parent"]), intval($item["uid"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
xml::add_element($doc, $as_object, "activity:object-type", self::construct_objecttype($parent[0]));
$last_update = 'now -30 days';
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
-
- $items = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id` FROM `item`
- INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
+ $authorid = get_contact($owner["url"], 0);
+
+ $items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
+ STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
+ WHERE `item`.`uid` = %d AND `item`.`contact-id` = %d AND
+ `item`.`author-id` = %d AND `item`.`created` > '%s' AND
+ NOT `item`.`deleted` AND NOT `item`.`private` AND
+ `thread`.`network` IN ('%s', '%s')
+ ORDER BY `item`.`created` DESC LIMIT 300",
+ intval($owner["uid"]), intval($owner["id"]),
+ intval($authorid), dbesc($check_date),
+ dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
+
+/* 2016-10-23: The old query will be kept until we are sure that the query above is a good and fast replacement
+
+ $items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item`
+ STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`
WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
OR (`item`.`network` = '%s' AND ((`thread`.`network` IN ('%s', '%s')) OR (`thritem`.`network` IN ('%s', '%s')))) AND `thread`.`mention`)
AND ((`item`.`owner-link` IN ('%s', '%s') AND (`item`.`parent` = `item`.`id`))
OR (`item`.`author-link` IN ('%s', '%s')))
- ORDER BY `item`.`received` DESC
+ ORDER BY `item`.`id` DESC
LIMIT 0, 300",
intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN),
//dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])),
dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"]))
);
-
+*/
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;