]> git.mxchange.org Git - friendica.git/blobdiff - include/items.php
more work on enotify
[friendica.git] / include / items.php
index a378a632c04a87305b6514d28105e7c6f0494a23..4666211d82ca655410f82fed751f2c0e451ef468 100644 (file)
@@ -1,8 +1,9 @@
 <?php
 
-require_once('bbcode.php');
-require_once('oembed.php');
+require_once('include/bbcode.php');
+require_once('include/oembed.php');
 require_once('include/salmon.php');
+require_once('include/crypto.php');
 
 function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
 
@@ -11,6 +12,20 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
        if(! strlen($owner_nick))
                killme();
 
+       $public_feed = (($dfrn_id) ? false : true);
+       $starred = false;
+       $converse = false;
+
+       if($public_feed && $a->argc > 2) {
+               for($x = 2; $x < $a->argc; $x++) {
+                       if($a->argv[$x] == 'converse')
+                               $converse = true;
+                       if($a->argv[$x] == 'starred')
+                               $starred = true;
+               }
+       }
+
+
        $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid`  = '' AND `deny_gid`  = '' ";
 
        $r = q("SELECT `contact`.*, `user`.`uid` AS `user_uid`, `user`.`nickname`, `user`.`timezone`
@@ -28,7 +43,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 
        $birthday = feed_birthday($owner_id,$owner['timezone']);
 
-       if(strlen($dfrn_id)) {
+       if(! $public_feed) {
 
                $sql_extra = '';
                switch($direction) {
@@ -80,7 +95,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
                );
        }
 
-       if($dfrn_id === '' || $dfrn_id === '*')
+       if($public_feed)
                $sort = 'DESC';
        else
                $sort = 'ASC';
@@ -88,14 +103,21 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
        if(! strlen($last_update))
                $last_update = 'now -30 days';
 
+       if($public_feed) {
+               if(! $converse)
+                       $sql_extra .= " AND `contact`.`self` = 1 ";
+       }
+
        $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
 
        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, 
                `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
                `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
-               `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`
+               `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`,
+               `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+               LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
                WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`parent` != 0 
                AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
@@ -112,7 +134,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 
        $items = $r;
 
-       $feed_template = get_markup_template('atom_feed.tpl');
+       $feed_template = get_markup_template(($dfrn_id) ? 'atom_feed_dfrn.tpl' : 'atom_feed.tpl');
 
        $atom = '';
 
@@ -121,7 +143,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
        $salmon = feed_salmonlinks($owner_nick);
 
        $atom .= replace_macros($feed_template, array(
-               '$version'      => xmlify(FRIENDIKA_VERSION),
+               '$version'      => xmlify(FRIENDICA_VERSION),
                '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
                '$feed_title'   => xmlify($owner['name']),
                '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
@@ -151,8 +173,11 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 
                // public feeds get html, our own nodes use bbcode
 
-               if($dfrn_id === '') {
+               if($public_feed) {
                        $type = 'html';
+                       // catch any email that's in a public conversation and make sure it doesn't leak
+                       if($item['private'])
+                               continue;
                }
                else {
                        $type = 'text';
@@ -342,6 +367,22 @@ function get_atom_elements($feed,$item) {
                        $res['app'] = 'OStatus';
        }                  
 
+       // base64 encoded json structure representing Diaspora signature
+
+       $dsig = $item->get_item_tags(NAMESPACE_DFRN,'diaspora_signature');
+       if($dsig) {
+               $res['dsprsig'] = unxmlify($dsig[0]['data']);
+       }
+
+       $dguid = $item->get_item_tags(NAMESPACE_DFRN,'diaspora_guid');
+       if($dguid)
+               $res['guid'] = unxmlify($dguid[0]['data']);
+
+       $bm = $item->get_item_tags(NAMESPACE_DFRN,'bookmark');
+       if($bm)
+               $res['bookmark'] = ((unxmlify($bm[0]['data']) === 'true') ? 1 : 0);
+
+
        /**
         * If there's a copy of the body content which is guaranteed to have survived mangling in transit, use it.
         */
@@ -373,11 +414,7 @@ function get_atom_elements($feed,$item) {
 
        if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) {
 
-               $res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
-                       '[youtube]$1[/youtube]', $res['body']);
-
-               $res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
-                       '[youtube]$1[/youtube]', $res['body']);
+               $res['body'] = html2bb_video($res['body']);
 
                $res['body'] = oembed_html2bbcode($res['body']);
 
@@ -545,12 +582,7 @@ function get_atom_elements($feed,$item) {
                        $res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
                        if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
 
-                               $body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
-                                       '[youtube]$1[/youtube]', $body);
-
-               $res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
-                       '[youtube]$1[/youtube]', $res['body']);
-
+                               $body = html2bb_video($body);
 
                                $config = HTMLPurifier_Config::createDefault();
                                $config->set('Cache.DefinitionImpl', null);
@@ -585,14 +617,10 @@ function get_atom_elements($feed,$item) {
                        if(! $body)
                                $body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
                        // preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
-                       $res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
+                       $res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
                        if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
 
-                               $body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
-                                       '[youtube]$1[/youtube]', $body);
-
-               $res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
-                       '[youtube]$1[/youtube]', $res['body']);
+                               $body = html2bb_video($body);
 
                                $config = HTMLPurifier_Config::createDefault();
                                $config->set('Cache.DefinitionImpl', null);
@@ -638,9 +666,18 @@ function encode_rel_links($links) {
 
 function item_store($arr,$force_parent = false) {
 
+       // If a Diaspora signature structure was passed in, pull it out of the 
+       // item array and set it aside for later storage.
+
+       $dsprsig = null;
+       if(x($arr,'dsprsig')) {
+               $dsprsig = json_decode(base64_decode($arr['dsprsig']));
+               unset($arr['dsprsig']);
+       }
+
        if($arr['gravity'])
                $arr['gravity'] = intval($arr['gravity']);
-       elseif($arr['parent-uri'] == $arr['uri'])
+       elseif($arr['parent-uri'] === $arr['uri'])
                $arr['gravity'] = 0;
        elseif(activity_match($arr['verb'],ACTIVITY_POST))
                $arr['gravity'] = 6;
@@ -667,6 +704,7 @@ function item_store($arr,$force_parent = false) {
        $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['commented']     = datetime_convert();
        $arr['received']      = datetime_convert();
        $arr['changed']       = datetime_convert();
        $arr['title']         = ((x($arr,'title'))         ? notags(trim($arr['title']))         : '');
@@ -687,10 +725,13 @@ function item_store($arr,$force_parent = false) {
        $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['bookmark']      = ((x($arr,'bookmark'))      ? intval($arr['bookmark'])            : 0 );
        $arr['body']          = ((x($arr,'body'))          ? trim($arr['body'])                  : '');
        $arr['tag']           = ((x($arr,'tag'))           ? notags(trim($arr['tag']))           : '');
        $arr['attach']        = ((x($arr,'attach'))        ? notags(trim($arr['attach']))        : '');
        $arr['app']           = ((x($arr,'app'))           ? notags(trim($arr['app']))           : '');
+       $arr['origin']        = ((x($arr,'origin'))        ? intval($arr['origin'])              : 0 );
+       $arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid());
 
        if($arr['parent-uri'] === $arr['uri']) {
                $parent_id = 0;
@@ -704,7 +745,7 @@ function item_store($arr,$force_parent = false) {
                // find the parent and snarf the item id and ACL's
                // and anything else we need to inherit
 
-               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
                        dbesc($arr['parent-uri']),
                        intval($arr['uid'])
                );
@@ -718,7 +759,8 @@ function item_store($arr,$force_parent = false) {
                        if($r[0]['uri'] != $r[0]['parent-uri']) {
                                $arr['thr-parent'] = $arr['parent-uri'];
                                $arr['parent-uri'] = $r[0]['parent-uri'];
-                               $z = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
+                               $z = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d 
+                                       ORDER BY `id` ASC LIMIT 1",
                                        dbesc($r[0]['parent-uri']),
                                        dbesc($r[0]['parent-uri']),
                                        intval($arr['uid'])
@@ -754,7 +796,14 @@ function item_store($arr,$force_parent = false) {
                }
        }
 
-       $arr['guid'] = get_guid();
+       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+               dbesc($arr['uri']),
+               intval($arr['uid'])
+       );
+       if($r && count($r)) {
+               logger('item-store: duplicate item ignored. ' . print_r($arr,true));
+               return 0;
+       }
 
        call_hooks('post_remote',$arr);
 
@@ -770,18 +819,10 @@ function item_store($arr,$force_parent = false) {
 
        // find the item we just created
 
-       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+       $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC ",
                $arr['uri'],           // already dbesc'd
                intval($arr['uid'])
        );
-       if(! count($r)) {
-               // This is not good, but perhaps we encountered a rare race/cache condition, so back off and try again. 
-               sleep(3);
-               $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'];
@@ -791,6 +832,14 @@ function item_store($arr,$force_parent = false) {
                logger('item_store: could not locate created item');
                return 0;
        }
+       if(count($r) > 1) {
+               logger('item_store: duplicated post occurred. Removing duplicates.');
+               q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `id` != %d ",
+                       $arr['uri'],
+                       intval($arr['uid']),
+                       intval($current_post)
+               );
+       }
 
        if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))      
                $parent_id = $current_post;
@@ -814,6 +863,24 @@ function item_store($arr,$force_parent = false) {
                intval($current_post)
        );
 
+       // update the commented timestamp on the parent
+
+       q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+               dbesc(datetime_convert()),
+               dbesc(datetime_convert()),
+               intval($parent_id)
+       );
+
+       if($dsprsig) {
+               q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
+                       intval($current_post),
+                       dbesc($dsprsig->signed_text),
+                       dbesc($dsprsig->signature),
+                       dbesc($dsprsig->signer)
+               );
+       }
+
+
        /**
         * If this is now the last-child, force all _other_ children of this parent to *not* be last-child
         */
@@ -826,6 +893,8 @@ function item_store($arr,$force_parent = false) {
                );
        }
 
+       tgroup_deliver($arr['uid'],$current_post);
+
        return $current_post;
 }
 
@@ -842,6 +911,69 @@ function get_item_contact($item,$contacts) {
 }
 
 
+function tgroup_deliver($uid,$item_id) {
+
+
+       // setup a second delivery chain for forum/community posts if appropriate
+
+       $a = get_app();
+
+       $deliver_to_tgroup = false;
+
+       $u = q("select * from user where uid = %d and `page-flags` = %d limit 1",
+               intval($uid),
+               intval(PAGE_COMMUNITY)
+       );
+       if(! count($u))
+               return;
+
+       $i = q("select * from item where id = %d and uid = %d limit 1",
+               intval($item_id),
+               intval($uid)
+       );
+       if(! count($i))
+               return;
+
+       $item = $i[0];
+
+       // prevent delivery looping - only proceed
+       // if the message originated elsewhere and is a top-level post
+
+       if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
+               return;
+
+
+       $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+
+       $cnt = preg_match_all('/\@\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
+       if($cnt) {
+               foreach($matches as $mtch) {
+                       if(link_compare($link,$mtch[1])) {
+                               $deliver_to_tgroup = true;
+                               logger('tgroup_deliver: local group mention found: ' . $mtch[2]);
+                       }
+               }
+       }
+
+       if(! $deliver_to_tgroup)
+               return;
+
+       // now change this copy of the post to a forum head message and deliver to all the tgroup members
+
+
+       q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1",
+               intval($item_id)
+       );
+
+       proc_run('php','include/notifier.php','tgroup',$item_id);                       
+
+}
+
+
+
+
+
+
 function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
        $a = get_app();
@@ -873,7 +1005,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
        if(! $curl_stat)
                return(-1); // timed out
 
-       logger('dfrn_deliver: ' . $xml);
+       logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
 
        if(! $xml)
                return 3;
@@ -937,7 +1069,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
                $key = substr(random_string(),0,16);
                $data = bin2hex(aes_encrypt($postvars['data'],$key));
                $postvars['data'] = $data;
-               logger('rino: sent key = ' . $key);     
+               logger('rino: sent key = ' . $key, LOGGER_DEBUG);       
 
 
                if($dfrn_version >= 2.1) {      
@@ -972,6 +1104,9 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
        if((! $curl_stat) || (! strlen($xml)))
                return(-1); // timed out
 
+       if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))
+               return(-1);
+
        if(strpos($xml,'<?xml') === false) {
                logger('dfrn_deliver: phase 2: no valid XML returned');
                logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
@@ -997,10 +1132,21 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
  *             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.
+ * $datedir sorts in reverse order
+ * $pass - by default ($pass = 0) we cannot guarantee that a parent item has been 
+ *      imported prior to its children being seen in the stream unless we are certain
+ *      of how the feed is arranged/ordered.
+ * With $pass = 1, we only pull parent items out of the stream.
+ * With $pass = 2, we only pull children (comments/likes).
  *
+ * So running this twice, first with pass 1 and then with pass 2 will do the right
+ * thing regardless of feed ordering. This won't be adequate in a fully-threaded
+ * model where comments can have sub-threads. That would require some massive sorting
+ * to get all the feed items into a mostly linear ordering, and might still require
+ * recursion.  
  */
 
-function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_feed = false) {
+function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) {
 
        require_once('library/simplepie/simplepie.inc');
 
@@ -1035,7 +1181,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
        if(count($hubs))
                $hub = implode(',', $hubs);
 
-       $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+       $rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
+       if(! $rawtags)
+               $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
        if($rawtags) {
                $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
                if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
@@ -1166,7 +1314,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
        // process any deleted entries
 
        $del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry');
-       if(is_array($del_entries) && count($del_entries)) {
+       if(is_array($del_entries) && count($del_entries) && $pass != 2) {
                foreach($del_entries as $dentry) {
                        $deleted = false;
                        if(isset($dentry['attribs']['']['ref'])) {
@@ -1180,7 +1328,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                        $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
                        }
                        if($deleted && is_array($contact)) {
-                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+                               $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` 
+                                       WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
                                        dbesc($uri),
                                        intval($importer['uid']),
                                        intval($contact['id'])
@@ -1191,6 +1340,41 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                        if(! $item['deleted'])
                                                logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
 
+                                       if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+                                               $xo = parse_xml_string($item['object'],false);
+                                               $xt = parse_xml_string($item['target'],false);
+                                               if($xt->type === ACTIVITY_OBJ_NOTE) {
+                                                       $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
+                                                               dbesc($xt->id),
+                                                               intval($importer['importer_uid'])
+                                                       );
+                                                       if(count($i)) {
+
+                                                               // For tags, the owner cannot remove the tag on the author's copy of the post.
+
+                                                               $owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
+                                                               $author_remove = (($item['origin'] && $item['self']) ? true : false);
+                                                               $author_copy = (($item['origin']) ? true : false);
+
+                                                               if($owner_remove && $author_copy)
+                                                                       continue;
+                                                               if($author_remove || $owner_remove) {
+                                                                       $tags = explode(',',$i[0]['tag']);
+                                                                       $newtags = array();
+                                                                       if(count($tags)) {
+                                                                               foreach($tags as $tag)
+                                                                                       if(trim($tag) !== trim($xo->body))
+                                                                                               $newtags[] = trim($tag);
+                                                                       }
+                                                                       q("update item set tag = '%s' where id = %d limit 1",
+                                                                               dbesc(implode(',',$newtags)),
+                                                                               intval($i[0]['id'])
+                                                                       );
+                                                               }
+                                                       }
+                                               }
+                                       }
+
                                        if($item['uri'] == $item['parent-uri']) {
                                                $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
                                                        `body` = '', `title` = ''
@@ -1260,6 +1444,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 
                        if(($is_reply) && is_array($contact)) {
 
+                               if($pass == 1)
+                                       continue;
+
                                // Have we seen it? If not, import it.
        
                                $item_id  = $item->get_id();
@@ -1310,7 +1497,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                }
 
                                $force_parent = false;
-                               if($contact['network'] === 'stat') {
+                               if($contact['network'] === NETWORK_OSTATUS) {
                                        $force_parent = true;
                                        if(strlen($datarray['title']))
                                                unset($datarray['title']);
@@ -1322,7 +1509,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                        $datarray['last-child'] = 1;
                                }
 
-                               if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
+                               if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
                                        // one way feed - no remote comment ability
                                        $datarray['last-child'] = 0;
                                }
@@ -1334,6 +1521,31 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                        $datarray['gravity'] = GRAVITY_LIKE;
                                }
 
+                               if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+                                       $xo = parse_xml_string($datarray['object'],false);
+                                       $xt = parse_xml_string($datarray['target'],false);
+
+                                       if($xt->type == ACTIVITY_OBJ_NOTE) {
+                                               $r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
+                                                       dbesc($xt->id),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                               if(! count($r))
+                                                       continue;
+
+                                               // extract tag, if not duplicate, add to parent item
+                                               if($xo->id && $xo->content) {
+                                                       $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+                                                       if(! (stristr($r[0]['tag'],$newtag))) {
+                                                               q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+                                                                       dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
+                                                                       intval($r[0]['id'])
+                                                               );
+                                                       }
+                                               }
+                                       }
+                               }
+
                                $r = item_store($datarray,$force_parent);
                                continue;
                        }
@@ -1355,6 +1567,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                                $datarray['author-avatar'] = $contact['thumb'];
                                }
 
+                               // special handling for events
+
                                if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
                                        $ev = bbtoevent($datarray['body']);
                                        if(x($ev,'desc') && x($ev,'start')) {
@@ -1416,16 +1630,28 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                        lose_follower($importer,$contact,$datarray,$item);
                                        return;
                                }
+
+                               if(activity_match($datarray['verb'],ACTIVITY_REQ_FRIEND)) {
+                                       logger('consume-feed: New friend request');
+                                       new_follower($importer,$contact,$datarray,$item,true);
+                                       return;
+                               }
+                               if(activity_match($datarray['verb'],ACTIVITY_UNFRIEND))  {
+                                       lose_sharer($importer,$contact,$datarray,$item);
+                                       return;
+                               }
+
+
                                if(! is_array($contact))
                                        return;
 
-                               if($contact['network'] === 'stat' || stristr($permalink,'twitter.com')) {
+                               if($contact['network'] === NETWORK_OSTATUS || stristr($permalink,'twitter.com')) {
                                        if(strlen($datarray['title']))
                                                unset($datarray['title']);
                                        $datarray['last-child'] = 1;
                                }
 
-                               if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
+                               if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
                                        // one way feed - no remote comment ability
                                        $datarray['last-child'] = 0;
                                }
@@ -1447,7 +1673,806 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
        }
 }
 
-function new_follower($importer,$contact,$datarray,$item) {
+function local_delivery($importer,$data) {
+
+       $a = get_app();
+
+       if($importer['readonly']) {
+               // We aren't receiving stuff from this person. But we will quietly ignore them
+               // rather than a blatant "go away" message.
+               logger('local_delivery: ignoring');
+               return 0;
+               //NOTREACHED
+       }
+
+       // Consume notification feed. This may differ from consuming a public feed in several ways
+       // - might contain email or friend suggestions
+       // - might contain remote followup to our message
+       //              - in which case we need to accept it and then notify other conversants
+       // - we may need to send various email notifications
+
+       $feed = new SimplePie();
+       $feed->set_raw_data($data);
+       $feed->enable_order_by_date(false);
+       $feed->init();
+
+       $reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
+       if(isset($reloc[0]['child'][NAMESPACE_DFRN])) {
+               $base = $reloc[0]['child'][NAMESPACE_DFRN];
+               $newloc = array();
+               $newloc['uid'] = $importer['importer_uid'];
+               $newloc['cid'] = $importer['id'];
+               $newloc['name'] = notags(unxmlify($base['name'][0]['data']));
+               $newloc['photo'] = notags(unxmlify($base['photo'][0]['data']));
+               $newloc['url'] = notags(unxmlify($base['url'][0]['data']));
+               $newloc['request'] = notags(unxmlify($base['request'][0]['data']));
+               $newloc['confirm'] = notags(unxmlify($base['confirm'][0]['data']));
+               $newloc['notify'] = notags(unxmlify($base['notify'][0]['data']));
+               $newloc['poll'] = notags(unxmlify($base['poll'][0]['data']));
+               $newloc['site-pubkey'] = notags(unxmlify($base['site-pubkey'][0]['data']));
+               $newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
+               $newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));
+               
+               // TODO
+               // merge with current record, current contents have priority
+               // update record, set url-updated
+               // update profile photos
+               // schedule a scan?
+
+       }
+
+       // handle friend suggestion notification
+
+       $sugg = $feed->get_feed_tags( NAMESPACE_DFRN, 'suggest' );
+       if(isset($sugg[0]['child'][NAMESPACE_DFRN])) {
+               $base = $sugg[0]['child'][NAMESPACE_DFRN];
+               $fsugg = array();
+               $fsugg['uid'] = $importer['importer_uid'];
+               $fsugg['cid'] = $importer['id'];
+               $fsugg['name'] = notags(unxmlify($base['name'][0]['data']));
+               $fsugg['photo'] = notags(unxmlify($base['photo'][0]['data']));
+               $fsugg['url'] = notags(unxmlify($base['url'][0]['data']));
+               $fsugg['request'] = notags(unxmlify($base['request'][0]['data']));
+               $fsugg['body'] = escape_tags(unxmlify($base['note'][0]['data']));
+
+               // Does our member already have a friend matching this description?
+
+               $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
+                       dbesc($fsugg['name']),
+                       dbesc(normalise_link($fsugg['url'])),
+                       intval($fsugg['uid'])
+               );
+               if(count($r))
+                       return 0;
+
+               // Do we already have an fcontact record for this person?
+
+               $fid = 0;
+               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+                       dbesc($fsugg['url']),
+                       dbesc($fsugg['name']),
+                       dbesc($fsugg['request'])
+               );
+               if(count($r)) {
+                       $fid = $r[0]['id'];
+               }
+               if(! $fid)
+                       $r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
+                       dbesc($fsugg['name']),
+                       dbesc($fsugg['url']),
+                       dbesc($fsugg['photo']),
+                       dbesc($fsugg['request'])
+               );
+               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+                       dbesc($fsugg['url']),
+                       dbesc($fsugg['name']),
+                       dbesc($fsugg['request'])
+               );
+               if(count($r)) {
+                       $fid = $r[0]['id'];
+               }
+               // database record did not get created. Quietly give up.
+               else
+                       return 0;
+
+               $hash = random_string();
+               $r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
+                       VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
+                       intval($fsugg['uid']),
+                       intval($fid),
+                       intval($fsugg['cid']),
+                       dbesc($fsugg['body']),
+                       dbesc($hash),
+                       dbesc(datetime_convert()),
+                       intval(0)
+               );
+
+               // TODO - send email notify (which may require a new notification preference)
+
+               return 0;
+       }
+
+       $ismail = false;
+
+       $rawmail = $feed->get_feed_tags( NAMESPACE_DFRN, 'mail' );
+       if(isset($rawmail[0]['child'][NAMESPACE_DFRN])) {
+
+               logger('local_delivery: private message received');
+
+               $ismail = true;
+               $base = $rawmail[0]['child'][NAMESPACE_DFRN];
+
+               $msg = array();
+               $msg['uid'] = $importer['importer_uid'];
+               $msg['from-name'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['name'][0]['data']));
+               $msg['from-photo'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['avatar'][0]['data']));
+               $msg['from-url'] = notags(unxmlify($base['sender'][0]['child'][NAMESPACE_DFRN]['uri'][0]['data']));
+               $msg['contact-id'] = $importer['id'];
+               $msg['title'] = notags(unxmlify($base['subject'][0]['data']));
+               $msg['body'] = escape_tags(unxmlify($base['content'][0]['data']));
+               $msg['seen'] = 0;
+               $msg['replied'] = 0;
+               $msg['uri'] = notags(unxmlify($base['id'][0]['data']));
+               $msg['parent-uri'] = notags(unxmlify($base['in-reply-to'][0]['data']));
+               $msg['created'] = datetime_convert(notags(unxmlify('UTC','UTC',$base['sentdate'][0]['data'])));
+               
+               dbesc_array($msg);
+
+               $r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg)) 
+                       . "`) VALUES ('" . implode("', '", array_values($msg)) . "')" );
+
+               // send email notification if requested.
+
+               $notif_params = array(
+                       'type' => NOTIFY_MAIL,
+                       'notify_flags' => $importer['notify_flags'],
+                       'language' => $importer['language'],
+                       'to_name' => $importer['username'],
+                       'to_email' => $importer['email'],
+                       'item' => $msg,
+                       'source_name' => $msg['from-name'],
+                       'source_link' => $importer['url'],
+                       'source_photo' => $importer['thumb'],
+               );
+                       
+               //notification($notif_params);
+
+               require_once('bbcode.php');
+               if($importer['notify-flags'] & NOTIFY_MAIL) {
+
+                       push_lang($importer['language']);
+
+                       // name of the automated email sender
+                       $msg['notificationfromname']    = t('Administrator');
+                       // noreply address to send from
+                       $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
+
+                       // text version
+                       // process the message body to display properly in text mode
+                       //              1) substitute a \n character for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
+                       //              2) remove escape slashes
+                       //              3) decode any bbcode from the message editor
+                       //              4) decode any encoded html tags
+                       //              5) remove html tags
+                       $msg['textversion']
+                               = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))),ENT_QUOTES,'UTF-8'));
+                               
+                       // html version
+                       // process the message body to display properly in text mode
+                       //              1) substitute a <br /> tag for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
+                       //              2) remove escape slashes
+                       //              3) decode any bbcode from the message editor
+                       //              4) decode any encoded html tags
+                       $msg['htmlversion']     
+                               = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
+
+                       // load the template for private message notifications
+                       $tpl = get_intltext_template('mail_received_html_body_eml.tpl');
+                       $email_html_body_tpl = replace_macros($tpl,array(
+                               '$username'     => $importer['username'],
+                               '$siteName'             => $a->config['sitename'],                      // name of this site
+                               '$siteurl'              => $a->get_baseurl(),                           // descriptive url of this site
+                               '$thumb'                => $importer['thumb'],                          // thumbnail url for sender icon
+                               '$email'                => $importer['email'],                          // email address to send to
+                               '$url'                  => $importer['url'],                            // full url for the site
+                               '$from'                 => $msg['from-name'],                           // name of the person sending the message
+                               '$title'                => stripslashes($msg['title']),                 // subject of the message
+                               '$htmlversion'  => $msg['htmlversion'],                                 // html version of the message
+                               '$mimeboundary' => $msg['mimeboundary'],                                // mime message divider
+                               '$hostname'             => $a->get_hostname()                           // name of this host
+                       ));
+                       
+                       // load the template for private message notifications
+                       $tpl = get_intltext_template('mail_received_text_body_eml.tpl');
+                       $email_text_body_tpl = replace_macros($tpl,array(
+                               '$username'     => $importer['username'],
+                               '$siteName'             => $a->config['sitename'],                      // name of this site
+                               '$siteurl'              => $a->get_baseurl(),                           // descriptive url of this site
+                               '$thumb'                => $importer['thumb'],                          // thumbnail url for sender icon
+                               '$email'                => $importer['email'],                          // email address to send to
+                               '$url'                  => $importer['url'],                            // full url for the site
+                               '$from'                 => $msg['from-name'],                           // name of the person sending the message
+                               '$title'                => stripslashes($msg['title']),                 // subject of the message
+                               '$textversion'  => $msg['textversion'],                                 // text version of the message
+                               '$mimeboundary' => $msg['mimeboundary'],                                // mime message divider
+                               '$hostname'             => $a->get_hostname()                           // name of this host
+                       ));
+
+                       // use the EmailNotification library to send the message
+                       require_once("include/EmailNotification.php");
+                       EmailNotification::sendTextHtmlEmail(
+                               $msg['notificationfromname'],
+                               $msg['notificationfromemail'],
+                               $msg['notificationfromemail'],
+                               $importer['email'],
+                               t('New mail received at ') . $a->config['sitename'],
+                               $email_html_body_tpl,
+                               $email_text_body_tpl
+                       );
+
+                       pop_lang();
+               }
+               return 0;
+               // NOTREACHED
+       }       
+       
+       logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
+
+       // process any deleted entries
+
+       $del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry');
+       if(is_array($del_entries) && count($del_entries)) {
+               foreach($del_entries as $dentry) {
+                       $deleted = false;
+                       if(isset($dentry['attribs']['']['ref'])) {
+                               $uri = $dentry['attribs']['']['ref'];
+                               $deleted = true;
+                               if(isset($dentry['attribs']['']['when'])) {
+                                       $when = $dentry['attribs']['']['when'];
+                                       $when = datetime_convert('UTC','UTC', $when, 'Y-m-d H:i:s');
+                               }
+                               else
+                                       $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+                       }
+                       if($deleted) {
+
+                               $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
+                                       WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
+                                       dbesc($uri),
+                                       intval($importer['importer_uid']),
+                                       intval($importer['id'])
+                               );
+
+                               if(count($r)) {
+                                       $item = $r[0];
+
+                                       if($item['deleted'])
+                                               continue;
+
+                                       logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
+
+                                       if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+                                               $xo = parse_xml_string($item['object'],false);
+                                               $xt = parse_xml_string($item['target'],false);
+                                               if($xt->type === ACTIVITY_OBJ_NOTE) {
+                                                       $i = q("select * from `item` where uri = '%s' and uid = %d limit 1",
+                                                               dbesc($xt->id),
+                                                               intval($importer['importer_uid'])
+                                                       );
+                                                       if(count($i)) {
+
+                                                               // For tags, the owner cannot remove the tag on the author's copy of the post.
+                                                               
+                                                               $owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
+                                                               $author_remove = (($item['origin'] && $item['self']) ? true : false);
+                                                               $author_copy = (($item['origin']) ? true : false); 
+
+                                                               if($owner_remove && $author_copy)
+                                                                       continue;
+                                                               if($author_remove || $owner_remove) {                                                           
+                                                                       $tags = explode(',',$i[0]['tag']);
+                                                                       $newtags = array();
+                                                                       if(count($tags)) {
+                                                                               foreach($tags as $tag)
+                                                                                       if(trim($tag) !== trim($xo->body))
+                                                                                               $newtags[] = trim($tag);
+                                                                       }
+                                                                       q("update item set tag = '%s' where id = %d limit 1",
+                                                                               dbesc(implode(',',$newtags)),
+                                                                               intval($i[0]['id'])
+                                                                       );
+                                                               }
+                                                       }
+                                               }
+                                       }
+
+                                       if($item['uri'] == $item['parent-uri']) {
+                                               $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s'
+                                                       WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                                       dbesc($when),
+                                                       dbesc(datetime_convert()),
+                                                       dbesc($item['uri']),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                       }
+                                       else {
+                                               $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' 
+                                                       WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($when),
+                                                       dbesc(datetime_convert()),
+                                                       dbesc($uri),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                               if($item['last-child']) {
+                                                       // ensure that last-child is set in case the comment that had it just got wiped.
+                                                       q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
+                                                               dbesc(datetime_convert()),
+                                                               dbesc($item['parent-uri']),
+                                                               intval($item['uid'])
+                                                       );
+                                                       // 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 `created` DESC LIMIT 1",
+                                                                       dbesc($item['parent-uri']),
+                                                                       intval($importer['importer_uid'])
+                                                       );
+                                                       if(count($r)) {
+                                                               q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+                                                                       intval($r[0]['id'])
+                                                               );
+                                                       }       
+                                               }
+                                       }       
+                               }
+                       }
+               }
+       }
+
+
+       foreach($feed->get_items() as $item) {
+
+               $is_reply = false;              
+               $item_id = $item->get_id();
+               $rawthread = $item->get_item_tags( NAMESPACE_THREAD, 'in-reply-to');
+               if(isset($rawthread[0]['attribs']['']['ref'])) {
+                       $is_reply = true;
+                       $parent_uri = $rawthread[0]['attribs']['']['ref'];
+               }
+
+               if($is_reply) {
+
+                       $community = false;
+
+                       if($importer['page-flags'] == PAGE_COMMUNITY) {
+                               $sql_extra = '';
+                               $community = true;
+                               logger('local_delivery: community reply');
+                       }
+                       else
+                               $sql_extra = " and contact.self = 1 and item.wall = 1 ";
+                       // was the top-level post for this reply written by somebody on this site? 
+                       // Specifically, the recipient? 
+
+                       $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, 
+                               `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
+                               LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
+                               WHERE `item`.`uri` = '%s' AND `item`.`parent-uri` = '%s'
+                               AND `item`.`uid` = %d 
+                               $sql_extra
+                               LIMIT 1",
+                               dbesc($parent_uri),
+                               dbesc($parent_uri),
+                               intval($importer['importer_uid'])
+                       );
+
+                       if($r && count($r)) {   
+
+                               logger('local_delivery: received remote comment');
+                               $is_like = false;
+                               // remote reply to our post. Import and then notify everybody else.
+                               $datarray = get_atom_elements($feed,$item);
+
+
+               // TODO: make this next part work against both delivery threads of a community post
+
+//                             if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
+//                                     logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
+                                       // they won't know what to do so don't report an error. Just quietly die.
+//                                     return 0;
+//                             }                                       
+
+                               $datarray['type'] = 'remote-comment';
+                               $datarray['wall'] = 1;
+                               $datarray['parent-uri'] = $parent_uri;
+                               $datarray['uid'] = $importer['importer_uid'];
+                               $datarray['owner-name'] = $r[0]['name'];
+                               $datarray['owner-link'] = $r[0]['url'];
+                               $datarray['owner-avatar'] = $r[0]['thumb'];
+                               $datarray['contact-id'] = $importer['id'];
+                               if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) {
+                                       $is_like = true;
+                                       $datarray['type'] = 'activity';
+                                       $datarray['gravity'] = GRAVITY_LIKE;
+                                       $datarray['last-child'] = 0;
+                               }
+
+                               if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+
+
+                                       $xo = parse_xml_string($datarray['object'],false);
+                                       $xt = parse_xml_string($datarray['target'],false);
+
+                                       if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id == $r[0]['uri'])) {
+
+                                               // extract tag, if not duplicate, and this user allows tags, add to parent item                                         
+
+                                               if($xo->id && $xo->content) {
+                                                       $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+
+                                                       if(! (stristr($r[0]['tag'],$newtag))) {
+                                                               $i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
+                                                                       intval($importer['importer_uid'])
+                                                               );
+                                                               if(count($i) && ! ($i[0]['blocktags'])) {
+                                                                       q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+                                                                               dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
+                                                                               intval($r[0]['id'])
+                                                                       );
+                                                               }
+                                                       }
+                                               }                                                                                                       
+                                       }
+                               }
+
+//                             if($community) {
+//                                     $newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]';
+//                                     if(! stristr($datarray['tag'],$newtag)) {
+//                                             if(strlen($datarray['tag']))
+//                                                     $datarray['tag'] .= ',';
+//                                             $datarray['tag'] .= $newtag;
+//                                     }
+//                             }
+
+
+                               $posted_id = item_store($datarray);
+                               $parent = 0;
+
+                               if($posted_id) {
+                                       $r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                               intval($posted_id),
+                                               intval($importer['importer_uid'])
+                                       );
+                                       if(count($r))
+                                               $parent = $r[0]['parent'];
+                       
+                                       if(! $is_like) {
+                                               $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
+                                                       dbesc(datetime_convert()),
+                                                       intval($importer['importer_uid']),
+                                                       intval($r[0]['parent'])
+                                               );
+
+                                               $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+                                                       dbesc(datetime_convert()),
+                                                       intval($importer['importer_uid']),
+                                                       intval($posted_id)
+                                               );
+                                       }
+
+                                       if($posted_id && $parent) {
+                               
+                                               proc_run('php',"include/notifier.php","comment-import","$posted_id");
+                                       
+                                               if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
+                                                       push_lang($importer['language']);
+                                                       require_once('bbcode.php');
+                                                       $from = stripslashes($datarray['author-name']);
+
+                                                       // name of the automated email sender
+                                                       $msg['notificationfromname']    = stripslashes($datarray['author-name']);;
+                                                       // noreply address to send from
+                                                       $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
+
+                                                       // text version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['textversion']
+                                                               = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
+                               
+                                                       // html version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['htmlversion']     
+                                                               = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
+
+                                                       $imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']);
+
+                                                       // load the template for private message notifications
+                                                       $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
+                                                       $email_html_body_tpl = replace_macros($tpl,array(
+                                                               '$username'     => $importer['username'],
+                                                               '$sitename'             => $a->config['sitename'],                      // name of this site
+                                                               '$siteurl'              => $a->get_baseurl(),                           // descriptive url of this site
+                                                               '$thumb'                => $imgtouse,                                           // thumbnail url for sender icon
+                                                               '$email'                => $importer['email'],                          // email address to send to
+                                                               '$url'                  => $datarray['author-link'],            // full url for the site
+                                                               '$from'                 => $from,                                                       // name of the person sending the message
+                                                               '$body'                 => $msg['htmlversion'],                         // html version of the message
+                                                               '$display'              => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+                                                       ));
+                       
+                                                       // load the template for private message notifications
+                                                       $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
+                                                       $email_text_body_tpl = replace_macros($tpl,array(
+                                                               '$username'     => $importer['username'],
+                                                               '$sitename'             => $a->config['sitename'],                      // name of this site
+                                                               '$siteurl'              => $a->get_baseurl(),                           // descriptive url of this site
+                                                               '$thumb'                => $imgtouse,                                           // thumbnail url for sender icon
+                                                               '$email'                => $importer['email'],                          // email address to send to
+                                                               '$url'                  => $datarray['author-link'],            // full url for the site
+                                                               '$from'                 => $from,                                                       // name of the person sending the message
+                                                               '$body'                 => $msg['textversion'],                         // text version of the message
+                                                               '$display'              => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+                                                       ));
+
+                                                       // use the EmailNotification library to send the message
+                                                       require_once("include/EmailNotification.php");
+                                                       EmailNotification::sendTextHtmlEmail(
+                                                               $msg['notificationfromname'],
+                                                               t("Administrator") . '@' . $a->get_hostname(),
+                                                               t("noreply") . '@' . $a->get_hostname(),
+                                                               $importer['email'],
+                                                               sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
+                                                               $email_html_body_tpl,
+                                                               $email_text_body_tpl
+                                                       );
+                                                       pop_lang();
+                                               }
+                                       }
+                                       return 0;
+                                       // NOTREACHED
+                               }
+                       }
+                       else {
+
+                               // regular comment that is part of this total conversation. Have we seen it? If not, import it.
+
+                               $item_id  = $item->get_id();
+                               $datarray = get_atom_elements($feed,$item);
+
+                               $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                       dbesc($item_id),
+                                       intval($importer['importer_uid'])
+                               );
+
+                               // Update content if 'updated' changes
+
+                               if(count($r)) {
+                                       if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                                               $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                       dbesc($datarray['body']),
+                                                       dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+                                                       dbesc($item_id),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                       }
+
+                                       // update last-child if it changes
+
+                                       $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
+                                       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),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                               $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                       intval($allow[0]['data']),
+                                                       dbesc(datetime_convert()),
+                                                       dbesc($item_id),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                       }
+                                       continue;
+                               }
+
+                               $datarray['parent-uri'] = $parent_uri;
+                               $datarray['uid'] = $importer['importer_uid'];
+                               $datarray['contact-id'] = $importer['id'];
+                               if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
+                                       $datarray['type'] = 'activity';
+                                       $datarray['gravity'] = GRAVITY_LIKE;
+                               }
+
+                               if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
+
+                                       $xo = parse_xml_string($datarray['object'],false);
+                                       $xt = parse_xml_string($datarray['target'],false);
+
+                                       if($xt->type == ACTIVITY_OBJ_NOTE) {
+                                               $r = q("select * from item where `uri` = '%s' AND `uid` = %d limit 1",
+                                                       dbesc($xt->id),
+                                                       intval($importer['importer_uid'])
+                                               );
+                                               if(! count($r))
+                                                       continue;                               
+
+                                               // extract tag, if not duplicate, add to parent item                                            
+                                               if($xo->content) {
+                                                       if(! (stristr($r[0]['tag'],trim($xo->content)))) {
+                                                               q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
+                                                                       dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
+                                                                       intval($r[0]['id'])
+                                                               );
+                                                       }
+                                               }                                                                                                       
+                                       }
+                               }
+
+                               $posted_id = item_store($datarray);
+
+                               // find out if our user is involved in this conversation and wants to be notified.
+                       
+                               if(($datarray['type'] != 'activity') && ($importer['notify-flags'] & NOTIFY_COMMENT)) {
+
+                                       $myconv = q("SELECT `author-link`, `author-avatar` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+                                               dbesc($parent_uri),
+                                               intval($importer['importer_uid'])
+                                       );
+                                       if(count($myconv)) {
+                                               $importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
+                                               foreach($myconv as $conv) {
+                                                       if(! link_compare($conv['author-link'],$importer_url))
+                                                               continue;
+
+                                                       push_lang($importer['language']);
+                                                       require_once('bbcode.php');
+                                                       $from = stripslashes($datarray['author-name']);
+                                                       
+                                                       // name of the automated email sender
+                                                       $msg['notificationfromname']    = stripslashes($datarray['author-name']);;
+                                                       // noreply address to send from
+                                                       $msg['notificationfromemail']   = t('noreply') . '@' . $a->get_hostname();                              
+
+                                                       // text version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['textversion']
+                                                               = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8');
+                               
+                                                       // html version
+                                                       // process the message body to display properly in text mode
+                                                       $msg['htmlversion']     
+                                                               = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
+
+                                                       $imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']);
+
+
+                                                       // load the template for private message notifications
+                                                       $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
+                                                       $email_html_body_tpl = replace_macros($tpl,array(
+                                                               '$username'     => $importer['username'],
+                                                               '$sitename'             => $a->config['sitename'],                              // name of this site
+                                                               '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
+                                                               '$thumb'                => $imgtouse,                                                   // thumbnail url for sender icon
+                                                               '$url'                  => $datarray['author-link'],                    // full url for the site
+                                                               '$from'                 => $from,                                                               // name of the person sending the message
+                                                               '$body'                 => $msg['htmlversion'],                                 // html version of the message
+                                                               '$display'              => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+                                                       ));
+                       
+                                                       // load the template for private message notifications
+                                                       $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
+                                                       $email_text_body_tpl = replace_macros($tpl,array(
+                                                               '$username'     => $importer['username'],
+                                                               '$sitename'             => $a->config['sitename'],                              // name of this site
+                                                               '$siteurl'              => $a->get_baseurl(),                                   // descriptive url of this site
+                                                               '$thumb'                => $imgtouse,                                                   // thumbnail url for sender icon
+                                                               '$url'                  => $datarray['author-link'],                    // full url for the site
+                                                               '$from'                 => $from,                                                               // name of the person sending the message
+                                                               '$body'                 => $msg['textversion'],                                 // text version of the message
+                                                               '$display'              => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
+                                                       ));
+
+                                                       // use the EmailNotification library to send the message
+                                                       require_once("include/EmailNotification.php");
+                                                       EmailNotification::sendTextHtmlEmail(
+                                                               $msg['notificationfromname'],
+                                                               t("Administrator@") . $a->get_hostname(),
+                                                               t("noreply") . '@' . $a->get_hostname(),
+                                                               $importer['email'],
+                                                               sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
+                                                               $email_html_body_tpl,
+                                                               $email_text_body_tpl
+                                                       );
+                                                       pop_lang();
+                                                       break;
+                                               }
+                                       }
+                               }
+                               continue;
+                       }
+               }
+
+               else {
+
+                       // Head post of a conversation. Have we seen it? If not, import it.
+
+
+                       $item_id  = $item->get_id();
+                       $datarray = get_atom_elements($feed,$item);
+
+                       if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
+                               $ev = bbtoevent($datarray['body']);
+                               if(x($ev,'desc') && x($ev,'start')) {
+                                       $ev['cid'] = $importer['id'];
+                                       $ev['uid'] = $importer['uid'];
+                                       $ev['uri'] = $item_id;
+                                       $ev['edited'] = $datarray['edited'];
+                                       $ev['private'] = $datarray['private'];
+
+                                       $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               dbesc($item_id),
+                                               intval($importer['uid'])
+                                       );
+                                       if(count($r))
+                                               $ev['id'] = $r[0]['id'];
+                                       $xyz = event_store($ev);
+                                       continue;
+                               }
+                       }
+
+                       $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                               dbesc($item_id),
+                               intval($importer['importer_uid'])
+                       );
+
+                       // Update content if 'updated' changes
+
+                       if(count($r)) {
+                               if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {  
+                                       $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               dbesc($datarray['body']),
+                                               dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
+                                               dbesc($item_id),
+                                               intval($importer['importer_uid'])
+                                       );
+                               }
+
+                               // update last-child if it changes
+
+                               $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
+                               if($allow && $allow[0]['data'] != $r[0]['last-child']) {
+                                       $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                               intval($allow[0]['data']),
+                                               dbesc(datetime_convert()),
+                                               dbesc($item_id),
+                                               intval($importer['importer_uid'])
+                                       );
+                               }
+                               continue;
+                       }
+
+                       // This is my contact on another system, but it's really me.
+                       // Turn this into a wall post.
+
+                       if($contact['remote_self'])
+                               $datarray['wall'] = 1;
+
+                       $datarray['parent-uri'] = $item_id;
+                       $datarray['uid'] = $importer['importer_uid'];
+                       $datarray['contact-id'] = $importer['id'];
+                       $r = item_store($datarray);
+                       continue;
+               }
+       }
+
+       return 0;
+       // NOTREACHED
+
+}
+
+
+function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
        $url = notags(trim($datarray['author-link']));
        $name = notags(trim($datarray['author-name']));
        $photo = notags(trim($datarray['author-avatar']));
@@ -1457,36 +2482,36 @@ function new_follower($importer,$contact,$datarray,$item) {
                $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
 
        if(is_array($contact)) {
-               if($contact['network'] == 'stat' && $contact['rel'] == CONTACT_IS_SHARING) {
+               if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
+                       || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
                        $r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval(CONTACT_IS_FRIEND),
                                intval($contact['id']),
                                intval($importer['uid'])
                        );
                }
-
                // send email notification to owner?
        }
        else {
        
                // create contact record
 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`, 
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, 
                        `blocked`, `readonly`, `pending`, `writable` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1 ) ",
                        intval($importer['uid']),
                        dbesc(datetime_convert()),
                        dbesc($url),
+                       dbesc(normalise_link($url)),
                        dbesc($name),
                        dbesc($nick),
                        dbesc($photo),
-                       dbesc('stat'),
-                       intval(CONTACT_IS_FOLLOWER)
+                       dbesc(($sharing) ? NETWORK_ZOT : NETWORK_OSTATUS),
+                       intval(($sharing) ? CONTACT_IS_SHARING : CONTACT_IS_FOLLOWER)
                );
-               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 AND `rel` = %d LIMIT 1",
+               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
                                intval($importer['uid']),
-                               dbesc($url),
-                               intval(CONTACT_IS_FOLLOWER)
+                               dbesc($url)
                );
                if(count($r))
                                $contact_record = $r[0];
@@ -1518,7 +2543,7 @@ function new_follower($importer,$contact,$datarray,$item) {
                                        '$sitename' => $a->config['sitename']
                                ));
                                $res = mail($r[0]['email'], 
-                                       t("You have a new follower at ") . $a->config['sitename'],
+                                       (($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],
                                        $email,
                                        'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
                                        . 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -1542,15 +2567,33 @@ function lose_follower($importer,$contact,$datarray,$item) {
        }
 }
 
+function lose_sharer($importer,$contact,$datarray,$item) {
+
+       if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
+               q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
+                       intval(CONTACT_IS_FOLLOWER),
+                       intval($contact['id'])
+               );
+       }
+       else {
+               contact_remove($contact['id']);
+       }
+}
+
 
-function subscribe_to_hub($url,$importer,$contact) {
+function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
 
        if(is_array($importer)) {
                $r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($importer['uid'])
                );
        }
-       if(! count($r))
+
+       // Diaspora has different message-ids in feeds than they do 
+       // through the direct Diaspora protocol. If we try and use
+       // the feed, we'll get duplicates. So don't.
+
+       if((! count($r)) || $contact['network'] === NETWORK_DIASPORA)
                return;
 
        $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
@@ -1559,9 +2602,9 @@ function subscribe_to_hub($url,$importer,$contact) {
 
        $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;
+       $params= 'hub.mode=' . $hubmode . '&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);
+       logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: '  . $push_url . ' with verifier ' . $verify_token);
 
        if(! strlen($contact['hub-verify'])) {
                $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d LIMIT 1",
@@ -1603,6 +2646,9 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 
        $a = get_app();
 
+       if(! $item['parent'])
+               return;
+
        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";
 
@@ -1622,15 +2668,15 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
        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";
+       if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']))
+               $o .= '<thr:in-reply-to ref="' . xmlify($item['parent-uri']) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['parent']) . '" />' . "\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 .= '<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>' . "\r\n";
-       $o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($body) : $body) . '</content>' . "\r\n";
+       $o .= '<content type="' . $type . '" >' . xmlify((($type === 'html') ? bbcode($body) : $body)) . '</content>' . "\r\n";
        $o .= '<link rel="alternate" type="text/html" 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";
@@ -1647,10 +2693,21 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
                $o .= '<dfrn:private>1</dfrn:private>' . "\r\n";
 
        if($item['extid'])
-               $o .= '<dfrn:extid>' . $item['extid'] . '</dfrn:extid>' . "\r\n";
+               $o .= '<dfrn:extid>' . xmlify($item['extid']) . '</dfrn:extid>' . "\r\n";
+       if($item['bookmark'])
+               $o .= '<dfrn:bookmark>true</dfrn:bookmark>' . "\r\n";
 
        if($item['app'])
-               $o .= '<statusnet:notice_info local_id="' . $item['id'] . '" source="' . $item['app'] . '" ></statusnet:notice_info>';
+               $o .= '<statusnet:notice_info local_id="' . $item['id'] . '" source="' . xmlify($item['app']) . '" ></statusnet:notice_info>' . "\r\n";
+
+       if($item['guid'])
+               $o .= '<dfrn:diaspora_guid>' . $item['guid'] . '</dfrn:diaspora_guid>' . "\r\n";
+
+       if($item['signed_text']) {
+               $sign = base64_encode(json_encode(array('signed_text' => $item['signed_text'],'signature' => $item['signature'],'signer' => $item['signer'])));
+               $o .= '<dfrn:diaspora_signature>' . xmlify($sign) . '</dfrn:diaspora_signature>' . "\r\n";
+       }
+
        $verb = construct_verb($item);
        $o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
        $actobj = construct_activity_object($item);
@@ -1717,7 +2774,7 @@ function item_getfeedtags($item) {
        $matches = false;
        $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
        if($cnt) {
-               for($x = 0; $x < count($matches); $x ++) {
+               for($x = 0; $x < $cnt; $x ++) {
                        if($matches[1][$x])
                                $ret[] = array('#',$matches[1][$x], $matches[2][$x]);
                }
@@ -1725,9 +2782,9 @@ function item_getfeedtags($item) {
        $matches = false; 
        $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
        if($cnt) {
-               for($x = 0; $x < count($matches); $x ++) {
+               for($x = 0; $x < $cnt; $x ++) {
                        if($matches[1][$x])
-                               $ret[] = array('#',$matches[1][$x], $matches[2][$x]);
+                               $ret[] = array('@',$matches[1][$x], $matches[2][$x]);
                }
        } 
        return $ret;
@@ -1771,14 +2828,32 @@ function item_expire($uid,$days) {
 
        if(! count($r))
                return;
+
+       $expire_items = get_pconfig($uid, 'expire','items');
+       $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
+       
+       $expire_notes = get_pconfig($uid, 'expire','notes');
+       $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
+
+       $expire_starred = get_pconfig($uid, 'expire','starred');
+       $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
+       
+       $expire_photos = get_pconfig($uid, 'expire','photos');
+       $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
  
-       logger('expire: # items=' . count($r) );
+       logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 
        foreach($r as $item) {
 
                // Only expire posts, not photos and photo comments
 
-               if(strlen($item['resource-id']))
+               if($expire_photos==0 && strlen($item['resource-id']))
+                       continue;
+               if($expire_starred==0 && intval($item['starred']))
+                       continue;
+               if($expire_notes==0 && $item['type']=='note')
+                       continue;
+               if($expire_items==0 && $item['type']!='note')
                        continue;
 
                $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
@@ -1799,7 +2874,7 @@ function item_expire($uid,$days) {
        }
 
        proc_run('php',"include/notifier.php","expire","$uid");
-
+       
 }
 
 
@@ -1927,4 +3002,4 @@ function drop_item($id,$interactive = true) {
                //NOTREACHED
        }
        
-}
\ No newline at end of file
+}