/**
* @file include/diaspora.php
* @brief The implementation of the diaspora protocol
+ *
+ * The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html
+ * Currently this implementation here interprets the old and the new protocol and sends the old one.
+ * This will change in the future.
*/
require_once("include/items.php");
$type = $element->getName();
$orig_type = $type;
+ logger("Got message type ".$type.": ".$msg["message"], LOGGER_DATA);
+
// All retractions are handled identically from now on.
// In the new version there will only be "retraction".
if (in_array($type, array("signed_retraction", "relayable_retraction")))
$d = strtotime($person["updated"]." +00:00");
if ($d < strtotime("now - 14 days"))
$update = true;
+
+ if ($person["guid"] == "")
+ $update = true;
}
if (!$person OR $update) {
`request` = '%s',
`nick` = '%s',
`addr` = '%s',
+ `guid` = '%s',
`batch` = '%s',
`notify` = '%s',
`poll` = '%s',
dbesc($arr["photo"]),
dbesc($arr["request"]),
dbesc($arr["nick"]),
- dbesc($arr["addr"]),
+ dbesc(strtolower($arr["addr"])),
+ dbesc($arr["guid"]),
dbesc($arr["batch"]),
dbesc($arr["notify"]),
dbesc($arr["poll"]),
dbesc($arr["network"])
);
} else {
- $r = q("INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`,
+ $r = q("INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
`batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated`)
- VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
+ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
dbesc($arr["url"]),
dbesc($arr["name"]),
dbesc($arr["photo"]),
dbesc($arr["request"]),
dbesc($arr["nick"]),
dbesc($arr["addr"]),
+ dbesc($arr["guid"]),
dbesc($arr["batch"]),
dbesc($arr["notify"]),
dbesc($arr["poll"]),
$r = q("SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
intval($gcontact_id));
if ($r)
- return $r[0]["addr"];
+ return strtolower($r[0]["addr"]);
}
$r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
}
}
- return $handle;
+ return strtolower($handle);
}
/**
$text = unxmlify($data->text);
$author = notags(unxmlify($data->author));
+ if (isset($data->created_at))
+ $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
+ else
+ $created_at = datetime_convert();
+
$contact = self::allowed_contact_by_handle($importer, $sender, true);
if (!$contact)
return false;
$datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
$datarray["object"] = $xml;
+ $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
+
$datarray["body"] = diaspora2bb($text);
self::fetch_guid($datarray);
);
// notify others
- proc_run("php", "include/notifier.php", "comment-import", $message_id);
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
}
return $message_id;
intval($importer["uid"]),
dbesc($guid),
dbesc($author),
- dbesc(datetime_convert("UTC", "UTC", $created_at)),
+ dbesc($created_at),
dbesc(datetime_convert()),
dbesc($subject),
dbesc($participants)
);
// notify others
- proc_run("php", "include/notifier.php", "comment-import", $message_id);
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id);
}
return $message_id;
* @return bool Success
*/
private function receive_profile($importer, $data) {
- $author = notags(unxmlify($data->author));
+ $author = strtolower(notags(unxmlify($data->author)));
$contact = self::contact_by_handle($importer["uid"], $author);
if (!$contact)
$i = item_store($arr);
if($i)
- proc_run("php", "include/notifier.php", "activity", $i);
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
}
}
}
// That makes us friends.
if ($contact) {
if ($following AND $sharing) {
+ logger("Author ".$author." (Contact ".$contact["id"].") wants to have a bidirectional conection.", LOGGER_DEBUG);
self::receive_request_make_friend($importer, $contact);
+
+ // refetch the contact array
+ $contact = self::contact_by_handle($importer["uid"],$author);
+
+ // If we are now friends, we are sending a share message.
+ // Normally we needn't to do so, but the first message could have been vanished.
+ if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) {
+ $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
+ if($u) {
+ logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
+ $ret = self::send_share($u[0], $contact);
+ }
+ }
return true;
- } else /// @todo Handle all possible variations of adding and retracting of permissions
+ } else { /// @todo Handle all possible variations of adding and retracting of permissions
+ logger("Author ".$author." (Contact ".$contact["id"].") wants to change the relationship: Following: ".$following." - sharing: ".$sharing. "(By now unsupported)", LOGGER_DEBUG);
return false;
+ }
}
if (!$following AND $sharing AND in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
} elseif (!$following AND !$sharing) {
logger("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", LOGGER_DEBUG);
return false;
+ } elseif (!$following AND $sharing) {
+ logger("Author ".$author." wants to share with us.", LOGGER_DEBUG);
+ } elseif ($following AND $sharing) {
+ logger("Author ".$author." wants to have a bidirectional conection.", LOGGER_DEBUG);
+ } elseif ($following AND !$sharing) {
+ logger("Author ".$author." wants to listen to us.", LOGGER_DEBUG);
}
$ret = self::person_by_handle($author);
return;
}
+ logger("Author ".$author." was added as contact number ".$contact_record["id"].".", LOGGER_DEBUG);
+
$def_gid = get_default_group($importer['uid'], $ret["network"]);
if(intval($def_gid))
if($importer["page-flags"] == PAGE_NORMAL) {
+ logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
+
$hash = random_string().(string)time(); // Generate a confirm_key
$ret = q("INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
// automatic friend approval
+ logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
+
update_contact_avatar($contact_record["photo"],$importer["uid"],$contact_record["id"]);
// technically they are sharing with us (CONTACT_IS_SHARING),
);
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
- if($u)
+ if($u) {
+ logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
$ret = self::send_share($u[0], $contact_record);
+
+ // Send the profile data, maybe it weren't transmitted before
+ self::send_profile($importer["uid"], array($contact_record));
+ }
}
return true;
$guid = notags(unxmlify($data->guid));
$author = notags(unxmlify($data->author));
$public = notags(unxmlify($data->public));
- $created_at = notags(unxmlify($data->created_at));
+ $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
$contact = self::allowed_contact_by_handle($importer, $author, false);
if (!$contact)
$datarray["plink"] = self::plink($author, $guid);
$datarray["private"] = (($public == "false") ? 1 : 0);
- $datarray["changed"] = $datarray["created"] = $datarray["edited"] = datetime_convert("UTC", "UTC", $created_at);
+ $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
$datarray["object-type"] = $original_item["object-type"];
// Now check if the retraction needs to be relayed by us
if($p[0]["origin"]) {
// notify others
- proc_run("php", "include/notifier.php", "drop", $r[0]["id"]);
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]);
}
return true;
* @return int The message id of the newly created item
*/
private function receive_status_message($importer, $data, $xml) {
-
$raw_message = unxmlify($data->raw_message);
$guid = notags(unxmlify($data->guid));
$author = notags(unxmlify($data->author));
$public = notags(unxmlify($data->public));
- $created_at = notags(unxmlify($data->created_at));
+ $created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
$provider_display_name = notags(unxmlify($data->provider_display_name));
/// @todo enable support for polls
$datarray["plink"] = self::plink($author, $guid);
$datarray["private"] = (($public == "false") ? 1 : 0);
- $datarray["changed"] = $datarray["created"] = $datarray["edited"] = datetime_convert("UTC", "UTC", $created_at);
+ $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
if (isset($address["address"]))
$datarray["location"] = $address["address"];
logger('message: '.$msg, LOGGER_DATA);
logger('send guid '.$guid, LOGGER_DEBUG);
+ // Fallback if the private key wasn't transmitted in the expected field
+ if ($owner['uprvkey'] == "")
+ $owner['uprvkey'] = $owner['prvkey'];
+
$slap = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
$message = array("sender_handle" => self::my_handle($owner),
"recipient_handle" => $contact["addr"]);
+ logger("Send share ".print_r($message, true), LOGGER_DEBUG);
+
return self::build_and_transmit($owner, $contact, "request", $message);
}
"diaspora_handle" => self::my_handle($owner),
"type" => "Person");
+ logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
+
return self::build_and_transmit($owner, $contact, "retraction", $message);
}
*
* @param int $uid The user id
*/
- public static function send_profile($uid) {
+ public static function send_profile($uid, $recips = false) {
if (!$uid)
return;
- $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
- AND `uid` = %d AND `rel` != %d",
- dbesc(NETWORK_DIASPORA),
- intval($uid),
- intval(CONTACT_IS_SHARING)
- );
+ if (!$recips)
+ $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
+ AND `uid` = %d AND `rel` != %d",
+ dbesc(NETWORK_DIASPORA),
+ intval($uid),
+ intval(CONTACT_IS_SHARING)
+ );
if (!$recips)
return;
"searchable" => $searchable,
"tag_string" => $tags);
- foreach($recips as $recip)
+ foreach($recips as $recip) {
+ logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
self::build_and_transmit($profile, $recip, "profile", $message, false, "", true);
+ }
}
/**
projects / friendica.git / blobdiff