/**
* @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");
dbesc(NETWORK_DIASPORA),
dbesc($msg["author"])
);
- if($r) {
- foreach($r as $rr) {
+ if ($r) {
+ foreach ($r as $rr) {
logger("delivering to: ".$rr["username"]);
self::dispatch($rr,$msg);
}
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"]),
} else {
$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"]),
$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);
}
/**
dbesc($guid)
);
- if($r) {
+ if ($r) {
logger("message ".$guid." already exists for user ".$uid);
return $r[0]["id"];
}
*/
private function author_contact_by_url($contact, $person, $uid) {
- $r = q("SELECT `id`, `network` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($person["url"])), intval($uid));
if ($r) {
$cid = $r[0]["id"];
$network = $r[0]["network"];
+
+ // We are receiving content from a user that is about to be terminated
+ // This means the user is vital, so we remove a possible termination date.
+ unmark_for_death($contact);
} else {
$cid = $contact["id"];
$network = NETWORK_DIASPORA;
}
- return (array("cid" => $cid, "network" => $network));
+ return array("cid" => $cid, "network" => $network);
}
/**
$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;
$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
dbesc($message_uri)
);
- if($r) {
+ if (dbm::is_result($r)) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
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;
dbesc($message_uri),
intval($importer["uid"])
);
- if($r) {
+ if ($r) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
* @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);
}
}
}
// 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 `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
- `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
- `user`.`page-flags`, `user`.`prvnets`, `user`.`guid`
- FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
- intval($importer["uid"]));
+ $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);
intval($contact_record["id"])
);
- $u = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
- `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
- `user`.`page-flags`, `user`.`prvnets`, `user`.`guid`
- FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
- intval($importer["uid"]));
+ $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
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));
}
}
FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
dbesc($guid));
- if($r) {
+ if ($r) {
logger("reshared message ".$guid." already exists on system.");
// Maybe it is already a reshared item?
$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"];
if (!$r)
return false;
- // Only delete it if the author really fits
- if (!link_compare($r[0]["author-link"], $person["url"])) {
- logger("Item author ".$r[0]["author-link"]." doesn't fit to expected contact ".$person["url"], LOGGER_DEBUG);
- return false;
- }
-
// Check if the sender is the thread owner
$p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
intval($r[0]["parent"]));
// 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
$body = "[img]".unxmlify($photo->remote_photo_path).
unxmlify($photo->remote_photo_name)."[/img]\n".$body;
- $datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+ $datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
} else {
$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
$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("transmit: ".$logid."-".$guid." returns: ".$return_code);
- if(!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
+ if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
logger("queue message");
$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
dbesc($slap),
intval($public_batch)
);
- if($r) {
+ if ($r) {
logger("add_to_queue ignored - identical item already in queue");
} else {
// queue message for redelivery
add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch);
+
+ // The message could not be delivered. We mark the contact as "dead"
+ mark_for_death($contact);
}
+ } elseif (($return_code >= 200) AND ($return_code <= 299)) {
+ // We successfully delivered a message, the contact is alive
+ unmark_for_death($contact);
}
return(($return_code) ? $return_code : (-1));
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) {
"created_at" => $created,
"provider_display_name" => $item["app"]);
- if (count($location) == 0)
+ // Diaspora rejects messages when they contain a location without "lat" or "lng"
+ if (!isset($location["lat"]) OR !isset($location["lng"])) {
unset($message["location"]);
+ }
$type = "status_message";
}
$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"]));
- if(!$p)
+ if (!dbm::is_result($p))
return false;
$parent = $p[0];
intval($item["parent"])
);
- if (!$p)
+ if (!dbm::is_result($p))
return false;
$parent = $p[0];
intval($item["uid"])
);
- if (!$r) {
+ if (!dbm::is_result($r)) {
logger("conversation not found.");
return;
}
*
* @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);
+ }
}
/**