keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

notify folks who have been tagged in a post

Browse source
This commit is contained in:
Mike Macgirvin 2010-10-31 20:36:59 -07:00
parent b919a1e35a
commit b376f21533
8 changed files with 154 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -2,7 +2,7 @@
set_time_limit(0); set_time_limit(0);
define ( 'BUILD_ID', 1012 ); define ( 'BUILD_ID', 1013 );
define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );

1
database.sql
View file

@ -176,6 +176,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`object` text NOT NULL, `object` text NOT NULL,
`resource-id` char(255) NOT NULL, `resource-id` char(255) NOT NULL,
`tag` mediumtext NOT NULL, `tag` mediumtext NOT NULL,
`inform` mediumtext NOT NULL,
`location` char(255) NOT NULL, `location` char(255) NOT NULL,
`coord` char(255) NOT NULL, `coord` char(255) NOT NULL,
`allow_cid` mediumtext NOT NULL, `allow_cid` mediumtext NOT NULL,

16
include/items.php
View file

@ -587,7 +587,7 @@ function get_item_contact($item,$contacts) {
} }
function dfrn_deliver($owner,$contact,$atom,$debugging = false) { function dfrn_deliver($owner,$contact,$atom) {
if((! strlen($contact['dfrn-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY))) if((! strlen($contact['dfrn-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
@ -602,13 +602,11 @@ function dfrn_deliver($owner,$contact,$atom,$debugging = false) {
$url = $contact['notify'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION ; $url = $contact['notify'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION ;
if($debugging) logger('dfrn_deliver: ' . $url);
echo "URL: $url\n";
$xml = fetch_url($url); $xml = fetch_url($url);
if($debugging) logger('dfrn_deliver: ' . $xml);
echo $xml;
if(! $xml) if(! $xml)
return 3; return 3;
@ -641,8 +639,7 @@ function dfrn_deliver($owner,$contact,$atom,$debugging = false) {
$final_dfrn_id = substr($final_dfrn_id,2); $final_dfrn_id = substr($final_dfrn_id,2);
if($final_dfrn_id != $orig_id) { if($final_dfrn_id != $orig_id) {
if($debugging) logger('dfrn_deliver: wrong dfrn_id.');
echo "Wrong ID - did not decode\n";
// did not decode properly - cannot trust this site // did not decode properly - cannot trust this site
return 3; return 3;
} }
@ -662,10 +659,7 @@ function dfrn_deliver($owner,$contact,$atom,$debugging = false) {
$xml = post_url($contact['notify'],$postvars); $xml = post_url($contact['notify'],$postvars);
if($debugging) { logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true) . "\n" . "RECEIVING: " . $xml);
echo "SENDING: " . print_r($postvars,true) . "\n";
echo "RECEIVING: " . $xml;
}
$res = simplexml_load_string($xml); $res = simplexml_load_string($xml);

138
include/notifier.php
View file

@ -10,12 +10,10 @@
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
$debugging = get_config('system','debugging');
require_once("session.php"); require_once("session.php");
require_once("datetime.php"); require_once("datetime.php");
require_once('include/items.php'); require_once('include/items.php');
require_once('include/bbcode.php');
if($argc < 3) if($argc < 3)
exit; exit;
@ -34,10 +32,8 @@
break; break;
} }
if($debugging)
dbg(3);
$recipients = array(); $recipients = array();
$url_recipients = array();
if($cmd === 'mail') { if($cmd === 'mail') {
@ -84,6 +80,7 @@
killme(); killme();
$hub = get_config('system','huburl'); $hub = get_config('system','huburl');
// If this is a public conversation, notify the feed hub // If this is a public conversation, notify the feed hub
$notify_hub = true; $notify_hub = true;
@ -108,8 +105,9 @@
if((strlen($parent['allow_cid'])) if((strlen($parent['allow_cid']))
|| (strlen($parent['allow_gid'])) || (strlen($parent['allow_gid']))
|| (strlen($parent['deny_cid'])) || (strlen($parent['deny_cid']))
|| (strlen($parent['deny_gid']))) || (strlen($parent['deny_gid']))) {
$notify_hub = false; // private recipients, not public $notify_hub = false; // private recipients, not public
}
$allow_people = expand_acl($parent['allow_cid']); $allow_people = expand_acl($parent['allow_cid']);
$allow_groups = expand_groups(expand_acl($parent['allow_gid'])); $allow_groups = expand_groups(expand_acl($parent['allow_gid']));
@ -121,8 +119,23 @@
foreach($items as $item) { foreach($items as $item) {
$recipients[] = $item['contact-id']; $recipients[] = $item['contact-id'];
$conversants[] = $item['contact-id']; $conversants[] = $item['contact-id'];
// pull out additional tagged people to notify (if public message)
if($notify_hub && strlen($item['inform'])) {
$people = explode(',',$item['inform']);
foreach($people as $person) {
if(substr($person,0,4) === 'cid:') {
$recipients[] = intval(substr($person,4));
$conversants[] = intval(substr($person,4));
}
else {
$url_recipients[] = substr($person,4);
}
}
}
} }
logger('notifier: url_recipients' . print_r($url_recipients,true));
$conversants = array_unique($conversants,SORT_NUMERIC); $conversants = array_unique($conversants,SORT_NUMERIC);
@ -149,8 +162,9 @@
$mail_template = load_view_file('view/atom_mail.tpl'); $mail_template = load_view_file('view/atom_mail.tpl');
$atom = ''; $atom = '';
$hubxml = ''; $hubxml = '';
$slaps = array();
if(strlen($hub)) { if(strlen($hub)) {
$hubs = explode(',', $hub); $hubs = explode(',', $hub);
if(count($hubs)) { if(count($hubs)) {
@ -180,6 +194,7 @@
if($cmd === 'mail') { if($cmd === 'mail') {
$notify_hub = false; // mail is not public $notify_hub = false; // mail is not public
$atom .= replace_macros($mail_template, array( $atom .= replace_macros($mail_template, array(
'$name' => xmlify($owner['name']), '$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']), '$profile_page' => xmlify($owner['url']),
@ -201,6 +216,28 @@
if($item['id'] == $item_id) { if($item['id'] == $item_id) {
$slap = replace_macros($cmnt_template, array( $slap = replace_macros($cmnt_template, array(
'$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']),
'$thumb' => xmlify($owner['thumb']),
'$owner_name' => xmlify($item['owner-name']),
'$owner_profile_page' => xmlify($item['owner-link']),
'$owner_thumb' => xmlify($item['owner-avatar']),
'$item_id' => xmlify($item['uri']),
'$title' => xmlify($item['title']),
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
'$location' => xmlify($item['location']),
'$coord' => xmlify($item['coord']),
'$type' => 'html',
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
'$content' => xmlify(bbcode($item['body'])),
'$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => 0
));
$atom .= replace_macros($cmnt_template, array(
'$name' => xmlify($owner['name']), '$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']), '$profile_page' => xmlify($owner['url']),
'$thumb' => xmlify($owner['thumb']), '$thumb' => xmlify($owner['thumb']),
@ -221,9 +258,11 @@
'$parent_id' => xmlify($item['parent-uri']), '$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => 0 '$comment_allow' => 0
)); ));
} }
} }
$atom .= $slap;
} }
else { else {
foreach($items as $item) { foreach($items as $item) {
@ -232,6 +271,10 @@
'$id' => xmlify($item['uri']), '$id' => xmlify($item['uri']),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)) '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME))
)); ));
$slaps[] = replace_macros($tomb_template, array(
'$id' => xmlify($item['uri']),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME))
));
} }
else { else {
$contact = get_item_contact($item,$contacts); $contact = get_item_contact($item,$contacts);
@ -262,6 +305,27 @@
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']), '$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
'$comment_allow' => (($item['last-child']) ? 1 : 0) '$comment_allow' => (($item['last-child']) ? 1 : 0)
)); ));
$slaps[] = replace_macros($item_template, array(
'$name' => xmlify($contact['name']),
'$profile_page' => xmlify($contact['url']),
'$thumb' => xmlify($contact['thumb']),
'$owner_name' => xmlify($item['owner-name']),
'$owner_profile_page' => xmlify($item['owner-link']),
'$owner_thumb' => xmlify($item['owner-avatar']),
'$item_id' => xmlify($item['uri']),
'$title' => xmlify($item['title']),
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
'$location' => xmlify($item['location']),
'$coord' => xmlify($item['coord']),
'$type' => 'html',
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$content' => xmlify(bbcode($item['body'])),
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
'$comment_allow' => (($item['last-child']) ? 1 : 0)
));
} }
else { else {
$atom .= replace_macros($cmnt_template, array( $atom .= replace_macros($cmnt_template, array(
@ -282,6 +346,24 @@
'$parent_id' => xmlify($item['parent-uri']), '$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => (($item['last-child']) ? 1 : 0) '$comment_allow' => (($item['last-child']) ? 1 : 0)
)); ));
$slaps[] = replace_macros($cmnt_template, array(
'$name' => xmlify($contact['name']),
'$profile_page' => xmlify($contact['url']),
'$thumb' => xmlify($contact['thumb']),
'$item_id' => xmlify($item['uri']),
'$title' => xmlify($item['title']),
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
'$content' => xmlify(bbcode($item['body'])),
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
'$location' => xmlify($item['location']),
'$coord' => xmlify($item['coord']),
'$type' => 'html',
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => (($item['last-child']) ? 1 : 0)
));
} }
} }
} }
@ -289,9 +371,9 @@
} }
$atom .= '</feed>' . "\r\n"; $atom .= '</feed>' . "\r\n";
if($debugging) logger('notifier: ' . $atom);
echo $atom;
logger('notifier: slaps: ' . print_r($slaps,true));
if($followup) if($followup)
$recip_str = $parent['contact-id']; $recip_str = $parent['contact-id'];
@ -299,7 +381,7 @@
$recip_str = implode(', ', $recipients); $recip_str = implode(', ', $recipients);
$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) ", $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 ",
dbesc($recip_str) dbesc($recip_str)
); );
if(! count($r)) if(! count($r))
@ -307,7 +389,7 @@
// delivery loop // delivery loop
require_once('include/salmon.php');
foreach($r as $contact) { foreach($r as $contact) {
if($contact['self']) if($contact['self'])
@ -317,12 +399,24 @@
switch($contact['network']) { switch($contact['network']) {
case 'dfrn': case 'dfrn':
$deliver_status = dfrn_deliver($owner,$contact,$atom,$debugging); $deliver_status = dfrn_deliver($owner,$contact,$atom);
logger('notifier: delivery: ' . $contact['name']);
break; break;
default: default:
if($followup) { if($followup) {
require_once('include/salmon.php'); slapper($owner,$contact['notify'],$slap);
slapper($owner,$contact,$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) && $notify_hub) {
foreach($slaps as $slappy) {
slapper($owner,$contact['notify'],$slappy);
}
logger('notifier: slapdelivery: ' . $contact['name']);
}
} }
break; break;
} }
@ -332,6 +426,18 @@
intval($item_id) intval($item_id)
); );
} }
}
// send additional slaps to mentioned remote tags (@foo@example.com)
if(count($slaps) && count($url_recipients) && $notify_hub) {
foreach($url_recipients as $url) {
foreach($slaps as $slappy) {
slapper($owner,$url,$slappy);
}
logger('notifier: urldelivery: ' . $url);
}
} }
if((strlen($hub)) && ($notify_hub)) { if((strlen($hub)) && ($notify_hub)) {

8
include/salmon.php
View file

@ -86,13 +86,13 @@ function get_salmon_key($uri,$keyhash) {
function slapper($owner,$contact,$slap) { function slapper($owner,$url,$slap) {
logger('slapper called. Data: ' . $slap); logger('slapper called. Data: ' . $slap);
// does contact have a salmon endpoint? // does contact have a salmon endpoint?
if(! strlen($contact['notify'])) if(! strlen($url))
return; return;
// add all namespaces to item // add all namespaces to item
@ -147,7 +147,7 @@ EOT;
)); ));
// slap them // slap them
post_url($contact['notify'],$salmon, array( post_url($url,$salmon, array(
'Content-type: application/magic-envelope+xml', 'Content-type: application/magic-envelope+xml',
'Content-length: ' . strlen($salmon) 'Content-length: ' . strlen($salmon)
)); ));
@ -172,7 +172,7 @@ EOT;
)); ));
// slap them // slap them
post_url($contact['notify'],$salmon, array( post_url($url,$salmon, array(
'Content-type: application/magic-envelope+xml', 'Content-type: application/magic-envelope+xml',
'Content-length: ' . strlen($salmon) 'Content-length: ' . strlen($salmon)
)); ));

2
mod/follow.php
View file

@ -163,7 +163,7 @@ function follow_post(&$a) {
); );
require_once('include/salmon.php'); require_once('include/salmon.php');
slapper($r[0],$contact,$slap); slapper($r[0],$contact['notify'],$slap);
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED

26
mod/item.php
View file

@ -14,8 +14,7 @@ function item_post(&$a) {
require_once('include/security.php'); require_once('include/security.php');
$uid = $_SESSION['uid']; $uid = local_user();
$parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0); $parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
@ -115,7 +114,7 @@ function item_post(&$a) {
} }
$str_tags = ''; $str_tags = '';
$tagged = array(); $inform = '';
$tags = get_tags($body); $tags = get_tags($body);
@ -125,14 +124,17 @@ function item_post(&$a) {
if(strpos($tag,'@') === 0) { if(strpos($tag,'@') === 0) {
$name = substr($tag,1); $name = substr($tag,1);
if(strpos($name,'@')) { if(strpos($name,'@')) {
$newname = $name;
$links = @webfinger($name); $links = @webfinger($name);
if(count($links)) { if(count($links)) {
foreach($links as $link) { foreach($links as $link) {
if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
$profile = $link['@attributes']['href']; $profile = $link['@attributes']['href'];
if($link['@attributes']['rel'] === 'salmon') if($link['@attributes']['rel'] === 'salmon') {
$salmon = $link['@attributes']['href']; if(strlen($inform))
$inform .= ',';
$inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
}
} }
} }
} }
@ -153,7 +155,9 @@ function item_post(&$a) {
} }
if(count($r)) { if(count($r)) {
$profile = $r[0]['url']; $profile = $r[0]['url'];
$salmon = $r[0]['notify']; if(strlen($inform))
$inform .= ',';
$inform .= 'cid:' . $r[0]['id'];
} }
} }
if($profile) { if($profile) {
@ -181,9 +185,9 @@ function item_post(&$a) {
$uri = item_new_uri($a->get_hostname(),$profile_uid); $uri = item_new_uri($a->get_hostname(),$profile_uid);
$r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`,
`author-name`, `author-link`, `author-avatar`, `created`, `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`,
`edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`) `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($profile_uid), intval($profile_uid),
dbesc($post_type), dbesc($post_type),
intval($wall), intval($wall),
@ -203,6 +207,8 @@ function item_post(&$a) {
dbesc($body), dbesc($body),
dbesc($location), dbesc($location),
dbesc($coord), dbesc($coord),
dbesc($str_tags),
dbesc($inform),
dbesc($verb), dbesc($verb),
dbesc($str_contact_allow), dbesc($str_contact_allow),
dbesc($str_group_allow), dbesc($str_group_allow),

4
update.php
View file

@ -92,4 +92,8 @@ function update_1011() {
); );
} }
} }
}
function update_1012() {
q("ALTER TABLE `item` ADD `inform` MEDIUMTEXT NOT NULL AFTER `tag` ");
} }