]> git.mxchange.org Git - friendica.git/blobdiff - include/items.php
display the fact that a conversation is private without disclosing the details of...
[friendica.git] / include / items.php
index 688ef244ab63ed625e5c5fc64ed519b8ef8f76a0..bb1b4f16b0dd912f1a5d5145ae4650589fda490d 100644 (file)
@@ -27,8 +27,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
        $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                intval($owner_id)
        );
-       if(count($r))
+       if(count($r)) {
                $owner = $r[0];
+               $owner['nickname'] = $owner_nick;
+       }
        else
                killme();
 
@@ -90,7 +92,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
                $sort = 'ASC';
 
        if(! strlen($last_update))
-               $last_update = 'now - 30 days';
+               $last_update = 'now -30 days';
 
        $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
 
@@ -117,29 +119,42 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
        $items = $r;
 
        $feed_template = load_view_file('view/atom_feed.tpl');
-       $tomb_template = load_view_file('view/atom_tomb.tpl');
-       $item_template = load_view_file('view/atom_item.tpl');
-       $cmnt_template = load_view_file('view/atom_cmnt.tpl');
 
        $atom = '';
 
        $hub = get_config('system','huburl');
 
-       $hubxml = ((strlen($hub)) ? '<link rel="hub" href="' . xmlify($hub) . '" />' . "\n" : '');
+       $hubxml = '';
+       if(strlen($hub)) {
+               $hubs = explode(',', $hub);
+               if(count($hubs)) {
+                       foreach($hubs as $h) {
+                               $h = trim($h);
+                               if(! strlen($h))
+                                       continue;
+                               $hubxml .= '<link rel="hub" href="' . xmlify($h) . '" />' . "\n" ;
+                       }
+               }
+       }
+
+       $salmon = '<link rel="salmon" href="' . xmlify($a->get_baseurl() . '/salmon/' . $owner_nick) . '" />' . "\n" ; 
+       $salmon .= '<link rel="http://salmon-protocol.org/ns/salmon-replies" href="' . xmlify($a->get_baseurl() . '/salmon/' . $owner_nick) . '" />' . "\n" ; 
+       $salmon .= '<link rel="http://salmon-protocol.org/ns/salmon-mention" href="' . xmlify($a->get_baseurl() . '/salmon/' . $owner_nick) . '" />' . "\n" ; 
 
 
        $atom .= replace_macros($feed_template, array(
-                       '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
-                       '$feed_title'   => xmlify($owner['name']),
-                       '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
-                       '$hub'          => $hubxml,
-                       '$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)) 
+               '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
+               '$feed_title'   => xmlify($owner['name']),
+               '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
+               '$hub'          => $hubxml,
+               '$salmon'       => $salmon,
+               '$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)) 
        ));
 
 
@@ -153,63 +168,13 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
                // public feeds get html, our own nodes use bbcode
 
                if($dfrn_id === '*') {
-                       $item['body'] = bbcode($item['body']);
                        $type = 'html';
                }
                else {
                        $type = 'text';
                }
 
-               if($item['deleted']) {
-                       $atom .= replace_macros($tomb_template, array(
-                               '$id'      => xmlify($item['uri']),
-                               '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME))
-                       ));
-               }
-               else {
-                       $verb = construct_verb($item);
-                       $actobj = construct_activity($item);
-
-                       if($item['parent'] == $item['id']) {
-                               $atom .= replace_macros($item_template, array(
-                                       '$name'               => xmlify($item['name']),
-                                       '$profile_page'       => xmlify($item['url']),
-                                       '$thumb'              => xmlify($item['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']),
-                                       '$type'               => $type,
-                                       '$alt'           => xmlify($a->get_baseurl() . '/display/' . $owner_nick . '/' . $item['id']),
-                                       '$content'            => xmlify($item['body']),
-                                       '$verb'               => xmlify($verb),
-                                       '$actobj'             => $actobj,  // do not xmlify
-                                       '$comment_allow'      => ((($item['last-child']) && ($contact['rel']) && ($contact['rel'] != REL_FAN)) ? 1 : 0)
-                               ));
-                       }
-                       else {
-                               $atom .= replace_macros($cmnt_template, array(
-                                       '$name'          => xmlify($item['name']),
-                                       '$profile_page'  => xmlify($item['url']),
-                                       '$thumb'         => xmlify($item['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)),
-                                       '$type'          => $type,
-                                       '$content'       => xmlify($item['body']),
-                                       '$alt'           => xmlify($a->get_baseurl() . '/display/' . $owner_nick . '/' . $item['id']),
-                                       '$verb'          => xmlify($verb),
-                                       '$actobj'        => $actobj, // do not xmlify
-                                       '$parent_id'     => xmlify($item['parent-uri']),
-                                       '$comment_allow' => (($item['last-child']) ? 1 : 0)
-                               ));
-                       }
-               }
+               $atom .= atom_entry($item,$type,null,$owner,true);
        }
 
        $atom .= '</feed>' . "\r\n";
@@ -223,21 +188,25 @@ function construct_verb($item) {
        return ACTIVITY_POST;
 }
 
-function construct_activity($item) {
+function construct_activity_object($item) {
 
        if($item['object']) {
                $o = '<as:object>' . "\r\n";
                $r = @simplexml_load_string($item['object']);
                if($r->type)
-                       $o .= '<as:object-type>' . $r->type . '</as:object-type>' . "\r\n";
+                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
                if($r->id)
-                       $o .= '<id>' . $r->id . '</id>' . "\r\n";
-               if($r->link)
-                       $o .= '<link rel="alternate" type="text/html" href="' . $r->link . '" />' . "\r\n";
+                       $o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
                if($r->title)
-                       $o .= '<title>' . $r->title . '</title>' . "\r\n";
+                       $o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
+               if($r->link) {
+                       if(substr($r->link,0,1) === '<') 
+                               $o .= $r->link;
+                       else
+                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
+               }
                if($r->content)
-                       $o .= '<content type="html" >' . bbcode($r->content) . '</content>' . "\r\n";
+                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
                $o .= '</as:object>' . "\r\n";
                return $o;
        }
@@ -245,31 +214,118 @@ function construct_activity($item) {
        return '';
 } 
 
+function construct_activity_target($item) {
+
+       if($item['target']) {
+               $o = '<as:target>' . "\r\n";
+               $r = @simplexml_load_string($item['target']);
+               if($r->type)
+                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
+               if($r->id)
+                       $o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
+               if($r->title)
+                       $o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
+               if($r->link) {
+                       if(substr($r->link,0,1) === '<') 
+                               $o .= $r->link;
+                       else
+                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
+               }
+               if($r->content)
+                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
+               $o .= '</as:target>' . "\r\n";
+               return $o;
+       }
+
+       return '';
+} 
 
 
 
-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 && activity_match($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((! (x($res,'author-link'))) || (! (x($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 && activity_match($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(! (x($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);
@@ -291,7 +347,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.
@@ -311,6 +367,12 @@ function get_atom_elements($item) {
        else
                $res['last-child'] = 0;
 
+       $private = $item->get_item_tags(NAMESPACE_DFRN,'private');
+       if($private && $private[0]['data'] == 1)
+               $res['private'] = 1;
+       else
+               $res['private'] = 0;
+
        $rawcreated = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'published');
        if($rawcreated)
                $res['created'] = unxmlify($rawcreated[0]['data']);
@@ -334,10 +396,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']);
+
 
        $rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
        // select between supported verbs
@@ -346,7 +419,6 @@ function get_atom_elements($item) {
 
        $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
 
-
        if($rawobj) {
                $res['object'] = '<object>' . "\n";
                if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
@@ -355,9 +427,8 @@ function get_atom_elements($item) {
                }       
                if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
                        $res['object'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-               
-               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['rel'] === 'alternate')
-                       $res['object'] .= '<link>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['href'] . '</link>' . "\n";
+               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+                       $res['object'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
                if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
                        $res['object'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
                if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
@@ -370,7 +441,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);
@@ -383,103 +454,205 @@ function get_atom_elements($item) {
                $res['object'] .= '</object>' . "\n";
        }
 
+       $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'target');
+
+       if($rawobj) {
+               $res['target'] = '<target>' . "\n";
+               if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+                       $res['target'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+               }       
+               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+                       $res['target'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+
+               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+                       $res['target'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+                       $res['target'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+               if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+                       $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+                       if(! $body)
+                               $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+                       if(strpos($body,'<')) {
+
+                               $body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
+                                       '[youtube]$1[/youtube]', $body);
+
+                               $config = HTMLPurifier_Config::createDefault();
+                               $config->set('Cache.DefinitionImpl', null);
+
+                               $purifier = new HTMLPurifier($config);
+                               $body = $purifier->purify($body);
+                       }
+
+                       $body = html2bbcode($body);
+                       $res['target'] .= '<content>' . $body . '</content>' . "\n";
+               }
+
+               $res['target'] .= '</target>' . "\n";
+       }
+
        return $res;
 }
 
-function item_store($arr) {
-
-//print_r($arr);
+function encode_rel_links($links) {
+       $o = '';
+       if(! ((is_array($links)) && (count($links))))
+               return $o;
+       foreach($links as $link) {
+               $o .= '<link ';
+               if($link['attribs']['']['rel'])
+                       $o .= 'rel="' . $link['attribs']['']['rel'] . '" ';
+               if($link['attribs']['']['type'])
+                       $o .= 'type="' . $link['attribs']['']['type'] . '" ';
+               if($link['attribs']['']['href'])
+                       $o .= 'type="' . $link['attribs']['']['href'] . '" ';
+               if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['width'])
+                       $o .= 'media:width="' . $link['attribs'][NAMESPACE_MEDIA]['width'] . '" ';
+               if( (x($link['attribs'],NAMESPACE_MEDIA)) && $link['attribs'][NAMESPACE_MEDIA]['height'])
+                       $o .= 'media:height="' . $link['attribs'][NAMESPACE_MEDIA]['height'] . '" ';
+               $o .= ' />' . "\n" ;
+       }
+       return xmlify($o);
+}
 
+function item_store($arr) {
 
        if($arr['gravity'])
                $arr['gravity'] = intval($arr['gravity']);
        elseif($arr['parent-uri'] == $arr['uri'])
                $arr['gravity'] = 0;
-       elseif($arr['verb'] == ACTIVITY_POST)
+       elseif(activity_match($arr['verb'],ACTIVITY_POST))
                $arr['gravity'] = 6;
+       else      
+               $arr['gravity'] = 6;   // extensible catchall
 
        if(! x($arr,'type'))
-               $arr['type'] = 'remote';
-       $arr['wall'] = ((intval($arr['wall'])) ? 1 : 0);
-       $arr['uri'] = notags(trim($arr['uri']));
-       $arr['author-name'] = notags(trim($arr['author-name']));
-       $arr['author-link'] = notags(trim($arr['author-link']));
-       $arr['author-avatar'] = notags(trim($arr['author-avatar']));
-       $arr['owner-name'] = notags(trim($arr['owner-name']));
-       $arr['owner-link'] = notags(trim($arr['owner-link']));
-       $arr['owner-avatar'] = notags(trim($arr['owner-avatar']));
-       $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert());
-       $arr['edited']  = ((x($arr,'edited')  !== false) ? datetime_convert('UTC','UTC',$arr['edited'])  : datetime_convert());
-       $arr['changed'] = datetime_convert();
-       $arr['title'] = notags(trim($arr['title']));
-       $arr['location'] = notags(trim($arr['location']));
-       $arr['body'] = escape_tags(trim($arr['body']));
-       $arr['last-child'] = intval($arr['last-child']);
-       $arr['visible'] = ((x($arr,'visible') !== false) ? intval($arr['visible']) : 1);
-       $arr['deleted'] = 0;
-       $arr['parent-uri'] = notags(trim($arr['parent-uri']));
-       $arr['verb'] = notags(trim($arr['verb']));
-       $arr['object-type'] = notags(trim($arr['object-type']));
-       $arr['object'] = trim($arr['object']);
-
-       $parent_id = 0;
-       $parent_missing = false;
+               $arr['type']      = 'remote';
+       $arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
+       $arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : random_string());
+       $arr['author-name']   = ((x($arr,'author-name'))   ? notags(trim($arr['author-name']))   : '');
+       $arr['author-link']   = ((x($arr,'author-link'))   ? notags(trim($arr['author-link']))   : '');
+       $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : '');
+       $arr['owner-name']    = ((x($arr,'owner-name'))    ? notags(trim($arr['owner-name']))    : '');
+       $arr['owner-link']    = ((x($arr,'owner-link'))    ? notags(trim($arr['owner-link']))    : '');
+       $arr['owner-avatar']  = ((x($arr,'owner-avatar'))  ? notags(trim($arr['owner-avatar']))  : '');
+       $arr['created']       = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert());
+       $arr['edited']        = ((x($arr,'edited')  !== false) ? datetime_convert('UTC','UTC',$arr['edited'])  : datetime_convert());
+       $arr['changed']       = datetime_convert();
+       $arr['title']         = ((x($arr,'title'))         ? notags(trim($arr['title']))         : '');
+       $arr['location']      = ((x($arr,'location'))      ? notags(trim($arr['location']))      : '');
+       $arr['coord']         = ((x($arr,'coord'))         ? notags(trim($arr['coord']))         : '');
+       $arr['last-child']    = ((x($arr,'last-child'))    ? intval($arr['last-child'])          : 0 );
+       $arr['visible']       = ((x($arr,'visible') !== false) ? intval($arr['visible'])         : 1 );
+       $arr['deleted']       = 0;
+       $arr['parent-uri']    = ((x($arr,'parent-uri'))    ? notags(trim($arr['parent-uri']))    : '');
+       $arr['verb']          = ((x($arr,'verb'))          ? notags(trim($arr['verb']))          : '');
+       $arr['object-type']   = ((x($arr,'object-type'))   ? notags(trim($arr['object-type']))   : '');
+       $arr['object']        = ((x($arr,'object'))        ? trim($arr['object'])                : '');
+       $arr['target-type']   = ((x($arr,'target-type'))   ? notags(trim($arr['target-type']))   : '');
+       $arr['target']        = ((x($arr,'target'))        ? trim($arr['target'])                : '');
+       $arr['allow_cid']     = ((x($arr,'allow_cid'))     ? trim($arr['allow_cid'])             : '');
+       $arr['allow_gid']     = ((x($arr,'allow_gid'))     ? trim($arr['allow_gid'])             : '');
+       $arr['deny_cid']      = ((x($arr,'deny_cid'))      ? trim($arr['deny_cid'])              : '');
+       $arr['deny_gid']      = ((x($arr,'deny_gid'))      ? trim($arr['deny_gid'])              : '');
+       $arr['private']       = ((x($arr,'private'))       ? intval($arr['private'])             : 0 );
+       $arr['body']          = ((x($arr,'body'))          ? escape_tags(trim($arr['body']))     : '');
+
+       // The content body has been through a lot of filtering and transport escaping by now. 
+       // We don't want to skip any filters, however a side effect of all this filtering 
+       // is that ampersands and <> may have been double encoded, depending on which filter chain
+       // they came through. 
+
+       $arr['body']          = str_replace(
+                                                               array('&amp;amp;','&amp;gt;','&amp;lt;'),
+                                                               array('&amp;'    ,'&gt;'    ,'&lt;'),
+                                                               $arr['body']
+                                                       );
+
+
+
+       if($arr['parent-uri'] === $arr['uri']) {
+               $parent_id = 0;
+               $allow_cid = $arr['allow_cid'];
+               $allow_gid = $arr['allow_gid'];
+               $deny_cid  = $arr['deny_cid'];
+               $deny_gid  = $arr['deny_gid'];
+       }
+       else { 
+
+               // find the parent and snarf the item id and ACL's
+
+               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                       dbesc($arr['parent-uri']),
+                       intval($arr['uid'])
+               );
+
+               if(count($r)) {
+
+                       // is the new message multi-level threaded?
+                       // even though we don't support it now, preserve the info
+                       // and re-attach to the conversation parent.
+
+                       if($r[0]['uri'] != $r[0]['parent-uri']) {
+                               $arr['thr-parent'] = $arr['parent-uri'];
+                               $arr['parent-uri'] = $r[0]['parent-uri'];
+                       }
+
+                       $parent_id = $r[0]['id'];
+                       $allow_cid = $r[0]['allow_cid'];
+                       $allow_gid = $r[0]['allow_gid'];
+                       $deny_cid  = $r[0]['deny_cid'];
+                       $deny_gid  = $r[0]['deny_gid'];
+               }
+               else {
+                       logger('item_store: item parent was not found - ignoring item');
+                       return 0;
+               }
+       }
 
        dbesc_array($arr);
 
-       $r = q("INSERT INTO `item` (`" 
+       logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
+
+       $r = dbq("INSERT INTO `item` (`" 
                        . implode("`, `", array_keys($arr)) 
                        . "`) VALUES ('" 
                        . implode("', '", array_values($arr)) 
                        . "')" );
 
-       // find the parent and snarf the item id and ACL's
+       // find the item we just created
 
-       $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-               dbesc($arr['parent-uri']),
+       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+               $arr['uri'],           // already dbesc'd
                intval($arr['uid'])
        );
-
        if(count($r)) {
-               $parent_id = $r[0]['id'];
-               $allow_cid = $r[0]['allow_cid'];
-               $allow_gid = $r[0]['allow_gid'];
-               $deny_cid  = $r[0]['deny_cid'];
-               $deny_gid  = $r[0]['deny_gid'];
+               $current_post = $r[0]['id'];
+               logger('item_store: created item ' . $current_post);
        }
        else {
-               $parent_missing = true;
+               logger('item_store: could not locate created item');
+               return 0;
        }
 
-       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-               $arr['uri'],           // already dbesc'd
-               intval($arr['uid'])
-       );
-       if(count($r))
-               $current_post = $r[0]['id'];
+       if($arr['parent-uri'] === $arr['uri'])
+               $parent_id = $current_post;
+       if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
+               $private = 1;
        else
-               return 0;
+               $private = $arr['private']; 
 
-       if($parent_missing) {
-
-               // perhaps the parent was deleted, but in any case, this thread is dead
-               // and unfortunately our brand new item now has to be destroyed
-
-               q("DELETE FROM `item` WHERE `id` = %d LIMIT 1",
-                       intval($current_post)
-               );
-               return 0;
-       }
-
-       // Set parent id - all of the parent's ACL's are also inherited by this post
+       // Set parent id - and also make sure to inherit the parent's ACL's.
 
        $r = q("UPDATE `item` SET `parent` = %d, `allow_cid` = '%s', `allow_gid` = '%s',
-               `deny_cid` = '%s', `deny_gid` = '%s' WHERE `id` = %d LIMIT 1",
+               `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d WHERE `id` = %d LIMIT 1",
                intval($parent_id),
                dbesc($allow_cid),
                dbesc($allow_gid),
                dbesc($deny_cid),
                dbesc($deny_gid),
+               intval($private),
                intval($current_post)
        );
 
@@ -499,10 +672,11 @@ function get_item_contact($item,$contacts) {
 }
 
 
-function dfrn_deliver($contact,$atom,$debugging = false) {
+function dfrn_deliver($owner,$contact,$atom) {
 
+       $a = get_app();
 
-       if((! strlen($contact['dfrn-id'])) && (! $contact['duplex']))
+       if((! strlen($contact['dfrn-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
                return 3;
 
        $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
@@ -512,15 +686,24 @@ function dfrn_deliver($contact,$atom,$debugging = false) {
        if($contact['duplex'] && $contact['issued-id'])
                $idtosend = '1:' . $orig_id;            
 
-       $url = $contact['notify'] . '?dfrn_id=' . $idtosend;
+       $rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
+
+       $rino_enable = get_config('system','rino_encrypt');
+
+       if(! $rino_enable)
+               $rino = 0;
+
+       $url = $contact['notify'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
-       if($debugging)
-               echo "URL: $url";
+       logger('dfrn_deliver: ' . $url);
 
        $xml = fetch_url($url);
 
-       if($debugging)
-               echo $xml;
+       $curl_stat = $a->get_curl_code();
+       if(! $curl_stat)
+               return(-1); // timed out
+
+       logger('dfrn_deliver: ' . $xml);
 
        if(! $xml)
                return 3;
@@ -533,10 +716,12 @@ function dfrn_deliver($contact,$atom,$debugging = false) {
        $postvars     = array();
        $sent_dfrn_id = hex2bin($res->dfrn_id);
        $challenge    = hex2bin($res->challenge);
+       $rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
 
        $final_dfrn_id = '';
 
-       if($contact['duplex'] && strlen($contact['prvkey'])) {
+
+       if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
                openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
                openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
        }
@@ -551,24 +736,51 @@ function dfrn_deliver($contact,$atom,$debugging = false) {
                $final_dfrn_id = substr($final_dfrn_id,2);
 
        if($final_dfrn_id != $orig_id) {
+               logger('dfrn_deliver: wrong dfrn_id.');
                // did not decode properly - cannot trust this site 
                return 3;
        }
 
-       $postvars['dfrn_id'] = $idtosend;
-
+       $postvars['dfrn_id']      = $idtosend;
+       $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
 
        if(($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked']) && (! $contact['readonly'])) {
                $postvars['data'] = $atom;
        }
+       elseif($owner['page-flags'] == PAGE_COMMUNITY) {
+               $postvars['data'] = $atom;
+       }
        else {
                $postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
        }
 
+       if($rino && $rino_allowed) {
+               $key = substr(random_string(),0,16);
+               $data = bin2hex(aes_encrypt($postvars['data'],$key));
+               $postvars['data'] = $data;
+               logger('rino: sent key = ' . $key);     
+
+               if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+                       openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+               }
+               else {
+                       openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+               }
+
+               logger('md5 rawkey ' . md5($postvars['key']));
+
+               $postvars['key'] = bin2hex($postvars['key']);
+       }
+
+       logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
+
        $xml = post_url($contact['notify'],$postvars);
 
-       if($debugging)
-               echo $xml;
+       logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
+
+       $curl_stat = $a->get_curl_code();
+       if((! $curl_stat) || (! strlen($xml)))
+               return(-1); // timed out
 
        $res = simplexml_load_string($xml);
 
@@ -577,13 +789,32 @@ function dfrn_deliver($contact,$atom,$debugging = false) {
 }
 
 
-function consume_feed($xml,$importer,$contact) {
+/*
+ *
+ * consume_feed - process atom feed and update anything/everything we might need to update
+ *
+ * $xml = the (atom) feed to consume - no RSS spoken here, it might partially work since simplepie 
+ *        handles both, but we don't claim it will work well, and are reasonably certain it won't.
+ * $importer = the contact_record (joined to user_record) of the local user who owns this relationship.
+ *             It is this person's stuff that is going to be updated.
+ * $contact =  the person who is sending us stuff. If not set, we MAY be processing a "follow" activity
+ *             from an external network and MAY create an appropriate contact record. Otherwise, we MUST 
+ *             have a contact record.
+ * $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or 
+ *        might not) try and subscribe to it.
+ *
+ */
+
+function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) {
 
        require_once('simplepie/simplepie.inc');
 
        $feed = new SimplePie();
        $feed->set_raw_data($xml);
-       $feed->enable_order_by_date(false);
+       if($datedir)
+               $feed->enable_order_by_date(true);
+       else
+               $feed->enable_order_by_date(false);
        $feed->init();
 
        // Check at the feed level for updated contact name and/or photo
@@ -593,6 +824,12 @@ function consume_feed($xml,$importer,$contact) {
        $photo_timestamp = '';
        $photo_url = '';
 
+
+       $hubs = $feed->get_links('hub');
+
+       if(count($hubs))
+               $hub = implode(',', $hubs);
+
        $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
        if($rawtags) {
                $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
@@ -600,22 +837,17 @@ function consume_feed($xml,$importer,$contact) {
                        $name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
                        $new_name = $elems['name'][0]['data'];
                } 
-               if(($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
+               if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
                        $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
                        $photo_url = $elems['link'][0]['attribs']['']['href'];
                }
        }
-       if(! $photo_timestamp) {
-               $photo_rawupdate = $feed->get_feed_tags(NAMESPACE_DFRN,'icon-updated');
-               if($photo_rawupdate) {
-                       $photo_timestamp = datetime_convert('UTC','UTC',$photo_rawupdate[0]['data']);
-                       $photo_url = $feed->get_image_url();
-               }
-       }
-       if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
 
+       if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
+               logger('Consume feed: Updating photo for ' . $contact['name']);
                require_once("Photo.php");
                $photo_failure = false;
+               $have_photo = false;
 
                $r = q("SELECT `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d LIMIT 1",
                        intval($contact['id']),
@@ -623,33 +855,49 @@ function consume_feed($xml,$importer,$contact) {
                );
                if(count($r)) {
                        $resource_id = $r[0]['resource-id'];
-                       $img_str = fetch_url($photo_url,true);
-                       $img = new Photo($img_str);
-                       if($img) {
-                               q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND contact-id` = %d AND `uid` = %d",
+                       $have_photo = true;
+               }
+               else {
+                       $resource_id = photo_new_resource();
+               }
+                       
+               $img_str = fetch_url($photo_url,true);
+               $img = new Photo($img_str);
+               if($img->is_valid()) {
+                       if($have_photo) {
+                               q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `contact-id` = %d AND `uid` = %d",
                                        dbesc($resource_id),
                                        intval($contact['id']),
                                        intval($contact['uid'])
                                );
-
-                               $img->scaleImageSquare(175);
+                       }
                                
-                               $hash = $resource_id;
-                               $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 4);
+                       $img->scaleImageSquare(175);
                                
-                               $img->scaleImage(80);
-                               $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 5);
-                               if($r)
-                                       q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                                               dbesc(datetime_convert()),
-                                               intval($contact['uid']),
-                                               intval($contact['id'])
-                                       );
-                       }
+                       $hash = $resource_id;
+                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 4);
+                               
+                       $img->scaleImage(80);
+                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 5);
+
+                       $img->scaleImage(48);
+                       $r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 6);
+
+                       $a = get_app();
+
+                       q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'  
+                               WHERE `uid` = %d AND `id` = %d LIMIT 1",
+                               dbesc(datetime_convert()),
+                               dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.jpg'),
+                               dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.jpg'),
+                               dbesc($a->get_baseurl() . '/photo/' . $hash . '-6.jpg'),
+                               intval($contact['uid']),
+                               intval($contact['id'])
+                       );
                }
        }
 
-       if(($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
+       if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
                q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
                        dbesc(notags(trim($new_name))),
                        dbesc(datetime_convert()),
@@ -675,10 +923,11 @@ function consume_feed($xml,$importer,$contact) {
                                else
                                        $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
                        }
-                       if($deleted) {
-                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                       if($deleted && is_array($contact)) {
+                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
                                        dbesc($uri),
-                                       intval($importer['uid'])
+                                       intval($importer['uid']),
+                                       intval($contact['id'])
                                );
                                if(count($r)) {
                                        $item = $r[0];
@@ -710,7 +959,7 @@ function consume_feed($xml,$importer,$contact) {
                                                        );
                                                        // who is the last child now? 
                                                        $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d 
-                                                               ORDER BY `edited` DESC LIMIT 1",
+                                                               ORDER BY `created` DESC LIMIT 1",
                                                                        dbesc($item['parent-uri']),
                                                                        intval($importer['uid'])
                                                        );
@@ -735,7 +984,7 @@ function consume_feed($xml,$importer,$contact) {
                        }
 
 
-                       if($is_reply) {
+                       if(($is_reply) && is_array($contact)) {
        
                                // Have we seen it? If not, import it.
        
@@ -748,7 +997,7 @@ function consume_feed($xml,$importer,$contact) {
                                // FIXME update content if 'updated' changes
                                if(count($r)) {
                                        $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-                                       if($allow && $allow[0]['data'] != $r[0]['last-child']) {
+                                       if(($allow) && ($allow[0]['data'] != $r[0]['last-child'])) {
                                                $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
                                                        dbesc(datetime_convert()),
                                                        dbesc($parent_uri),
@@ -760,15 +1009,24 @@ function consume_feed($xml,$importer,$contact) {
                                                        dbesc($item_id),
                                                        intval($importer['uid'])
                                                );
-
                                        }
                                        continue;
                                }
-                               $datarray = get_atom_elements($item);
+                               $datarray = get_atom_elements($feed,$item);
+                               if($contact['network'] === 'stat') {
+                                       if(strlen($datarray['title']))
+                                               unset($datarray['title']);
+                                       $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                               dbesc(datetime_convert()),
+                                               dbesc($parent_uri),
+                                               intval($importer['uid'])
+                                       );
+                                       $datarray['last-child'] = 1;
+                               }
                                $datarray['parent-uri'] = $parent_uri;
                                $datarray['uid'] = $importer['uid'];
                                $datarray['contact-id'] = $contact['id'];
-                               if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
+                               if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) {
                                        $datarray['type'] = 'activity';
                                        $datarray['gravity'] = GRAVITY_LIKE;
                                }
@@ -797,7 +1055,26 @@ function consume_feed($xml,$importer,$contact) {
                                        }
                                        continue;
                                }
-                               $datarray = get_atom_elements($item);
+                               $datarray = get_atom_elements($feed,$item);
+
+                               if(activity_match($datarray['verb'],ACTIVITY_FOLLOW)) {
+                                       logger('consume-feed: New follower');
+                                       new_follower($importer,$contact,$datarray,$item);
+                                       return;
+                               }
+                               if(activity_match($datarray['verb'],ACTIVITY_UNFOLLOW))  {
+                                       lose_follower($importer,$contact,$datarray,$item);
+                                       return;
+                               }
+                               if(! is_array($contact))
+                                       return;
+
+                               if($contact['network'] === 'stat') {
+                                       if(strlen($datarray['title']))
+                                               unset($datarray['title']);
+                                       $datarray['last-child'] = 1;
+                               }
+
                                $datarray['parent-uri'] = $item_id;
                                $datarray['uid'] = $importer['uid'];
                                $datarray['contact-id'] = $contact['id'];
@@ -808,4 +1085,208 @@ function consume_feed($xml,$importer,$contact) {
                }
        }
 
-}
\ No newline at end of file
+}
+
+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) {
+                       $r = 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())
+                       );
+               }
+               $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+                       intval($importer['uid'])
+               );
+               if(count($r)) {
+                       if(($r[0]['notify-flags'] & NOTIFY_INTRO) && ($r[0]['page-flags'] == PAGE_NORMAL)) {
+                               $email_tpl = load_view_file('view/follow_notify_eml.tpl');
+                               $email = replace_macros($email_tpl, array(
+                                       '$requestor' => ((strlen($name)) ? $name : t('[Name Withheld]')),
+                                       '$url' => $url,
+                                       '$myname' => $r[0]['username'],
+                                       '$siteurl' => $a->get_baseurl(),
+                                       '$sitename' => $a->config['sitename']
+                               ));
+                               $res = mail($r[0]['email'], 
+                                       t("You have a new follower at ") . $a->config['sitename'],
+                                       $email,
+                                       'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
+                       
+                       }
+               }
+       }
+}
+
+function lose_follower($importer,$contact,$datarray,$item) {
+
+       if(($contact['rel'] == REL_BUD) || ($contact['rel'] == REL_FAN)) {
+               q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
+                       intval(REL_FAN),
+                       intval($contact['id'])
+               );
+       }
+       else {
+               contact_remove($contact['id']);
+       }
+}
+
+
+function subscribe_to_hub($url,$importer,$contact) {
+
+       if(is_array($importer)) {
+               $r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
+                       intval($importer['uid'])
+               );
+       }
+       if(! count($r))
+               return;
+
+       $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
+
+       // Use a single verify token, even if multiple hubs
+
+       $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());
+
+       $params= 'hub.mode=subscribe&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token;
+
+       logger('subscribe_to_hub: subscribing ' . $contact['name'] . ' to hub ' . $url . ' with verifier ' . $verify_token);
+
+       if(! strlen($contact['hub-verify'])) {
+               $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d LIMIT 1",
+                       dbesc($verify_token),
+                       intval($contact['id'])
+               );
+       }
+
+       post_url($url,$params);                 
+       return;
+
+}
+
+
+function atom_author($tag,$name,$uri,$h,$w,$photo) {
+       $o = '';
+       if(! $tag)
+               return $o;
+       $name = xmlify($name);
+       $uri = xmlify($uri);
+       $h = intval($h);
+       $w = intval($w);
+       $photo = xmlify($photo);
+
+
+       $o .= "<$tag>\r\n";
+       $o .= "<name>$name</name>\r\n";
+       $o .= "<uri>$uri</uri>\r\n";
+       $o .= '<link rel="photo"  type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+       $o .= '<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+       $o .= "</$tag>\r\n";
+       return $o;
+}
+
+function atom_entry($item,$type,$author,$owner,$comment = false) {
+
+       if($item['deleted'])
+               return '<at:deleted-entry ref="' . xmlify($item['uri']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />' . "\r\n";
+
+       $a = get_app();
+
+       $o = "\r\n\r\n<entry>\r\n";
+
+       if(is_array($author))
+               $o .= atom_author('author',$author['name'],$author['url'],80,80,$author['thumb']);
+       else
+               $o .= atom_author('author',$item['name'],$item['url'],80,80,$item['thumb']);
+       if(strlen($item['owner-name']))
+               $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
+
+       if($item['parent'] != $item['id'])
+               $o .= '<thr:in-reply-to ref="' . xmlify($item['parent-uri']) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
+
+       $o .= '<id>' . xmlify($item['uri']) . '</id>' . "\r\n";
+       $o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
+       $o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n";
+       $o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
+       $o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($item['body']) : $item['body']) . '</content>' . "\r\n";
+       $o .= '<link rel="alternate" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
+       if($comment)
+               $o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";
+
+       if($item['location']) {
+               $o .= '<dfrn:location>' . xmlify($item['location']) . '</dfrn:location>' . "\r\n";
+               $o .= '<poco:address><poco:formatted>' . xmlify($item['location']) . '</poco:formatted></poco:address>' . "\r\n";
+       }
+
+       if($item['coord'])
+               $o .= '<georss:point>' . xmlify($item['coord']) . '</georss:point>' . "\r\n";
+
+       if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
+               $o .= '<dfrn:private>1</dfrn:private>' . "\r\n";
+
+       $verb = construct_verb($item);
+       $o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
+       $actobj = construct_activity_object($item);
+       if(strlen($actobj))
+               $o .= $actobj;
+       $actarg = construct_activity_target($item);
+       if(strlen($actarg))
+               $o .= $actarg;
+
+       $mentioned = get_mentions($item);
+       if($mentioned)
+               $o .= $mentioned;
+       
+       $o .= '</entry>' . "\r\n";
+       
+       return $o;
+}
+       
\ No newline at end of file