tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2197 from annando/1512-ostatus-comment

Browse source 
Reworked delivery and notifier process - changed OStatus behaviour
This commit is contained in:
Tobias Diekershoff 2015-12-27 15:58:32 +01:00
commit 8d8dc2d060
8 changed files with 440 additions and 716 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -1251,7 +1251,7 @@ function get_guid($size=16, $prefix = "") {
$prefix = substr($prefix, 0, $size - 22); $prefix = substr($prefix, 0, $size - 22);
return(str_replace(".", "", uniqid($prefix, true))); return(str_replace(".", "", uniqid($prefix, true)));
} else { } else {
$prefix = substr($prefix, 0, $size - 13); $prefix = substr($prefix, 0, max($size - 13, 0));
return(uniqid($prefix)); return(uniqid($prefix));
} }
} }

14
include/auth.php
View file

@ -5,6 +5,11 @@ require_once('include/security.php');
require_once('include/datetime.php'); require_once('include/datetime.php');
function nuke_session() { function nuke_session() {
if (get_config('system', 'disable_database_session')) {
session_unset();
return;
}
new_cookie(0); // make sure cookie is deleted on browser close, as a security measure new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
unset($_SESSION['authenticated']); unset($_SESSION['authenticated']);
@ -20,6 +25,7 @@ function nuke_session() {
unset($_SESSION['my_address']); unset($_SESSION['my_address']);
unset($_SESSION['addr']); unset($_SESSION['addr']);
unset($_SESSION['return_url']); unset($_SESSION['return_url']);
} }
@ -203,9 +209,13 @@ else {
} }
function new_cookie($time) { function new_cookie($time) {
if (!get_config('system', 'disable_database_session'))
$old_sid = session_id(); $old_sid = session_id();
session_set_cookie_params("$time");
session_regenerate_id(false);
session_set_cookie_params($time);
if (!get_config('system', 'disable_database_session')) {
session_regenerate_id(false);
q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
}
} }

233
include/delivery.php
View file

@ -2,6 +2,8 @@
require_once("boot.php"); require_once("boot.php");
require_once('include/queue_fn.php'); require_once('include/queue_fn.php');
require_once('include/html2plain.php'); require_once('include/html2plain.php');
require_once("include/Scrape.php");
require_once('include/diaspora.php');
require_once("include/ostatus.php"); require_once("include/ostatus.php");
function delivery_run(&$argv, &$argc){ function delivery_run(&$argv, &$argc){
@ -22,7 +24,6 @@ function delivery_run(&$argv, &$argc){
require_once("include/datetime.php"); require_once("include/datetime.php");
require_once('include/items.php'); require_once('include/items.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
require_once('include/diaspora.php');
require_once('include/email.php'); require_once('include/email.php');
load_config('config'); load_config('config');
@ -46,7 +47,7 @@ function delivery_run(&$argv, &$argc){
// Some other process may have delivered this item already. // Some other process may have delivered this item already.
$r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1", $r = q("SELECT * FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d LIMIT 1",
dbesc($cmd), dbesc($cmd),
dbesc($item_id), dbesc($item_id),
dbesc($contact_id) dbesc($contact_id)
@ -69,7 +70,7 @@ function delivery_run(&$argv, &$argc){
// It's ours to deliver. Remove it from the queue. // It's ours to deliver. Remove it from the queue.
q("delete from deliverq where cmd = '%s' and item = %d and contact = %d", q("DELETE FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d",
dbesc($cmd), dbesc($cmd),
dbesc($item_id), dbesc($item_id),
dbesc($contact_id) dbesc($contact_id)
@ -79,15 +80,32 @@ function delivery_run(&$argv, &$argc){
continue; continue;
$expire = false; $expire = false;
$mail = false;
$fsuggest = false;
$relocate = false;
$top_level = false; $top_level = false;
$recipients = array(); $recipients = array();
$url_recipients = array(); $url_recipients = array();
$followup = false;
$normal_mode = true; $normal_mode = true;
$recipients[] = $contact_id; $recipients[] = $contact_id;
if($cmd === 'expire') { if($cmd === 'mail') {
$normal_mode = false;
$mail = true;
$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
if(! count($message)){
return;
}
$uid = $message[0]['uid'];
$recipients[] = $message[0]['contact-id'];
$item = $message[0];
}
elseif($cmd === 'expire') {
$normal_mode = false; $normal_mode = false;
$expire = true; $expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
@ -99,8 +117,23 @@ function delivery_run(&$argv, &$argc){
if(! count($items)) if(! count($items))
continue; continue;
} }
else { elseif($cmd === 'suggest') {
$normal_mode = false;
$fsuggest = true;
$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
intval($item_id)
);
if(! count($suggest))
return;
$uid = $suggest[0]['uid'];
$recipients[] = $suggest[0]['cid'];
$item = $suggest[0];
} elseif($cmd === 'relocate') {
$normal_mode = false;
$relocate = true;
$uid = $item_id;
} else {
// find ancestors // find ancestors
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
intval($item_id) intval($item_id)
@ -115,11 +148,6 @@ function delivery_run(&$argv, &$argc){
$uid = $r[0]['uid']; $uid = $r[0]['uid'];
$updated = $r[0]['edited']; $updated = $r[0]['edited'];
// POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
if(! $parent_id)
continue;
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC", FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
intval($parent_id) intval($parent_id)
@ -173,10 +201,7 @@ function delivery_run(&$argv, &$argc){
$public_message = true; $public_message = true;
// fill this in with a single salmon slap if applicable if(! ($mail || $fsuggest || $relocate)) {
$slap = '';
require_once('include/group.php'); require_once('include/group.php');
$parent = $items[0]; $parent = $items[0];
@ -211,11 +236,16 @@ function delivery_run(&$argv, &$argc){
* *
*/ */
if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { $relay_to_owner = false;
logger('relay denied for delivery agent.');
/* no relay allowed for direct contact delivery */ if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
continue; $relay_to_owner = true;
}
if($relay_to_owner) {
logger('followup '.$target_item["guid"], LOGGER_DEBUG);
// local followup to remote post
$followup = true;
} }
if((strlen($parent['allow_cid'])) if((strlen($parent['allow_cid']))
@ -225,6 +255,8 @@ function delivery_run(&$argv, &$argc){
$public_message = false; // private recipients, not public $public_message = false; // private recipients, not public
} }
}
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0", $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
intval($contact_id) intval($contact_id)
); );
@ -234,18 +266,16 @@ function delivery_run(&$argv, &$argc){
$hubxml = feed_hublinks(); $hubxml = feed_hublinks();
logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
require_once('include/salmon.php');
if($contact['self']) if($contact['self'])
continue; continue;
$deliver_status = 0; $deliver_status = 0;
logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']);
switch($contact['network']) { switch($contact['network']) {
case NETWORK_DFRN : case NETWORK_DFRN:
logger('notifier: dfrndelivery: ' . $contact['name']); logger('notifier: dfrndelivery: ' . $contact['name']);
$feed_template = get_markup_template('atom_feed.tpl'); $feed_template = get_markup_template('atom_feed.tpl');
@ -277,6 +307,86 @@ function delivery_run(&$argv, &$argc){
'$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '') '$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
)); ));
if($mail) {
$public_message = false; // mail is not public
$body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
$atom .= replace_macros($mail_template, array(
'$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']),
'$thumb' => xmlify($owner['thumb']),
'$item_id' => xmlify($item['uri']),
'$subject' => xmlify($item['title']),
'$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
'$content' => xmlify($body),
'$parent_id' => xmlify($item['parent-uri'])
));
} elseif($fsuggest) {
$public_message = false; // suggestions are not public
$sugg_template = get_markup_template('atom_suggest.tpl');
$atom .= replace_macros($sugg_template, array(
'$name' => xmlify($item['name']),
'$url' => xmlify($item['url']),
'$photo' => xmlify($item['photo']),
'$request' => xmlify($item['request']),
'$note' => xmlify($item['note'])
));
// We don't need this any more
q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1",
intval($item['id'])
);
} elseif($relocate) {
$public_message = false; // suggestions are not public
$sugg_template = get_markup_template('atom_relocate.tpl');
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = get_config('system','site_pubkey');
if(! $pubkey) {
$res = new_keypair(1024);
set_config('system','site_prvkey', $res['prvkey']);
set_config('system','site_pubkey', $res['pubkey']);
}
$rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
$photos = array();
$ext = Photo::supportedTypes();
foreach($rp as $p){
$photos[$p['scale']] = $a->get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
}
unset($rp, $ext);
$atom .= replace_macros($sugg_template, array(
'$name' => xmlify($owner['name']),
'$photo' => xmlify($photos[4]),
'$thumb' => xmlify($photos[5]),
'$micro' => xmlify($photos[6]),
'$url' => xmlify($owner['url']),
'$request' => xmlify($owner['request']),
'$confirm' => xmlify($owner['confirm']),
'$notify' => xmlify($owner['notify']),
'$poll' => xmlify($owner['poll']),
'$sitepubkey' => xmlify(get_config('system','site_pubkey')),
//'$pubkey' => xmlify($owner['pubkey']),
//'$prvkey' => xmlify($owner['prvkey']),
));
unset($photos);
} elseif($followup) {
foreach($items as $item) { // there is only one item
if(! $item['parent'])
continue;
if($item['id'] == $item_id) {
logger('followup: item: ' . print_r($item,true), LOGGER_DATA);
$atom .= atom_entry($item,'text',null,$owner,false);
}
}
} else {
foreach($items as $item) { foreach($items as $item) {
if(! $item['parent']) if(! $item['parent'])
continue; continue;
@ -297,6 +407,7 @@ function delivery_run(&$argv, &$argc){
$atom .= atom_entry($item,'text',null,$owner,true); $atom .= atom_entry($item,'text',null,$owner,true);
} }
}
$atom .= '</feed>' . "\r\n"; $atom .= '</feed>' . "\r\n";
@ -367,55 +478,18 @@ function delivery_run(&$argv, &$argc){
} }
break; break;
case NETWORK_OSTATUS : case NETWORK_OSTATUS:
// Do not send to otatus if we are not configured to send to public networks // Do not send to otatus if we are not configured to send to public networks
if($owner['prvnets']) if($owner['prvnets'])
break; break;
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
break; break;
// only send salmon if public - e.g. if it's ok to notify // There is currently no code here to distribute anything to OStatus.
// a public hub, it's ok to send a salmon // This is done in "notifier.php" (See "url_recipients" and "push_notify")
if(($public_message) && (! $expire)) {
$slaps = array();
foreach($items as $item) {
if(! $item['parent'])
continue;
// private emails may be in included in public conversations. Filter them.
if(($public_message) && $item['private'] == 1)
continue;
$item_contact = get_item_contact($item,$icontacts);
if(! $item_contact)
continue;
if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
$slaps[] = ostatus_salmon($item,$owner);
//$slaps[] = atom_entry($item,'html',null,$owner,true);
}
logger('notifier: slapdelivery: ' . $contact['name']);
foreach($slaps as $slappy) {
if($contact['notify']) {
if(! was_recently_delayed($contact['id']))
$deliver_status = slapper($owner,$contact['notify'],$slappy);
else
$deliver_status = (-1);
if($deliver_status == (-1)) {
// queue message for redelivery
add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
}
}
}
}
break; break;
case NETWORK_MAIL : case NETWORK_MAIL:
case NETWORK_MAIL2: case NETWORK_MAIL2:
if(get_config('system','dfrn_only')) if(get_config('system','dfrn_only'))
@ -509,7 +583,7 @@ function delivery_run(&$argv, &$argc){
} }
break; break;
case NETWORK_DIASPORA : case NETWORK_DIASPORA:
if($public_message) if($public_message)
$loc = 'public batch ' . $contact['batch']; $loc = 'public batch ' . $contact['batch'];
else else
@ -517,7 +591,15 @@ function delivery_run(&$argv, &$argc){
logger('delivery: diaspora batch deliver: ' . $loc); logger('delivery: diaspora batch deliver: ' . $loc);
if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) if(get_config('system','dfrn_only') || (!get_config('system','diaspora_enabled')))
break;
if($mail) {
diaspora_send_mail($item,$owner,$contact);
break;
}
if(!$normal_mode)
break; break;
if((! $contact['pubkey']) && (! $public_message)) if((! $contact['pubkey']) && (! $public_message))
@ -532,21 +614,23 @@ function delivery_run(&$argv, &$argc){
} }
} }
if(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) { if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
// top-level retraction // top-level retraction
logger('delivery: diaspora retract: ' . $loc); logger('delivery: diaspora retract: ' . $loc);
diaspora_send_retraction($target_item,$owner,$contact,$public_message); diaspora_send_retraction($target_item,$owner,$contact,$public_message);
break; break;
} } elseif($followup) {
elseif($target_item['uri'] !== $target_item['parent-uri']) { // send comments and likes to owner to relay
diaspora_send_followup($target_item,$owner,$contact,$public_message);
break;
} elseif($target_item['uri'] !== $target_item['parent-uri']) {
// we are the relay - send comments, likes and relayable_retractions to our conversants // we are the relay - send comments, likes and relayable_retractions to our conversants
logger('delivery: diaspora relay: ' . $loc); logger('delivery: diaspora relay: ' . $loc);
diaspora_send_relay($target_item,$owner,$contact,$public_message); diaspora_send_relay($target_item,$owner,$contact,$public_message);
break; break;
} } elseif(($top_level) && (! $walltowall)) {
elseif(($top_level) && (! $walltowall)) {
// currently no workable solution for sending walltowall // currently no workable solution for sending walltowall
logger('delivery: diaspora status: ' . $loc); logger('delivery: diaspora status: ' . $loc);
diaspora_send_status($target_item,$owner,$contact,$public_message); diaspora_send_status($target_item,$owner,$contact,$public_message);
@ -557,13 +641,6 @@ function delivery_run(&$argv, &$argc){
break; break;
case NETWORK_FEED :
case NETWORK_FACEBOOK :
if(get_config('system','dfrn_only'))
break;
case NETWORK_PUMPIO :
if(get_config('system','dfrn_only'))
break;
default: default:
break; break;
} }

514
include/notifier.php
View file

@ -5,19 +5,12 @@ require_once('include/html2plain.php');
require_once("include/Scrape.php"); require_once("include/Scrape.php");
require_once('include/diaspora.php'); require_once('include/diaspora.php');
require_once("include/ostatus.php"); require_once("include/ostatus.php");
require_once('include/salmon.php');
/* /*
* This file was at one time responsible for doing all deliveries, but this caused * This file was at one time responsible for doing all deliveries, but this caused
* big problems on shared hosting systems, where the process might get killed by the * big problems when the process was killed or stalled during the delivery process.
* hosting provider and nothing would get delivered. * It now invokes separate queues that are delivering via delivery.php and pubsubpublish.php.
* It now only delivers one message under certain cases, and invokes a queued
* delivery mechanism (include/deliver.php) to deliver individual contacts at
* controlled intervals.
* This has a much better chance of surviving random processes getting killed
* by the hosting provider.
* A lot of this code is duplicated in include/deliver.php until we have time to go back
* and re-structure the delivery procedure based on the obstacles that have been thrown at
* us by hosting providers.
*/ */
/* /*
@ -162,6 +155,8 @@ function notifier_run(&$argv, &$argc){
$normal_mode = false; $normal_mode = false;
$relocate = true; $relocate = true;
$uid = $item_id; $uid = $item_id;
$recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
} else { } else {
// find ancestors // find ancestors
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
@ -177,10 +172,6 @@ function notifier_run(&$argv, &$argc){
$uid = $r[0]['uid']; $uid = $r[0]['uid'];
$updated = $r[0]['edited']; $updated = $r[0]['edited'];
// POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
if(! $parent_id)
return;
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC", FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
intval($parent_id) intval($parent_id)
@ -232,6 +223,8 @@ function notifier_run(&$argv, &$argc){
if(! ($mail || $fsuggest || $relocate)) { if(! ($mail || $fsuggest || $relocate)) {
$slap = ostatus_salmon($target_item,$owner);
require_once('include/group.php'); require_once('include/group.php');
$parent = $items[0]; $parent = $items[0];
@ -276,12 +269,12 @@ function notifier_run(&$argv, &$argc){
$relay_to_owner = false; $relay_to_owner = false;
if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { if(!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
$relay_to_owner = true; $relay_to_owner = true;
} }
if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && (! $top_level)) { if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) {
$relay_to_owner = true; $relay_to_owner = true;
} }
@ -302,33 +295,31 @@ function notifier_run(&$argv, &$argc){
$public_message = false; // not public $public_message = false; // not public
$conversant_str = dbesc($parent['contact-id']); $conversant_str = dbesc($parent['contact-id']);
$recipients = array($parent['contact-id']); $recipients = array($parent['contact-id']);
$recipients_followup = array($parent['contact-id']);
if (!$target_item['private'] AND $target_item['wall'] AND //if (!$target_item['private'] AND $target_item['wall'] AND
if (!$target_item['private'] AND
(strlen($target_item['allow_cid'].$target_item['allow_gid']. (strlen($target_item['allow_cid'].$target_item['allow_gid'].
$target_item['deny_cid'].$target_item['deny_gid']) == 0)) $target_item['deny_cid'].$target_item['deny_gid']) == 0))
$push_notify = true; $push_notify = true;
// We notify Friendica users in the thread when it is an OStatus thread.
// Hopefully this transfers the messages to the other Friendica servers. (Untested)
if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) { if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
$push_notify = true; $push_notify = true;
if ($parent["network"] == NETWORK_OSTATUS) { if ($parent["network"] == NETWORK_OSTATUS) {
$r = q("SELECT `author-link` FROM `item` WHERE `parent` = %d AND `author-link` != '%s'", // Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments
intval($target_item["parent"]), dbesc($owner['url'])); // Currently it is work at progress
foreach($r as $parent_item) { $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending`",
$probed_contact = probe_url($parent_item["author-link"]); intval($uid),
if (($probed_contact["notify"] != "") AND ($probed_contact["network"] == NETWORK_DFRN)) { dbesc(NETWORK_DFRN)
logger('Notify Friendica user '.$probed_contact["url"].': '.$probed_contact["notify"]); );
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; if(count($r))
foreach($r as $rr)
$recipients_followup[] = $rr['id'];
} }
} }
} logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
if (count($url_recipients))
logger("url_recipients ".print_r($url_recipients,true));
}
} else { } else {
$followup = false; $followup = false;
@ -416,171 +407,15 @@ function notifier_run(&$argv, &$argc){
// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')"; $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
} else } else
$sql_extra = ""; $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')";
$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0".$sql_extra); $r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0".$sql_extra);
if(count($r)) if(count($r))
$contacts = $r; $contacts = $r;
}
$feed_template = get_markup_template('atom_feed.tpl');
$mail_template = get_markup_template('atom_mail.tpl');
$atom = '';
$slaps = array();
$hubxml = feed_hublinks();
$birthday = feed_birthday($owner['uid'],$owner['timezone']);
if(strlen($birthday))
$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
$atom .= replace_macros($feed_template, array(
'$version' => xmlify(FRIENDICA_VERSION),
'$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
'$feed_title' => xmlify($owner['name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
'$hub' => $hubxml,
'$salmon' => '', // private feed, we don't use salmon here
'$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']),
'$photo' => xmlify($owner['photo']),
'$thumb' => xmlify($owner['thumb']),
'$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
'$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) ,
'$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) ,
'$birthday' => $birthday,
'$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
));
if($mail) {
$public_message = false; // mail is not public
$body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
$atom .= replace_macros($mail_template, array(
'$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']),
'$thumb' => xmlify($owner['thumb']),
'$item_id' => xmlify($item['uri']),
'$subject' => xmlify($item['title']),
'$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
'$content' => xmlify($body),
'$parent_id' => xmlify($item['parent-uri'])
));
} elseif($fsuggest) {
$public_message = false; // suggestions are not public
$sugg_template = get_markup_template('atom_suggest.tpl');
$atom .= replace_macros($sugg_template, array(
'$name' => xmlify($item['name']),
'$url' => xmlify($item['url']),
'$photo' => xmlify($item['photo']),
'$request' => xmlify($item['request']),
'$note' => xmlify($item['note'])
));
// We don't need this any more
q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1",
intval($item['id'])
);
} elseif($relocate) {
$public_message = false; // suggestions are not public
$sugg_template = get_markup_template('atom_relocate.tpl');
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = get_config('system','site_pubkey');
if(! $pubkey) {
$res = new_keypair(1024);
set_config('system','site_prvkey', $res['prvkey']);
set_config('system','site_pubkey', $res['pubkey']);
}
$rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
$photos = array();
$ext = Photo::supportedTypes();
foreach($rp as $p){
$photos[$p['scale']] = $a->get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
}
unset($rp, $ext);
$atom .= replace_macros($sugg_template, array(
'$name' => xmlify($owner['name']),
'$photo' => xmlify($photos[4]),
'$thumb' => xmlify($photos[5]),
'$micro' => xmlify($photos[6]),
'$url' => xmlify($owner['url']),
'$request' => xmlify($owner['request']),
'$confirm' => xmlify($owner['confirm']),
'$notify' => xmlify($owner['notify']),
'$poll' => xmlify($owner['poll']),
'$sitepubkey' => xmlify(get_config('system','site_pubkey')),
//'$pubkey' => xmlify($owner['pubkey']),
//'$prvkey' => xmlify($owner['prvkey']),
));
$recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
unset($photos);
} else {
$slap = ostatus_salmon($target_item,$owner);
//$slap = atom_entry($target_item,'html',null,$owner,false);
if($followup) {
foreach($items as $item) { // there is only one item
if(! $item['parent'])
continue;
if($item['id'] == $item_id) {
logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
//$slap = atom_entry($item,'html',null,$owner,false);
$atom .= atom_entry($item,'text',null,$owner,false);
}
}
} else {
foreach($items as $item) {
if(! $item['parent'])
continue;
// private emails may be in included in public conversations. Filter them.
if(($public_message) && $item['private'] == 1)
continue;
$contact = get_item_contact($item,$contacts);
if(! $contact)
continue;
if($normal_mode) {
// we only need the current item, but include the parent because without it
// older sites without a corresponding dfrn_notify change may do the wrong thing.
if($item_id == $item['id'] || $item['id'] == $item['parent'])
$atom .= atom_entry($item,'text',null,$owner,true);
} else } else
$atom .= atom_entry($item,'text',null,$owner,true); $public_message = false;
if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
$slaps[] = ostatus_salmon($item,$owner);
//$slaps[] = atom_entry($item,'html',null,$owner,true);
}
}
}
$atom .= '</feed>' . "\r\n";
logger('notifier: ' . $atom, LOGGER_DATA);
logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
// If this is a public message and pubmail is set on the parent, include all your email contacts // If this is a public message and pubmail is set on the parent, include all your email contacts
@ -590,7 +425,7 @@ function notifier_run(&$argv, &$argc){
if((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid'])) if((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
&& (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid'])) && (! strlen($target_item['deny_cid'])) && (! strlen($target_item['deny_gid']))
&& (intval($target_item['pubmail']))) { && (intval($target_item['pubmail']))) {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'", $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
intval($uid), intval($uid),
dbesc(NETWORK_MAIL) dbesc(NETWORK_MAIL)
); );
@ -602,20 +437,18 @@ function notifier_run(&$argv, &$argc){
} }
if($followup) if($followup)
$recip_str = $parent['contact-id']; $recip_str = implode(', ', $recipients_followup);
else else
$recip_str = implode(', ', $recipients); $recip_str = implode(', ', $recipients);
if ($relocate) if ($relocate)
$r = $recipients_relocate; $r = $recipients_relocate;
else else
$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ", $r = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending`",
dbesc($recip_str) dbesc($recip_str)
); );
require_once('include/salmon.php');
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval'))); $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
// If we are using the worker we don't need a delivery interval // If we are using the worker we don't need a delivery interval
@ -627,10 +460,10 @@ function notifier_run(&$argv, &$argc){
if(count($r)) { if(count($r)) {
foreach($r as $contact) { foreach($r as $contact) {
if((! $mail) && (! $fsuggest) && (! $followup) && (!$relocate) && (! $contact['self'])) { if(!$contact['self']) {
if(($contact['network'] === NETWORK_DIASPORA) && ($public_message)) if(($contact['network'] === NETWORK_DIASPORA) && ($public_message))
continue; continue;
q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )", q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)",
dbesc($cmd), dbesc($cmd),
intval($item_id), intval($item_id),
intval($contact['id']) intval($contact['id'])
@ -663,16 +496,14 @@ function notifier_run(&$argv, &$argc){
if($contact['self']) if($contact['self'])
continue; continue;
logger("Deliver ".$target_item["guid"]." to ".$contact['url'], LOGGER_DEBUG); logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
// potentially more than one recipient. Start a new process and space them out a bit. // potentially more than one recipient. Start a new process and space them out a bit.
// we will deliver single recipient types of message and email recipients here. // we will deliver single recipient types of message and email recipients here.
if((! $mail) && (! $fsuggest) && (!$relocate) && (! $followup)) {
$this_batch[] = $contact['id']; $this_batch[] = $contact['id'];
if(count($this_batch) == $deliveries_per_process) { if(count($this_batch) >= $deliveries_per_process) {
proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
$this_batch = array(); $this_batch = array();
if($interval) if($interval)
@ -680,288 +511,17 @@ function notifier_run(&$argv, &$argc){
} }
continue; continue;
} }
// be sure to pick up any stragglers // be sure to pick up any stragglers
if(count($this_batch)) if(count($this_batch))
proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
$deliver_status = 0;
logger("main delivery by notifier: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate");
switch($contact['network']) {
case NETWORK_DFRN:
// perform local delivery if we are on the same site
$basepath = implode('/', array_slice(explode('/',$contact['url']),0,3));
if(link_compare($basepath,$a->get_baseurl())) {
$nickname = basename($contact['url']);
if($contact['issued-id'])
$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
else
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
$x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
`contact`.`pubkey` AS `cpubkey`,
`contact`.`prvkey` AS `cprvkey`,
`contact`.`thumb` AS `thumb`,
`contact`.`url` as `url`,
`contact`.`name` as `senderName`,
`user`.*
FROM `contact`
INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`blocked` = 0 AND `contact`.`archive` = 0
AND `contact`.`pending` = 0
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
$sql_extra
AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1",
dbesc(NETWORK_DFRN),
dbesc($nickname)
);
if($x && count($x)) {
$write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false);
if((($owner['page-flags'] == PAGE_COMMUNITY) || ($write_flag)) && (! $x[0]['writable'])) {
q("update contact set writable = 1 where id = %d",
intval($x[0]['id'])
);
$x[0]['writable'] = 1;
} }
// if contact's ssl policy changed, which we just determined // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
// is on our own server, update our contact links // They are especially used for notifications to OStatus users that don't follow us.
$ssl_policy = get_config('system','ssl_policy'); if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
fix_contact_ssl_policy($x[0],$ssl_policy); if(!get_config('system','dfrn_only')) {
// If we are setup as a soapbox we aren't accepting top level posts from this person
if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
break;
require_once('library/simplepie/simplepie.inc');
logger('mod-delivery: local delivery');
local_delivery($x[0],$atom);
break;
}
}
logger('notifier: dfrndelivery: ' . $contact['name']);
$deliver_status = dfrn_deliver($owner,$contact,$atom);
logger('notifier: dfrn_delivery returns ' . $deliver_status);
if($deliver_status == (-1)) {
logger('notifier: delivery failed: queuing message');
// queue message for redelivery
add_to_queue($contact['id'],NETWORK_DFRN,$atom);
}
break;
case NETWORK_OSTATUS:
// Do not send to ostatus if we are not configured to send to public networks
if($owner['prvnets'])
break;
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
break;
if($followup && $contact['notify']) {
logger('slapdelivery followup item '.$item_id.' to ' . $contact['name']);
$deliver_status = slapper($owner,$contact['notify'],$slap);
if($deliver_status == (-1)) {
// queue message for redelivery
add_to_queue($contact['id'],NETWORK_OSTATUS,$slap);
}
} else {
// only send salmon if public - e.g. if it's ok to notify
// a public hub, it's ok to send a salmon
if((count($slaps)) && ($public_message) && (! $expire)) {
logger('slapdelivery item '.$item_id.' to ' . $contact['name']);
foreach($slaps as $slappy) {
if($contact['notify']) {
$deliver_status = slapper($owner,$contact['notify'],$slappy);
if($deliver_status == (-1)) {
// queue message for redelivery
add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
}
}
}
}
}
break;
case NETWORK_MAIL:
case NETWORK_MAIL2:
if(get_config('system','dfrn_only'))
break;
// WARNING: does not currently convert to RFC2047 header encodings, etc.
$addr = $contact['addr'];
if(! strlen($addr))
break;
if($cmd === 'wall-new' || $cmd === 'comment-new') {
$it = null;
if($cmd === 'wall-new')
$it = $items[0];
else {
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($argv[2]),
intval($uid)
);
if(count($r))
$it = $r[0];
}
if(! $it)
break;
$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($uid)
);
if(! count($local_user))
break;
$reply_to = '';
$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval($uid)
);
if($r1 && $r1[0]['reply_to'])
$reply_to = $r1[0]['reply_to'];
$subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
// only expose our real email address to true friends
if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
if($reply_to) {
$headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n";
$headers .= 'Sender: '.$local_user[0]['email']."\n";
} else
$headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
else
$headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
//if($reply_to)
// $headers .= 'Reply-to: ' . $reply_to . "\n";
$headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
if($it['uri'] !== $it['parent-uri']) {
$headers .= "References: <".iri2msgid($it["parent-uri"]).">";
// If Threading is enabled, write down the correct parent
if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"]))
$headers .= " <".iri2msgid($it["thr-parent"]).">";
$headers .= "\n";
if(!$it['title']) {
$r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($it['parent-uri']),
intval($uid));
if(count($r) AND ($r[0]['title'] != ''))
$subject = $r[0]['title'];
else {
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($it['parent-uri']),
intval($uid));
if(count($r) AND ($r[0]['title'] != ''))
$subject = $r[0]['title'];
}
}
if(strncasecmp($subject,'RE:',3))
$subject = 'Re: '.$subject;
}
email_send($addr, $subject, $headers, $it);
}
break;
case NETWORK_DIASPORA:
if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')))
break;
if($mail) {
diaspora_send_mail($item,$owner,$contact);
break;
}
if(! $normal_mode)
break;
// special handling for followup to public post
// all other public posts processed as public batches further below
if($public_message) {
if($followup)
diaspora_send_followup($target_item,$owner,$contact, true);
break;
}
if(! $contact['pubkey'])
break;
$unsupported_activities = array(ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
//don't transmit activities which are not supported by diaspora
foreach($unsupported_activities as $act) {
if(activity_match($target_item['verb'],$act)) {
break 2;
}
}
if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
// send both top-level retractions and relayable retractions for owner to relay
diaspora_send_retraction($target_item,$owner,$contact);
break;
}
elseif($followup) {
// send comments and likes to owner to relay
diaspora_send_followup($target_item,$owner,$contact);
break;
}
elseif($target_item['uri'] !== $target_item['parent-uri']) {
// we are the relay - send comments, likes and relayable_retractions
// (of comments and likes) to our conversants
diaspora_send_relay($target_item,$owner,$contact);
break;
}
elseif(($top_level) && (! $walltowall)) {
// currently no workable solution for sending walltowall
diaspora_send_status($target_item,$owner,$contact);
break;
}
break;
case NETWORK_FEED:
case NETWORK_FACEBOOK:
if(get_config('system','dfrn_only'))
break;
case NETWORK_PUMPIO:
if(get_config('system','dfrn_only'))
break;
default:
break;
}
}
}
// send additional slaps to mentioned remote tags (@foo@example.com)
//if($slap && count($url_recipients) && ($followup || $top_level) && ($public_message || $push_notify) && (! $expire)) {
if($slap && count($url_recipients) && ($public_message || $push_notify) && (!$expire)) {
if(! get_config('system','dfrn_only')) {
foreach($url_recipients as $url) { foreach($url_recipients as $url) {
if($url) { if($url) {
logger('notifier: urldelivery: ' . $url); logger('notifier: urldelivery: ' . $url);
@ -1036,7 +596,7 @@ function notifier_run(&$argv, &$argc){
} }
// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
if($push_notify AND strlen($hub)) { if($push_notify AND strlen($hub)) {
$hubs = explode(',', $hub); $hubs = explode(',', $hub);
if(count($hubs)) { if(count($hubs)) {

151
include/ostatus.php
View file

@ -10,6 +10,7 @@ require_once("include/socgraph.php");
require_once("include/Photo.php"); require_once("include/Photo.php");
require_once("include/Scrape.php"); require_once("include/Scrape.php");
require_once("include/follow.php"); require_once("include/follow.php");
require_once("include/api.php");
require_once("mod/proxy.php"); require_once("mod/proxy.php");
define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
@ -1079,6 +1080,35 @@ function ostatus_store_conversation($itemid, $conversation_url) {
} }
} }
function get_reshared_guid($item) {
$body = trim($item["body"]);
// Skip if it isn't a pure repeated messages
// Does it start with a share?
if (strpos($body, "[share") > 0)
return("");
// Does it end with a share?
if (strlen($body) > (strrpos($body, "[/share]") + 8))
return("");
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
// Skip if there is no shared message in there
if ($body == $attributes)
return(false);
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$guid = $matches[1];
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "")
$guid = $matches[1];
return $guid;
}
function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) { function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) {
$element = $doc->createElement($element, xmlify($value)); $element = $doc->createElement($element, xmlify($value));
@ -1121,13 +1151,6 @@ function ostatus_format_picture_post($body) {
function ostatus_add_header($doc, $owner) { function ostatus_add_header($doc, $owner) {
$a = get_app(); $a = get_app();
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
intval($owner["uid"]));
if (!$r)
return;
$profile = $r[0];
$root = $doc->createElementNS(NS_ATOM, 'feed'); $root = $doc->createElementNS(NS_ATOM, 'feed');
$doc->appendChild($root); $doc->appendChild($root);
@ -1142,12 +1165,12 @@ function ostatus_add_header($doc, $owner) {
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION); $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes); xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
xml_add_element($doc, $root, "id", $a->get_baseurl()."/profile/".$owner["nick"]); xml_add_element($doc, $root, "id", $a->get_baseurl()."/profile/".$owner["nick"]);
xml_add_element($doc, $root, "title", sprintf("%s timeline", $profile["name"])); xml_add_element($doc, $root, "title", sprintf("%s timeline", $owner["name"]));
xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $profile["name"], $a->config["sitename"])); xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
xml_add_element($doc, $root, "logo", $profile["photo"]); xml_add_element($doc, $root, "logo", $owner["photo"]);
xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME)); xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
$author = ostatus_add_author($doc, $owner, $profile); $author = ostatus_add_author($doc, $owner);
$root->appendChild($author); $root->appendChild($author);
$attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html"); $attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html");
@ -1260,13 +1283,17 @@ function ostatus_get_attachment($doc, $root, $item) {
} }
} }
function ostatus_add_author($doc, $owner, $profile) { function ostatus_add_author($doc, $owner) {
$a = get_app(); $a = get_app();
$r = q("SELECT `homepage` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
if ($r)
$profile = $r[0];
$author = $doc->createElement("author"); $author = $doc->createElement("author");
xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
xml_add_element($doc, $author, "uri", $owner["url"]); xml_add_element($doc, $author, "uri", $owner["url"]);
xml_add_element($doc, $author, "name", $profile["name"]); xml_add_element($doc, $author, "name", $owner["name"]);
$attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]); $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
xml_add_element($doc, $author, "link", "", $attributes); xml_add_element($doc, $author, "link", "", $attributes);
@ -1276,20 +1303,22 @@ function ostatus_add_author($doc, $owner, $profile) {
"type" => "image/jpeg", // To-Do? "type" => "image/jpeg", // To-Do?
"media:width" => 175, "media:width" => 175,
"media:height" => 175, "media:height" => 175,
"href" => $profile["photo"]); "href" => $owner["photo"]);
xml_add_element($doc, $author, "link", "", $attributes); xml_add_element($doc, $author, "link", "", $attributes);
if (isset($owner["thumb"])) {
$attributes = array( $attributes = array(
"rel" => "avatar", "rel" => "avatar",
"type" => "image/jpeg", // To-Do? "type" => "image/jpeg", // To-Do?
"media:width" => 80, "media:width" => 80,
"media:height" => 80, "media:height" => 80,
"href" => $profile["thumb"]); "href" => $owner["thumb"]);
xml_add_element($doc, $author, "link", "", $attributes); xml_add_element($doc, $author, "link", "", $attributes);
}
xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]); xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]);
xml_add_element($doc, $author, "poco:displayName", $profile["name"]); xml_add_element($doc, $author, "poco:displayName", $owner["name"]);
xml_add_element($doc, $author, "poco:note", bbcode($profile["about"])); xml_add_element($doc, $author, "poco:note", $owner["about"]);
if (trim($owner["location"]) != "") { if (trim($owner["location"]) != "") {
$element = $doc->createElement("poco:address"); $element = $doc->createElement("poco:address");
@ -1305,8 +1334,10 @@ function ostatus_add_author($doc, $owner, $profile) {
$author->appendChild($urls); $author->appendChild($urls);
} }
if (count($profile)) {
xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"])); xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"]));
xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"])); xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
}
return $author; return $author;
} }
@ -1318,12 +1349,30 @@ function ostatus_add_author($doc, $owner, $profile) {
* *
*/ */
function ostatus_entry($doc, $item, $owner, $toplevel = false) { function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false) {
$a = get_app(); $a = get_app();
if (!$toplevel) { $is_repeat = false;
/* if (!$repeat) {
$repeated_guid = get_reshared_guid($item);
if ($repeated_guid != "") {
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($owner["uid"]), dbesc($repeated_guid));
if ($r) {
$repeated_item = $r[0];
$is_repeat = true;
}
}
}
*/
if (!$toplevel AND !$repeat) {
$entry = $doc->createElement("entry"); $entry = $doc->createElement("entry");
$title = sprintf("New note by %s", $owner["nick"]); $title = sprintf("New note by %s", $owner["nick"]);
} elseif (!$toplevel AND $repeat) {
$entry = $doc->createElement("activity:object");
$title = sprintf("New note by %s", $owner["nick"]);
} else { } else {
$entry = $doc->createElementNS(NS_ATOM, "entry"); $entry = $doc->createElementNS(NS_ATOM, "entry");
@ -1335,14 +1384,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
$entry->setAttribute("xmlns:ostatus", NS_OSTATUS); $entry->setAttribute("xmlns:ostatus", NS_OSTATUS);
$entry->setAttribute("xmlns:statusnet", NS_STATUSNET); $entry->setAttribute("xmlns:statusnet", NS_STATUSNET);
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`", $author = ostatus_add_author($doc, $owner);
intval($owner["uid"]));
if (!$r)
return;
$profile = $r[0];
$author = ostatus_add_author($doc, $owner, $profile);
$entry->appendChild($author); $entry->appendChild($author);
$title = sprintf("New comment by %s", $owner["nick"]); $title = sprintf("New comment by %s", $owner["nick"]);
@ -1359,7 +1401,11 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
// But: it seems as if it doesn't federate well between the GS servers // But: it seems as if it doesn't federate well between the GS servers
// So we just set it to "note" to be sure that it reaches their target systems // So we just set it to "note" to be sure that it reaches their target systems
if (!$repeat)
xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE); xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
else
xml_add_element($doc, $entry, "activity:object-type", NAMESPACE_ACTIVITY_SCHEMA.'activity');
xml_add_element($doc, $entry, "id", $item["uri"]); xml_add_element($doc, $entry, "id", $item["uri"]);
xml_add_element($doc, $entry, "title", $title); xml_add_element($doc, $entry, "title", $title);
@ -1382,14 +1428,43 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
"href" => $a->get_baseurl()."/display/".$item["guid"])); "href" => $a->get_baseurl()."/display/".$item["guid"]));
xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
if (!$is_repeat)
xml_add_element($doc, $entry, "activity:verb", construct_verb($item)); xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
else
xml_add_element($doc, $entry, "activity:verb", ACTIVITY_SHARE);
xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME)); xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME)); xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
if ($is_repeat) {
$repeated_owner = array();
$repeated_owner["name"] = $repeated_item["author-name"];
$repeated_owner["url"] = $repeated_item["author-link"];
$repeated_owner["photo"] = $repeated_item["author-avatar"];
$repeated_owner["nick"] = $repeated_owner["name"];
$repeated_owner["location"] = "";
$repeated_owner["about"] = "";
$repeated_owner["uid"] = 0;
$r =q("SELECT * FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($repeated_item["author-link"]));
if ($r) {
$repeated_owner["nick"] = $r[0]["nick"];
$repeated_owner["location"] = $r[0]["location"];
$repeated_owner["about"] = $r[0]["about"];
}
$entry_repeat = ostatus_entry($doc, $repeated_item, $repeated_owner, false, true);
$entry->appendChild($entry_repeat);
} elseif ($repeat) {
$author = ostatus_add_author($doc, $owner);
$entry->appendChild($author);
}
$mentioned = array(); $mentioned = array();
if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$attributes = array( $attributes = array(
@ -1474,7 +1549,12 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false) {
if ($app == "") if ($app == "")
$app = "web"; $app = "web";
xml_add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item["id"], "source" => $app));
$attributes = array("local_id" => $item["id"], "source" => $app);
if ($is_repeat)
$attributes["repeat_of"] = $repeated_item["id"];
xml_add_element($doc, $entry, "statusnet:notice_info", "", $attributes);
return $entry; return $entry;
} }
@ -1501,12 +1581,17 @@ function ostatus_feed(&$a, $owner_nick, $last_update) {
WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted` 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` = '' AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`)) AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`))
OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s'))) AND `thread`.`mention`) 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`.`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`.`received` DESC
LIMIT 0, 300", LIMIT 0, 300",
intval($owner["uid"]), dbesc($check_date), intval($owner["uid"]), dbesc($check_date), dbesc(NETWORK_DFRN),
dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS), //dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
//dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN),
dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])),
dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"])) dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"]))
); );

4
include/pubsubpublish.php
View file

@ -13,7 +13,9 @@ function handle_pubsubhubbub() {
$r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0"); $r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
foreach($r as $rr) { foreach($r as $rr) {
//$params = get_feed_for($a, '', $rr['nickname'], $rr['last_update'], 0, true);
logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
$params = ostatus_feed($a, $rr['nickname'], $rr['last_update']); $params = ostatus_feed($a, $rr['nickname'], $rr['last_update']);
$hmac_sig = hash_hmac("sha1", $params, $rr['secret']); $hmac_sig = hash_hmac("sha1", $params, $rr['secret']);

17
include/salmon.php
View file

@ -78,23 +78,6 @@ function slapper($owner,$url,$slap) {
return; return;
} }
// add all namespaces to item
$namespaces = <<< EOT
<entry xmlns="http://www.w3.org/2005/Atom"
xmlns:thr="http://purl.org/syndication/thread/1.0"
xmlns:at="http://purl.org/atompub/tombstones/1.0"
xmlns:media="http://purl.org/syndication/atommedia"
xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
xmlns:as="http://activitystrea.ms/spec/1.0/"
xmlns:georss="http://www.georss.org/georss"
xmlns:poco="http://portablecontacts.net/spec/1.0"
xmlns:ostatus="http://ostatus.org/schema/1.0"
xmlns:statusnet="http://status.net/schema/api/1/" > >
EOT;
$slap = str_replace('<entry>',$namespaces,$slap);
logger('slapper called for '.$url.'. Data: ' . $slap); logger('slapper called for '.$url.'. Data: ' . $slap);
// create a magic envelope // create a magic envelope

21
include/session.php
View file

@ -16,6 +16,7 @@ function ref_session_read ($id) {
global $session_exists; global $session_exists;
if(x($id)) if(x($id))
$r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id)); $r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
if(count($r)) { if(count($r)) {
$session_exists = true; $session_exists = true;
return $r[0]['data']; return $r[0]['data'];
@ -28,6 +29,7 @@ function ref_session_read ($id) {
if(! function_exists('ref_session_write')) { if(! function_exists('ref_session_write')) {
function ref_session_write ($id,$data) { function ref_session_write ($id,$data) {
global $session_exists, $session_expire; global $session_exists, $session_expire;
if(! $id || ! $data) { if(! $id || ! $data) {
return false; return false;
} }
@ -35,12 +37,17 @@ function ref_session_write ($id,$data) {
$expire = time() + $session_expire; $expire = time() + $session_expire;
$default_expire = time() + 300; $default_expire = time() + 300;
if($session_exists) if($session_exists) {
$r = q("UPDATE `session` $r = q("UPDATE `session`
SET `data` = '%s', `expire` = '%s' SET `data` = '%s'
WHERE `sid` = '%s'", WHERE `data` != '%s' AND `sid` = '%s'",
dbesc($data), dbesc($expire), dbesc($id)); dbesc($data), dbesc($data), dbesc($id));
else
$r = q("UPDATE `session`
SET `expire` = '%s'
WHERE `expire` != '%s' AND `sid` = '%s'",
dbesc($expire), dbesc($expire), dbesc($id));
} else
$r = q("INSERT INTO `session` $r = q("INSERT INTO `session`
SET `sid` = '%s', `expire` = '%s', `data` = '%s'", SET `sid` = '%s', `expire` = '%s', `data` = '%s'",
dbesc($id), dbesc($default_expire), dbesc($data)); dbesc($id), dbesc($default_expire), dbesc($data));
@ -72,7 +79,7 @@ ini_set('session.gc_probability', $gc_probability);
ini_set('session.use_only_cookies', 1); ini_set('session.use_only_cookies', 1);
ini_set('session.cookie_httponly', 1); ini_set('session.cookie_httponly', 1);
if (!get_config('system', 'disable_database_session'))
session_set_save_handler ('ref_session_open', 'ref_session_close', session_set_save_handler('ref_session_open', 'ref_session_close',
'ref_session_read', 'ref_session_write', 'ref_session_read', 'ref_session_write',
'ref_session_destroy', 'ref_session_gc'); 'ref_session_destroy', 'ref_session_gc');