update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
}
-
- /// @todo Add the "addr" field
$contact["generation"] = 2;
$contact["photo"] = $author["author-avatar"];
update_gcontact($contact);
} else
$item["parent-uri"] = $item["uri"];
- $item_id = ostatus_completion($conversation, $importer["uid"], $item);
+ $item_id = ostatus_completion($conversation, $importer["uid"], $item, $self);
if (!$item_id) {
logger("Error storing item", LOGGER_DEBUG);
set_config('system','ostatus_last_poll', time());
}
-function ostatus_completion($conversation_url, $uid, $item = array()) {
+/**
+ * @brief Updates the gcontact table with actor data from the conversation
+ *
+ * @param object $actor The actor object that contains the contact data
+ */
+function ostatus_conv_fetch_actor($actor) {
+
+ // We set the generation to "3" since the data here is not as reliable as the data we get on other occasions
+ $contact = array("network" => NETWORK_OSTATUS, "generation" => 3);
+
+ if (isset($actor->url))
+ $contact["url"] = $actor->url;
+
+ if (isset($actor->displayName))
+ $contact["name"] = $actor->displayName;
+
+ if (isset($actor->portablecontacts_net->displayName))
+ $contact["name"] = $actor->portablecontacts_net->displayName;
+
+ if (isset($actor->portablecontacts_net->preferredUsername))
+ $contact["nick"] = $actor->portablecontacts_net->preferredUsername;
+
+ if (isset($actor->id))
+ $contact["alias"] = $actor->id;
+
+ if (isset($actor->summary))
+ $contact["about"] = $actor->summary;
+
+ if (isset($actor->portablecontacts_net->note))
+ $contact["about"] = $actor->portablecontacts_net->note;
+
+ if (isset($actor->portablecontacts_net->addresses->formatted))
+ $contact["location"] = $actor->portablecontacts_net->addresses->formatted;
+
+
+ if (isset($actor->image->url))
+ $contact["photo"] = $actor->image->url;
+
+ if (isset($actor->image->width))
+ $avatarwidth = $actor->image->width;
+
+ if (is_array($actor->status_net->avatarLinks))
+ foreach ($actor->status_net->avatarLinks AS $avatar) {
+ if ($avatarsize < $avatar->width) {
+ $contact["photo"] = $avatar->url;
+ $avatarsize = $avatar->width;
+ }
+ }
+
+ update_gcontact($contact);
+}
+
+/**
+ * @brief Fetches the conversation url for a given item link or conversation id
+ *
+ * @param string $self The link to the posting
+ * @param string $conversation_id The conversation id
+ *
+ * @return string The conversation url
+ */
+function ostatus_fetch_conversation($self, $conversation_id = "") {
+
+ if ($conversation_id != "") {
+ $elements = explode(":", $conversation_id);
+
+ if ((count($elements) <= 2) OR ($elements[0] != "tag"))
+ return $conversation_id;
+ }
+
+ if ($self == "")
+ return "";
+
+ $json = str_replace(".atom", ".json", $self);
+
+ $raw = fetch_url($json);
+ if ($raw == "")
+ return "";
+
+ $data = json_decode($raw);
+ if (!is_object($data))
+ return "";
+
+ $conversation_id = $data->statusnet_conversation_id;
+
+ $pos = strpos($self, "/api/statuses/show/");
+ $base_url = substr($self, 0, $pos);
+
+ return $base_url."/conversation/".$conversation_id;
+}
+
+/**
+ * @brief Fetches actor details of a given actor and user id
+ *
+ * @param string $actor The actor url
+ * @param int $uid The user id
+ * @param int $contact_id The default contact-id
+ *
+ * @return array Array with actor details
+ */
+function ostatus_get_actor_details($actor, $uid, $contact_id) {
+
+ $details = array();
+
+ $contact = q("SELECT `id`, `rel`, `network` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
+ $uid, normalise_link($actor), NETWORK_STATUSNET);
+
+ if (!$contact)
+ $contact = q("SELECT `id`, `rel`, `network` FROM `contact` WHERE `uid` = %d AND `alias` IN ('%s', '%s') AND `network` != '%s'",
+ $uid, $actor, normalise_link($actor), NETWORK_STATUSNET);
+
+ if ($contact) {
+ logger("Found contact for url ".$actor, LOGGER_DEBUG);
+ $details["contact_id"] = $contact[0]["id"];
+ $details["network"] = $contact[0]["network"];
+
+ $details["not_following"] = !in_array($contact[0]["rel"], array(CONTACT_IS_SHARING, CONTACT_IS_FRIEND));
+ } else {
+ logger("No contact found for user ".$uid." and url ".$actor, LOGGER_DEBUG);
+
+ // Adding a global contact
+ /// @TODO Use this data for the post
+ $details["global_contact_id"] = get_contact($actor, 0);
+
+ logger("Global contact ".$global_contact_id." found for url ".$actor, LOGGER_DEBUG);
+
+ $details["contact_id"] = $contact_id;
+ $details["network"] = NETWORK_OSTATUS;
+
+ $details["not_following"] = true;
+ }
+
+ return $details;
+}
+
+function ostatus_completion($conversation_url, $uid, $item = array(), $self = "") {
$a = get_app();
$item_stored = -1;
- $conversation_url = ostatus_convert_href($conversation_url);
+ //$conversation_url = ostatus_convert_href($conversation_url);
+ $conversation_url = ostatus_fetch_conversation($self, $conversation_url);
// If the thread shouldn't be completed then store the item and go away
- if ((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) {
+ // Don't do a completion on liked content
+ if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR
+ ($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) {
//$arr["app"] .= " (OStatus-NoCompletion)";
$item_stored = item_store($item, true);
return($item_stored);
$pageno = 1;
$items = array();
- logger('fetching conversation url '.$conv.' for user '.$uid);
+ logger('fetching conversation url '.$conv.' (Self: '.$self.') for user '.$uid);
do {
$conv_arr = z_fetch_url($conv."?page=".$pageno);
$r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
$importer = $r[0];
+ $new_parent = true;
+
foreach ($items as $single_conv) {
+ // Update the gcontact table
+ ostatus_conv_fetch_actor($single_conv->actor);
+
// Test - remove before flight
//$tempfile = tempnam(get_temppath(), "conversation");
//file_put_contents($tempfile, json_encode($single_conv));
// 2. This first post is a post inside our thread
// 3. This first post is a post inside another thread
if (($first_id != $parent["uri"]) AND ($parent["uri"] != "")) {
+
+ $new_parent = true;
+
$new_parents = q("SELECT `id`, `parent`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `id` IN
(SELECT `parent` FROM `item`
WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s')) LIMIT 1",
if (isset($single_conv->actor->url))
$actor = $single_conv->actor->url;
- $contact = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
- $uid, normalise_link($actor), NETWORK_STATUSNET);
-
- if (count($contact)) {
- logger("Found contact for url ".$actor, LOGGER_DEBUG);
- $contact_id = $contact[0]["id"];
- } else {
- logger("No contact found for url ".$actor, LOGGER_DEBUG);
-
- // Adding a global contact
- /// @TODO Use this data for the post
- $global_contact_id = get_contact($actor, 0);
-
- logger("Global contact ".$global_contact_id." found for url ".$actor, LOGGER_DEBUG);
+ $details = ostatus_get_actor_details($actor, $uid, $parent["contact-id"]);
- $contact_id = $parent["contact-id"];
+ // Do we only want to import threads that were started by our contacts?
+ if ($details["not_following"] AND $new_parent AND get_config('system','ostatus_full_threads')) {
+ logger("Don't import uri ".$first_id." because user ".$uid." doesn't follow the person ".$actor, LOGGER_DEBUG);
+ continue;
}
$arr = array();
- $arr["network"] = NETWORK_OSTATUS;
+ $arr["network"] = $details["network"];
$arr["uri"] = $single_conv->id;
$arr["plink"] = $plink;
$arr["uid"] = $uid;
- $arr["contact-id"] = $contact_id;
+ $arr["contact-id"] = $details["contact_id"];
$arr["parent-uri"] = $parent_uri;
$arr["created"] = $single_conv->published;
$arr["edited"] = $single_conv->published;
if (($item_stored < 0) AND (count($item) > 0)) {
//$arr["app"] .= " (OStatus-NoConvFound)";
+
+ if (get_config('system','ostatus_full_threads')) {
+ $details = ostatus_get_actor_details($item["owner-link"], $uid, $item["contact-id"]);
+ if ($details["not_following"]) {
+ logger("Don't import uri ".$item["uri"]." because user ".$uid." doesn't follow the person ".$item["owner-link"], LOGGER_DEBUG);
+ return false;
+ }
+ }
+
$item_stored = item_store($item, true);
if ($item_stored) {
logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG);
function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) {
$a = get_app();
+ if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
+ logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
+ }
+
$is_repeat = false;
/* if (!$repeat) {
projects / friendica.git / blobdiff