workflow for federated/non-dfrn followers

4 files changed, 296 insertions, 152 deletions

diff --git a/include/items.php b/include/items.php
index e44892316..6cdf5f0f5 100644
--- a/include/items.php
+++ b/include/items.php
@@ -267,28 +267,89 @@ function construct_activity($item) {
 
 
 
-function get_atom_elements($item) {
+function get_atom_elements($feed,$item) {
 
 	require_once('library/HTMLPurifier.auto.php');
 	require_once('include/html2bbcode.php');
 
-	$res = array();
+	$best_photo = array();
 
-	$raw_author = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
-	if($raw_author) {
-		if($raw_author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['rel'] === 'photo')
-		$res['author-avatar'] = unxmlify($raw_author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['href']);
-	}
+	$res = array();
 
 	$author = $item->get_author();
 	$res['author-name'] = unxmlify($author->get_name());
 	$res['author-link'] = unxmlify($author->get_link());
-	if(! $res['author-avatar'])
-		$res['author-avatar'] = unxmlify($author->get_avatar());
 	$res['uri'] = unxmlify($item->get_id());
 	$res['title'] = unxmlify($item->get_title());
 	$res['body'] = unxmlify($item->get_content());
 
+
+	// look for a photo. We should check media size and find the best one,
+	// but for now let's just find any author photo
+
+	$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+
+	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+		foreach($base as $link) {
+			if(! $res['author-avatar']) {
+				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+					$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
+			}
+		}
+	}			
+
+	$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
+
+	if($rawactor && $rawactor[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] === ACTIVITY_OBJ_PERSON) {
+		$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+		if($base && count($base)) {
+			foreach($base as $link) {
+				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
+					$res['author-link'] = unxmlify($link['attribs']['']['href']);
+				if(! $res['author-avatar']) {
+					if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
+						$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
+				}
+			}
+		}
+	}
+
+	// No photo/profile-link on the item - look at the feed level
+
+	if((! $res['author-link']) || (! $res['author-avatar'])) {
+		$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+			$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+			foreach($base as $link) {
+				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
+					$res['author-link'] = unxmlify($link['attribs']['']['href']);
+				if(! $res['author-avatar']) {
+					if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+						$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
+				}
+			}
+		}			
+
+		$rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
+
+		if($rawactor && $rawactor[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] === ACTIVITY_OBJ_PERSON) {
+			$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+
+			if($base && count($base)) {
+				foreach($base as $link) {
+					if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
+						$res['author-link'] = unxmlify($link['attribs']['']['href']);
+					if(! $res['author-avatar']) {
+						if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
+							$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
+					}
+				}
+			}
+		}
+	}
+
+
 	$maxlen = get_max_import_size();
 	if($maxlen && (strlen($res['body']) > $maxlen))
 		$res['body'] = substr($res['body'],0, $maxlen);
@@ -310,7 +371,7 @@ function get_atom_elements($item) {
 			'[youtube]$1[/youtube]', $res['body']);
 
 		$config = HTMLPurifier_Config::createDefault();
-		$config->set('Core.DefinitionCache', null);
+		$config->set('Cache.DefinitionImpl', null);
 
 		// we shouldn't need a whitelist, because the bbcode converter
 		// will strip out any unsupported tags.
@@ -353,27 +414,21 @@ function get_atom_elements($item) {
 	elseif($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data'])
 		$res['owner-link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']);
 
-	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['rel'] === 'photo')
-		$res['owner-avatar'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['href']);
-	elseif($rawowner[0]['child'][NAMESPACE_DFRN]['avatar'][0]['data'])
-		$res['owner-avatar'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['avatar'][0]['data']);
+	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+		$base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+
+		foreach($base as $link) {
+			if(! $res['owner-avatar']) {
+				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')			
+					$res['owner-avatar'] = unxmlify($link['attribs']['']['href']);
+			}
+		}
+	}
 
 	$rawgeo = $item->get_item_tags(NAMESPACE_GEORSS,'point');
 	if($rawgeo)
 		$res['coord'] = unxmlify($rawgeo[0]['data']);
 
-	$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
-	if($rawactor && $rawactor[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] === ACTIVITY_OBJ_PERSON) {
-		$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-		if($base && count($base)) {
-			foreach($base as $link) {
-				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
-					$res['author-link'] = unxmlify($link['attribs']['']['href']);
-				if($link['attribs']['']['rel'] === 'avatar' && (! $res['author-avatar']))
-					$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
-			}
-		}
-	}
 
 	$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
 	// select between supported verbs
@@ -405,7 +460,7 @@ function get_atom_elements($item) {
 					'[youtube]$1[/youtube]', $body);
 
 				$config = HTMLPurifier_Config::createDefault();
-				$config->set('Core.DefinitionCache', null);
+				$config->set('Cache.DefinitionImpl', null);
 
 				$purifier = new HTMLPurifier($config);
 				$body = $purifier->purify($body);
@@ -423,9 +478,6 @@ function get_atom_elements($item) {
 
 function item_store($arr) {
 
-//print_r($arr);
-
-
 	if($arr['gravity'])
 		$arr['gravity'] = intval($arr['gravity']);
 	elseif($arr['parent-uri'] == $arr['uri'])
@@ -648,6 +700,7 @@ function consume_feed($xml,$importer,$contact, &$hub) {
 	$feed->init();
 
 	// Check at the feed level for updated contact name and/or photo
+	$debugging = get_config('system','debugging');
 
 	$name_updated  = '';
 	$new_name = '';
@@ -832,11 +885,13 @@ function consume_feed($xml,$importer,$contact, &$hub) {
 					}
 					continue;
 				}
-				$datarray = get_atom_elements($item);
+				$datarray = get_atom_elements($feed,$item);
+				if($contact['network'] === 'stat' && strlen($datarray['title']))
+					unset($datarray['title']);
 				$datarray['parent-uri'] = $parent_uri;
 				$datarray['uid'] = $importer['uid'];
 				$datarray['contact-id'] = $contact['id'];
-				if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
+				if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 				}
@@ -865,17 +920,23 @@ function consume_feed($xml,$importer,$contact, &$hub) {
 					}
 					continue;
 				}
-				$datarray = get_atom_elements($item);
-				if(($datarray['verb'] === ACTIVITY_FOLLOW) && (! is_array($contact))) {
-					new_follower($importer,$datarray);
+				$datarray = get_atom_elements($feed,$item);
+
+				if($datarray['verb'] === ACTIVITY_FOLLOW) {
+					if($debugging)
+						file_put_contents('salmon.out',"\n" . 'New follower.' . "\n", FILE_APPEND);
+					new_follower($importer,$contact,$datarray,$item);
 					return;
 				}
 				if($datarray['verb'] === ACTIVITY_UNFOLLOW)  {
-					lose_follower($importer,$contact,$datarray);
+					lose_follower($importer,$contact,$datarray,$item);
 					return;
 				}
 				if(! is_array($contact))
 					return;
+
+				if($contact['network'] === 'stat' && strlen($datarray['title']))
+					unset($datarray['title']);
 				$datarray['parent-uri'] = $item_id;
 				$datarray['uid'] = $importer['uid'];
 				$datarray['contact-id'] = $contact['id'];
@@ -888,14 +949,76 @@ function consume_feed($xml,$importer,$contact, &$hub) {
 
 }
 
-function new_follower($importer,$datarray) {
+function new_follower($importer,$contact,$datarray,$item) {
+	$url = notags(trim($datarray['author-link']));
+	$name = notags(trim($datarray['author-name']));
+	$photo = notags(trim($datarray['author-avatar']));
+
+	$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
+	if($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
+		$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
+
+	if(is_array($contact)) {
+		if($contact['network'] == 'stat' && $contact['rel'] == REL_FAN) {
+			$q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				intval(REL_BUD),
+				intval($contact['id']),
+				intval($importer['uid'])
+			);
+		}
 
+		// send email notification to owner?
+	}
+	else {
+	
+		// create contact record - set to readonly
 
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`, 
+			`blocked`, `readonly`, `pending` )
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 1, 1 ) ",
+			intval($importer['uid']),
+			dbesc(datetime_convert()),
+			dbesc($url),
+			dbesc($name),
+			dbesc($nick),
+			dbesc($photo),
+			dbesc('stat'),
+			intval(REL_VIP)
+		);
+		$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 AND `rel` = %d LIMIT 1",
+				intval($importer['uid']),
+				dbesc($url),
+				intval(REL_VIP)
+		);
+		if(count($r))
+				$contact_record = $r[0];
+
+		// create notification	
+		$hash = random_string();
+
+		if(is_array($contact_record)) {
+			$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `hash`, `datetime`)
+				VALUES ( %d, %d, 0, 0, '%s', '%s' )",
+				intval($importer['uid']),
+				intval($contact_record['id']),
+				dbesc($hash),
+				dbesc(datetime_convert())
+			);
+		}
+	}
 }
 
-function lose_follower($importer,$contact,$datarray) {
-
+function lose_follower($importer,$contact,$datarray,$item) {
 
+	if($contact['rel'] == REL_BUD) {
+		q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
+			intval(REL_FAN),
+			intval($contact['id'])
+		);
+	}
+	else {
+		contact_remove($contact['id']);
+	}
 }
 
 
diff --git a/include/notifier.php b/include/notifier.php
index 99b385996..9e4a7102e 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -87,6 +87,9 @@
 	// If this is a public conversation, notify the feed hub
 	$notify_hub = true;
 
+	// fill this in with a salmon slap if applicable
+	$slap = '';
+
 	if($cmd != 'mail') {
 
 		require_once('include/group.php');
@@ -197,7 +200,7 @@
 				$actobj = construct_activity($item);
 
 				if($item['id'] == $item_id) {
-					$atom .= replace_macros($cmnt_template, array(
+					$slap = replace_macros($cmnt_template, array(
 						'$name'               => xmlify($owner['name']),
 						'$profile_page'       => xmlify($owner['url']),
 						'$thumb'              => xmlify($owner['thumb']),
@@ -220,6 +223,7 @@
 					));
 				}
 			}
+			$atom .= $slap;
 		}
 		else {
 			foreach($items as $item) {
@@ -303,6 +307,8 @@
 
 	// delivery loop
 
+
+
 	foreach($r as $contact) {
 		if($contact['self'])
 			continue;
@@ -314,6 +320,10 @@
 				$deliver_status = dfrn_deliver($owner,$contact,$atom,$debugging);
 				break;
 			default:
+				if($followup) {
+					require_once('include/salmon.php');
+					slapper($owner,$contact,$slap);
+				}
 				break;
 		}
 
diff --git a/include/poller.php b/include/poller.php
index 720163fef..b88b131e2 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -22,7 +22,8 @@
 	$a->set_baseurl(get_config('system','url'));
 
 	$contacts = q("SELECT * FROM `contact` 
-		WHERE `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)) 
+		WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)))
+		OR ( `network` = 'stat' AND `poll` != '' ) ) 
 		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 
 	if(! count($contacts))
@@ -88,79 +89,86 @@
 			: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
 		);
 
-		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
+		if($contact['network'] === 'dfrn') {
 
-		if(intval($contact['duplex']) && $contact['dfrn-id'])
-			$idtosend = '0:' . $orig_id;
-		if(intval($contact['duplex']) && $contact['issued-id'])
-			$idtosend = '1:' . $orig_id;		
+			$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
-		$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
-			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
-			. '&type=data&last_update=' . $last_update ;
+			if(intval($contact['duplex']) && $contact['dfrn-id'])
+				$idtosend = '0:' . $orig_id;
+			if(intval($contact['duplex']) && $contact['issued-id'])
+				$idtosend = '1:' . $orig_id;		
 
-		$xml = fetch_url($url);
+			$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
+				. '&type=data&last_update=' . $last_update ;
+	
+			$xml = fetch_url($url);
 
-		if($debugging) {
-			echo "URL: " . $url . "\n";
-			echo "XML: " . $xml . "\n";
-		}
+			if($debugging) {
+				echo "URL: " . $url . "\n";
+				echo "XML: " . $xml . "\n";
+			}
 
-		if(! $xml) {
-			// dead connection - might be a transient event, or this might
-			// mean the software was uninstalled or the domain expired. 
-			// Will keep trying for one month.
-			mark_for_death($contact);
-			continue;
-		}
+			if(! $xml) {
+				// dead connection - might be a transient event, or this might
+				// mean the software was uninstalled or the domain expired. 
+				// Will keep trying for one month.
+				mark_for_death($contact);
+				continue;
+			}
 
 
-		$res = simplexml_load_string($xml);
+			$res = simplexml_load_string($xml);
 
-		if(intval($res->status) == 1) {
-			// we may not be friends anymore. Will keep trying for one month.
-			mark_for_death($contact);
-		}
-		else {
-			if($contact['term-date'] != '0000-00-00 00:00:00')
-				unmark_for_death($contact);
-		}
+			if(intval($res->status) == 1) {
+				// we may not be friends anymore. Will keep trying for one month.
+				mark_for_death($contact);
+			}
+			else {
+				if($contact['term-date'] != '0000-00-00 00:00:00')
+					unmark_for_death($contact);
+			}
 
-		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
-			continue;
+			if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+				continue;
 
-		$postvars = array();
+			$postvars = array();
 
-		$sent_dfrn_id = hex2bin($res->dfrn_id);
-		$challenge    = hex2bin($res->challenge);
+			$sent_dfrn_id = hex2bin($res->dfrn_id);
+			$challenge    = hex2bin($res->challenge);
 
-		$final_dfrn_id = '';
+			$final_dfrn_id = '';
 
-		if(($contact['duplex']) && strlen($contact['prvkey'])) {
-			openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-			openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
+			if(($contact['duplex']) && strlen($contact['prvkey'])) {
+				openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
+				openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
+			}
+			else {
+				openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
+				openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
+			}
 
-		}
-		else {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-		}
+			$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
+
+			if(strpos($final_dfrn_id,':') == 1)
+				$final_dfrn_id = substr($final_dfrn_id,2);
 
-		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
+			if($final_dfrn_id != $orig_id) {
 
-		if(strpos($final_dfrn_id,':') == 1)
-			$final_dfrn_id = substr($final_dfrn_id,2);
+				// did not decode properly - cannot trust this site 
+				continue;
+			}
 
-		if($final_dfrn_id != $orig_id) {
+			$postvars['dfrn_id'] = $idtosend;
+			$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
 
-			// did not decode properly - cannot trust this site 
-			continue;
+			$xml = post_url($contact['poll'],$postvars);
 		}
+		else {
+			// $contact['network'] !== 'dfrn'
 
-		$postvars['dfrn_id'] = $idtosend;
-		$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
-
-		$xml = post_url($contact['poll'],$postvars);
+			$xml = fetch_url($contact['poll']);
+		}
 
 		if($debugging) {
 			echo "XML response:" . $xml . "\n";
@@ -170,10 +178,8 @@
 		if(! strlen($xml))
 			continue;
 
-
 		consume_feed($xml,$importer,$contact,$hub);
 		
-
 		if((strlen($hub)) && ($contact['rel'] == REL_BUD) && ($contact['priority'] == 0)) {
 			$hubs = explode(',', $hub);
 			if(count($hubs)) {
@@ -192,7 +198,8 @@
 			intval($contact['id'])
 		);
 
-	}
+		// loop - next contact
+	}  
 		
 	killme();
 
diff --git a/include/salmon.php b/include/salmon.php
index 92ec571b3..c5ad3e825 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -33,61 +33,9 @@ function get_salmon_key($uri,$keyhash) {
 	if($debugging)		
 		file_put_contents('salmon.out', "\n" . 'Fetch key' . "\n", FILE_APPEND);
 
-	if(strstr($uri,'@')) {	
-		$arr = webfinger($uri);
-		if($debugging)
-			file_put_contents('salmon.out', "\n" . 'Fetch key from webfinger' . "\n", FILE_APPEND);
-	}
-	else {
-		$html = fetch_url($uri);
-		$a = get_app();
-		$h = $a->get_curl_headers();
-		if($debugging)
-			file_put_contents('salmon.out', "\n" . 'Fetch key via HTTP header: ' . $h . "\n", FILE_APPEND);
-
-		$l = explode("\n",$h);
-		if(count($l)) {
-			foreach($l as $line) {				
-				// TODO alter the following regex to support multiple relations (space separated)
-				if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
-					$link = $matches[1];
-					if($debugging)
-						file_put_contents('salmon.out', "\n" . 'Fetch key via HTML Link: ' . $link . "\n", FILE_APPEND);
-					break;
-				}
-			}
-		}
-
-		if(! isset($link)) {
-
-			// parse the page of the supplied URL looking for rel links
-
-			require_once('library/HTML5/Parser.php');
-			$dom = HTML5_Parser::parse($html);
-
-			if(! $dom)
-				return '';
+	$arr = lrdd($uri);
 
-			$items = $dom->getElementsByTagName('link');
-
-			foreach($items as $item) {
-				$x = $item->getAttribute('rel');
-				if($x == "lrdd") {
-					$link = $item->getAttribute('href');
-					if($debugging)
-						file_put_contents('salmon.out', "\n" . 'Fetch key via HTML body' . $link . "\n", FILE_APPEND);
-					break;
-				}
-			}
-		}
-
-		if(! isset($link))
-			return '';
-
-		$arr = fetch_xrd_links($link);
-	}
-
-	if($arr) {
+	if(is_array($arr)) {
 		foreach($arr as $a) {
 			if($a['@attributes']['rel'] === 'magic-public-key') {
 				$ret[] = $a['@attributes']['href'];
@@ -140,4 +88,60 @@ function get_salmon_key($uri,$keyhash) {
 
 	
 		
-				
\ No newline at end of file
+function slapper($owner,$contact,$slap) {
+
+
+	// does contact have a salmon endpoint? 
+
+	if(! strlen($contact['notify']))
+		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" >
+EOT;
+
+	$slap = str_replace('<entry>',$namespaces,$slap);
+	
+	// create a magic envelope
+
+	$data      = base64url_encode($slap);
+	$data_type = 'application/atom+xml';
+	$encoding  = 'base64url';
+	$algorithm = 'RSA-SHA256';
+	$keyhash   = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])));
+
+	// Setup RSA stuff to PKCS#1 sign the data
+
+	set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
+
+	require_once('phpsec/Crypt/RSA.php');
+
+    $rsa = new CRYPT_RSA();
+    $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
+    $rsa->setHash('sha256');
+	$rsa->loadKey($owner['sprvkey']);
+
+    $signature = $rsa->sign($data);
+
+	$salmon_tpl = load_view_file('view/magicsig.tpl');
+	$salmon = replace_macros($salmon_tpl,array(
+		'$data'      => $data,
+		'$encoding'  => $encoding,
+		'$algorithm' => $algorithm,
+		'$keyhash'   => $keyhash,
+		'$signature' => $signature
+	));
+
+	// slap them 
+	post_url($contact['notify'],$salmon);
+
+	return;
+}
\ No newline at end of file