]> git.mxchange.org Git - friendica.git/blobdiff - include/ostatus.php
Issue 2122: Make sure to always return the correct number of entries
[friendica.git] / include / ostatus.php
index f6056170f27eb8db22fd0b6a93520f5c1b4b5700..932fc1fa9a7ea142fe06518c14e50fab657e16e9 100644 (file)
@@ -7,11 +7,74 @@ require_once("mod/share.php");
 require_once("include/enotify.php");
 require_once("include/socgraph.php");
 require_once("include/Photo.php");
+require_once("include/Scrape.php");
+require_once("include/follow.php");
+require_once("mod/proxy.php");
 
 define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
+define('OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS', 14400); // given in minutes
 
-function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
+define("NS_ATOM", "http://www.w3.org/2005/Atom");
+define("NS_THR", "http://purl.org/syndication/thread/1.0");
+define("NS_GEORSS", "http://www.georss.org/georss");
+define("NS_ACTIVITY", "http://activitystrea.ms/spec/1.0/");
+define("NS_MEDIA", "http://purl.org/syndication/atommedia");
+define("NS_POCO", "http://portablecontacts.net/spec/1.0");
+define("NS_OSTATUS", "http://ostatus.org/schema/1.0");
+define("NS_STATUSNET", "http://status.net/schema/api/1/");
+
+function ostatus_check_follow_friends() {
+       $r = q("SELECT `uid`,`v` FROM `pconfig` WHERE `cat`='system' AND `k`='ostatus_legacy_contact' AND `v` != ''");
+
+       if (!$r)
+               return;
+
+       foreach ($r AS $contact) {
+               ostatus_follow_friends($contact["uid"], $contact["v"]);
+               set_pconfig($contact["uid"], "system", "ostatus_legacy_contact", "");
+       }
+}
+
+// This function doesn't work reliable by now.
+function ostatus_follow_friends($uid, $url) {
+       $contact = probe_url($url);
+
+       if (!$contact)
+               return;
+
+       $api = $contact["baseurl"]."/api/";
+
+       // Fetching friends
+       $data = z_fetch_url($api."statuses/friends.json?screen_name=".$contact["nick"]);
+
+       if (!$data["success"])
+               return;
+
+       $friends = json_decode($data["body"]);
+
+       foreach ($friends AS $friend) {
+               $url = $friend->statusnet_profile_url;
+               $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND
+                       (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
+                       `network` != '%s' LIMIT 1",
+                       intval($uid), dbesc(normalise_link($url)),
+                       dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
+               if (!$r) {
+                       $data = probe_url($friend->statusnet_profile_url);
+                       if ($data["network"] == NETWORK_OSTATUS) {
+                               $result = new_contact($uid,$friend->statusnet_profile_url);
+                               if ($result["success"])
+                                       logger($friend->name." ".$url." - success", LOGGER_DEBUG);
+                               else
+                                       logger($friend->name." ".$url." - failed", LOGGER_DEBUG);
+                       } else
+                               logger($friend->name." ".$url." - not OStatus", LOGGER_DEBUG);
+               }
+       }
+}
+
+function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch) {
 
        $author = array();
        $author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
@@ -62,7 +125,7 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
        $author["owner-link"] = $author["author-link"];
        $author["owner-avatar"] = $author["author-avatar"];
 
-       if ($r) {
+       if ($r AND !$onlyfetch) {
                // Update contact data
                $update_contact = ($r[0]['name-date'] < datetime_convert('','','now -12 hours'));
                if ($update_contact) {
@@ -84,9 +147,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
                        if ($value != "")
                                $contact["location"] = $value;
 
-                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `name-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
 
                        poco_check($contact["url"], $contact["name"], $contact["network"], $author["author-avatar"], $contact["about"], $contact["location"],
                                        "", "", "", datetime_convert(), 2, $contact["id"], $contact["uid"]);
@@ -99,15 +162,43 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact) {
 
                        $photos = import_profile_photo($author["author-avatar"], $importer["uid"], $contact["id"]);
 
-                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
+                       q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
                                dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
-                               dbesc(datetime_convert()), intval($contact["id"]));
+                               dbesc(datetime_convert()), intval($contact["id"]), dbesc(NETWORK_OSTATUS));
                }
        }
 
        return($author);
 }
 
+function ostatus_salmon_author($xml, $importer) {
+       $a = get_app();
+
+       if ($xml == "")
+               return;
+
+       $doc = new DOMDocument();
+       @$doc->loadXML($xml);
+
+       $xpath = new DomXPath($doc);
+       $xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
+       $xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0");
+       $xpath->registerNamespace('georss', "http://www.georss.org/georss");
+       $xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
+       $xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
+       $xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
+       $xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
+       $xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
+
+       $entries = $xpath->query('/atom:entry');
+
+       foreach ($entries AS $entry) {
+               // fetch the author
+               $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact, true);
+               return $author;
+       }
+}
+
 function ostatus_import($xml,$importer,&$contact, &$hub) {
 
        $a = get_app();
@@ -172,9 +263,15 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 
                // fetch the author
                if ($first_child == "feed")
-                       $author = ostatus_fetchauthor($xpath, $doc->firstChild, $importer, $contact);
+                       $author = ostatus_fetchauthor($xpath, $doc->firstChild, $importer, $contact, false);
                else
-                       $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact);
+                       $author = ostatus_fetchauthor($xpath, $entry, $importer, $contact, false);
+
+               $value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
+               if ($value != "")
+                       $nickname = $value;
+               else
+                       $nickname = $author["author-name"];
 
                $item = array_merge($header, $author);
 
@@ -190,24 +287,59 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 
                $item["body"] = add_page_info_to_body(html2bbcode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue));
                $item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
+
+               if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+                       $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
+                       $item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
+               } elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION)
+                       $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
+
                $item["object"] = $xml;
                $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
 
+               // To-Do:
+               // Delete a message
+               if ($item["verb"] == "qvitter-delete-notice") {
+                       // ignore "Delete" messages (by now)
+                       logger("Ignore delete message ".print_r($item, true));
+                       continue;
+               }
+
                if ($item["verb"] == ACTIVITY_JOIN) {
                        // ignore "Join" messages
+                       logger("Ignore join message ".print_r($item, true));
                        continue;
                }
 
                if ($item["verb"] == ACTIVITY_FOLLOW) {
-                       // ignore "Follow" messages
+                       new_follower($importer, $contact, $item, $nickname);
+                       continue;
+               }
+
+               if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
+                       lose_follower($importer, $contact, $item, $dummy);
                        continue;
                }
 
                if ($item["verb"] == ACTIVITY_FAVORITE) {
-                       // ignore "Favorite" messages
+                       $orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
+                       logger("Favorite ".$orig_uri." ".print_r($item, true));
+
+                       $item["verb"] = ACTIVITY_LIKE;
+                       $item["parent-uri"] = $orig_uri;
+                       $item["gravity"] = GRAVITY_LIKE;
+               }
+
+               if ($item["verb"] == NAMESPACE_OSTATUS."/unfavorite") {
+                       // Ignore "Unfavorite" message
+                       logger("Ignore unfavorite message ".print_r($item, true));
                        continue;
                }
 
+               // http://activitystrea.ms/schema/1.0/rsvp-yes
+               if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE)))
+                       logger("Unhandled verb ".$item["verb"]." ".print_r($item, true));
+
                $item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
                $item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
                $conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
@@ -271,6 +403,9 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
                                        switch($rel) {
                                                case "alternate":
                                                        $item["plink"] = $href;
+                                                       if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
+                                                               ($item["object-type"] == ACTIVITY_OBJ_EVENT))
+                                                               $item["body"] .= add_page_info($href);
                                                        break;
                                                case "ostatus:conversation":
                                                        $conversation = $href;
@@ -283,11 +418,14 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
                                                        $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
                                                        break;
                                                case "related":
-                                                       if (!isset($item["parent-uri"]))
-                                                               $item["parent-uri"] = $href;
-
-                                                       if ($related == "")
-                                                               $related = $href;
+                                                       if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
+                                                               if (!isset($item["parent-uri"]))
+                                                                       $item["parent-uri"] = $href;
+
+                                                               if ($related == "")
+                                                                       $related = $href;
+                                                       } else
+                                                               $item["body"] .= add_page_info($href);
                                                        break;
                                                case "self":
                                                        $self = $href;
@@ -322,29 +460,33 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 
                        if (is_object($activityobjects)) {
 
-                               $orig_uris = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects);
-                               if ($orig_uris)
-                                       foreach($orig_uris->item(0)->attributes AS $attributes)
+                               $orig_uri = $xpath->query("activity:object/atom:id", $activityobjects)->item(0)->nodeValue;
+                               if (!isset($orig_uri))
+                                       $orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
+
+                               $orig_links = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects);
+                               if ($orig_links AND ($orig_links->length > 0))
+                                       foreach($orig_links->item(0)->attributes AS $attributes)
                                                if ($attributes->name == "href")
-                                                       $orig_uri = $attributes->textContent;
+                                                       $orig_link = $attributes->textContent;
 
-                               if (!isset($orig_uri))
-                                       $orig_uri = $xpath->query("atom:link[@rel='alternate']", $activityobjects)->item(0)->nodeValue;
+                               if (!isset($orig_link))
+                                       $orig_link = $xpath->query("atom:link[@rel='alternate']", $activityobjects)->item(0)->nodeValue;
 
-                               if (!isset($orig_uri))
-                                       $orig_uri = $xpath->query("activity:object/atom:id", $activityobjects)->item(0)->nodeValue;
+                               if (!isset($orig_link))
+                                       $orig_link =  ostatus_convert_href($orig_uri);
 
-                               if (!isset($orig_uri))
-                                       $orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
+                               $orig_body = $xpath->query('activity:object/atom:content/text()', $activityobjects)->item(0)->nodeValue;
+                               if (!isset($orig_body))
+                                       $orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
 
-                               $orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
                                $orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
 
                                $orig_contact = $contact;
-                               $orig_author = ostatus_fetchauthor($xpath, $activityobjects, $importer, $orig_contact);
+                               $orig_author = ostatus_fetchauthor($xpath, $activityobjects, $importer, $orig_contact, false);
 
                                //if (!intval(get_config('system','wall-to-wall_share'))) {
-                               //      $prefix = share_header($orig_author['author-name'], $orig_author['author-link'], $orig_author['author-avatar'], "", $orig_created, $orig_uri);
+                               //      $prefix = share_header($orig_author['author-name'], $orig_author['author-link'], $orig_author['author-avatar'], "", $orig_created, $orig_link);
                                //      $item["body"] = $prefix.add_page_info_to_body(html2bbcode($orig_body))."[/share]";
                                //} else {
                                        $item["author-name"] = $orig_author["author-name"];
@@ -354,10 +496,14 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
                                        $item["created"] = $orig_created;
 
                                        $item["uri"] = $orig_uri;
+                                       $item["plink"] = $orig_link;
                                //}
 
                                $item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
-                               $item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
+
+                               $item["object-type"] = $xpath->query('activity:object/activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
+                               if (!isset($item["object-type"]))
+                                       $item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
                        }
                }
 
@@ -392,31 +538,17 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
 
                $item_id = ostatus_completion($conversation, $importer["uid"], $item);
 
-               if ($item_id <= 0) {
-                       $reason = $item_id;
-                       $item["app"] .= $item_id;
-                       $item_id = item_store($item, true);
-                       if ($item_id) {
-                               logger("Shouldn't happen. Code ".$reason." - uri ".$item["uri"], LOGGER_DEBUG);
-                               ostatus_store_conversation($item_id, $conversation_url);
-                       }
-               }
-               //echo $xml;
-               //print_r($item);
-
                if (!$item_id) {
-                       logger("Error storing item ".print_r($item, true), LOGGER_DEBUG);
+                       logger("Error storing item", LOGGER_DEBUG);
                        continue;
                }
 
                logger("Item was stored with id ".$item_id, LOGGER_DEBUG);
                $item["id"] = $item_id;
 
-               if (!isset($item["parent"]) OR ($item["parent"] == 0))
-                       $item["parent"] = $item_id;
-
                if ($mention) {
                        $u = q("SELECT `notify-flags`, `language`, `username`, `email` FROM user WHERE uid = %d LIMIT 1", intval($item['uid']));
+                       $r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($item_id));
 
                        notification(array(
                                'type'         => NOTIFY_TAGSELF,
@@ -426,13 +558,13 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
                                'to_email'     => $u[0]["email"],
                                'uid'          => $item["uid"],
                                'item'         => $item,
-                               'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item["id"])),
+                               'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item_id)),
                                'source_name'  => $item["author-name"],
                                'source_link'  => $item["author-link"],
                                'source_photo' => $item["author-avatar"],
                                'verb'         => ACTIVITY_TAG,
                                'otype'        => 'item',
-                               'parent'       => $item["parent"]
+                               'parent'       => $r[0]["parent"]
                        ));
                }
        }
@@ -461,7 +593,7 @@ function ostatus_convert_href($href) {
        return $href;
 }
 
-function check_conversations($override = false) {
+function check_conversations($mentions = false, $override = false) {
        $last = get_config('system','ostatus_last_poll');
 
        $poll_interval = intval(get_config('system','ostatus_poll_interval'));
@@ -472,9 +604,16 @@ function check_conversations($override = false) {
        if (($poll_interval < 0) AND !$override)
                return;
 
-       $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
-       if (!$poll_timeframe)
-               $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
+       if (!$mentions) {
+               $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
+               if (!$poll_timeframe)
+                       $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
+       } else {
+               $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
+               if (!$poll_timeframe)
+                       $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME_MENTIONS;
+       }
+
 
        if ($last AND !$override) {
                $next = $last + ($poll_interval * 60);
@@ -487,8 +626,16 @@ function check_conversations($override = false) {
        logger('cron_start');
 
        $start = date("Y-m-d H:i:s", time() - ($poll_timeframe * 60));
-       $conversations = q("SELECT `oid`, `url`, `uid` FROM `term` WHERE `type` = 7 AND `term` > '%s' GROUP BY `url`, `uid` ORDER BY `term` DESC",
-                               dbesc($start));
+
+       if ($mentions)
+               $conversations = q("SELECT `term`.`oid`, `term`.`url`, `term`.`uid` FROM `term`
+                                       STRAIGHT_JOIN `thread` ON `thread`.`iid` = `term`.`oid` AND `thread`.`uid` = `term`.`uid`
+                                       WHERE `term`.`type` = 7 AND `term`.`term` > '%s' AND `thread`.`mention`
+                                       GROUP BY `term`.`url`, `term`.`uid` ORDER BY `term`.`term` DESC", dbesc($start));
+       else
+               $conversations = q("SELECT `oid`, `url`, `uid` FROM `term`
+                                       WHERE `type` = 7 AND `term` > '%s'
+                                       GROUP BY `url`, `uid` ORDER BY `term` DESC", dbesc($start));
 
        foreach ($conversations AS $conversation) {
                ostatus_completion($conversation['url'], $conversation['uid']);
@@ -501,12 +648,15 @@ function check_conversations($override = false) {
 
 function ostatus_completion($conversation_url, $uid, $item = array()) {
 
-       $item_stored = -3;
+       $a = get_app();
+
+       $item_stored = -1;
 
        $conversation_url = ostatus_convert_href($conversation_url);
 
        // If the thread shouldn't be completed then store the item and go away
        if ((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) {
+               //$arr["app"] .= " (OStatus-NoCompletion)";
                $item_stored = item_store($item, true);
                return($item_stored);
        }
@@ -528,7 +678,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                // Preset the parent
                $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid`=%d", $uid);
                if (!$r)
-                       return(-1);
+                       return(-2);
 
                $parent = array();
                $parent["id"] = 0;
@@ -562,9 +712,13 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                $conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
                $conv_as = json_decode($conv_as);
 
+               $no_of_items = sizeof($items);
+
                if (@is_array($conv_as->items))
-                       $items = array_merge($items, $conv_as->items);
-               else
+                       foreach ($conv_as->items AS $single_item)
+                               $items[$single_item->id] = $single_item;
+
+               if ($no_of_items == sizeof($items))
                        break;
 
                $pageno++;
@@ -575,25 +729,31 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
 
        if (!sizeof($items)) {
                if (count($item) > 0) {
+                       //$arr["app"] .= " (OStatus-NoConvFetched)";
                        $item_stored = item_store($item, true);
-                       logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG);
 
-                       if ($item_stored)
+                       if ($item_stored) {
+                               logger("Conversation ".$conversation_url." couldn't be fetched. Item uri ".$item["uri"]." stored: ".$item_stored, LOGGER_DEBUG);
                                ostatus_store_conversation($item_id, $conversation_url);
+                       }
 
                        return($item_stored);
                } else
-                       return(-2);
+                       return(-3);
        }
 
        $items = array_reverse($items);
 
+       $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
+       $importer = $r[0];
+
        foreach ($items as $single_conv) {
 
                // Test - remove before flight
                //$tempfile = tempnam(get_temppath(), "conversation");
                //file_put_contents($tempfile, json_encode($single_conv));
 
+               $mention = false;
 
                if (isset($single_conv->object->id))
                        $single_conv->id = $single_conv->object->id;
@@ -644,17 +804,23 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                        }
                }
 
+               $parent_uri = $parent["uri"];
+
+               // "context" only seems to exist on older servers
                if (isset($single_conv->context->inReplyTo->id)) {
-                       $parent_uri = $single_conv->context->inReplyTo->id;
+                       $parent_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
+                                               intval($uid), dbesc($single_conv->context->inReplyTo->id), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
+                       if ($parent_exists)
+                               $parent_uri = $single_conv->context->inReplyTo->id;
+               }
 
+               // This is the current way
+               if (isset($single_conv->object->inReplyTo->id)) {
                        $parent_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
-                                               intval($uid), dbesc($parent_uri), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
-                       if (!$parent_exists) {
-                               logger("Parent ".$parent_uri." wasn't found here", LOGGER_DEBUG);
-                               $parent_uri = $parent["uri"];
-                       }
-               } else
-                       $parent_uri = $parent["uri"];
+                                               intval($uid), dbesc($single_conv->object->inReplyTo->id), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
+                       if ($parent_exists)
+                               $parent_uri = $single_conv->object->inReplyTo->id;
+               }
 
                $message_exists = q("SELECT `id`, `parent`, `uri` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
                                                intval($uid), dbesc($single_conv->id),
@@ -700,6 +866,11 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                        continue;
                }
 
+               if (is_array($single_conv->to))
+                       foreach($single_conv->to AS $to)
+                               if ($importer["nurl"] == normalise_link($to->id))
+                                       $mention = true;
+
                $actor = $single_conv->actor->id;
                if (isset($single_conv->actor->url))
                        $actor = $single_conv->actor->url;
@@ -755,7 +926,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                else
                        $arr["app"] = "OStatus";
 
-               $arr["app"] .= " (Conversation)";
+               //$arr["app"] .= " (Conversation)";
 
                $arr["object"] = json_encode($single_conv);
                $arr["verb"] = $parent["verb"];
@@ -764,18 +935,31 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                $arr["coord"] = trim($single_conv->location->lat." ".$single_conv->location->lon);
 
                // Is it a reshared item?
-               if (isset($item->verb) AND ($item->verb == "share") AND isset($item->object)) {
-                       if (is_array($item->object))
-                               $item->object = $item->object[0];
+               if (isset($single_conv->verb) AND ($single_conv->verb == "share") AND isset($single_conv->object)) {
+                       if (is_array($single_conv->object))
+                               $single_conv->object = $single_conv->object[0];
 
                        logger("Found reshared item ".$single_conv->object->id);
 
                        // $single_conv->object->context->conversation;
 
-                       $plink = ostatus_convert_href($single_conv->object->url);
+                       if (isset($single_conv->object->object->id))
+                               $arr["uri"] = $single_conv->object->object->id;
+                       else
+                               $arr["uri"] = $single_conv->object->id;
+
+                       if (isset($single_conv->object->object->url))
+                               $plink = ostatus_convert_href($single_conv->object->object->url);
+                       else
+                               $plink = ostatus_convert_href($single_conv->object->url);
+
+                       if (isset($single_conv->object->object->content))
+                               $arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->object->content));
+                       else
+                               $arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->content));
 
-                       $arr["uri"] = $single_conv->object->id;
                        $arr["plink"] = $plink;
+
                        $arr["created"] = $single_conv->object->published;
                        $arr["edited"] = $single_conv->object->published;
 
@@ -786,7 +970,6 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                        $arr["author-link"] = $single_conv->object->actor->url;
                        $arr["author-avatar"] = $single_conv->object->actor->image->url;
 
-                       $arr["body"] = add_page_info_to_body(html2bbcode($single_conv->object->content));
                        $arr["app"] = $single_conv->object->provider->displayName."#";
                        //$arr["verb"] = $single_conv->object->verb;
 
@@ -801,15 +984,15 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                        unset($arr["coord"]);
 
                // Copy fields from given item array
-               if (isset($item["uri"]) AND ($item["uri"] == $arr["uri"])) {
+               if (isset($item["uri"]) AND (($item["uri"] == $arr["uri"]) OR ($item["uri"] ==  $single_conv->id))) {
                        $copy_fields = array("owner-name", "owner-link", "owner-avatar", "author-name", "author-link", "author-avatar",
-                                               "gravity", "body", "object-type", "verb", "created", "edited", "coord", "tag",
-                                               "attach", "app", "type", "location", "contact-id");
+                                               "gravity", "body", "object-type", "object", "verb", "created", "edited", "coord", "tag",
+                                               "title", "attach", "app", "type", "location", "contact-id", "uri");
                        foreach ($copy_fields AS $field)
                                if (isset($item[$field]))
                                        $arr[$field] = $item[$field];
 
-                       $arr["app"] .= " (OStatus)";
+                       //$arr["app"] .= " (OStatus)";
                }
 
                $newitem = item_store($arr);
@@ -828,6 +1011,28 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                // Add the conversation entry (but don't fetch the whole conversation)
                ostatus_store_conversation($newitem, $conversation_url);
 
+               if ($mention) {
+                       $u = q("SELECT `notify-flags`, `language`, `username`, `email` FROM user WHERE uid = %d LIMIT 1", intval($uid));
+                       $r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($newitem));
+
+                       notification(array(
+                               'type'         => NOTIFY_TAGSELF,
+                               'notify_flags' => $u[0]["notify-flags"],
+                               'language'     => $u[0]["language"],
+                               'to_name'      => $u[0]["username"],
+                               'to_email'     => $u[0]["email"],
+                               'uid'          => $uid,
+                               'item'         => $arr,
+                               'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($newitem)),
+                               'source_name'  => $arr["author-name"],
+                               'source_link'  => $arr["author-link"],
+                               'source_photo' => $arr["author-avatar"],
+                               'verb'         => ACTIVITY_TAG,
+                               'otype'        => 'item',
+                               'parent'       => $r[0]["parent"]
+                       ));
+               }
+
                // If the newly created item is the top item then change the parent settings of the thread
                // This shouldn't happen anymore. This is supposed to be absolote.
                if ($arr["uri"] == $first_id) {
@@ -839,6 +1044,15 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
                }
        }
 
+       if (($item_stored < 0) AND (count($item) > 0)) {
+               //$arr["app"] .= " (OStatus-NoConvFound)";
+               $item_stored = item_store($item, true);
+               if ($item_stored) {
+                       logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG);
+                       ostatus_store_conversation($item_stored, $conversation_url);
+               }
+       }
+
        return($item_stored);
 }
 
@@ -863,4 +1077,428 @@ function ostatus_store_conversation($itemid, $conversation_url) {
                logger('Storing conversation url '.$conversation_url.' for id '.$itemid);
        }
 }
+
+function xml_add_element($doc, $parent, $element, $value = "", $attributes = array()) {
+       $element = $doc->createElement($element, xmlify($value));
+
+       foreach ($attributes AS $key => $value) {
+               $attribute = $doc->createAttribute($key);
+               $attribute->value = xmlify($value);
+               $element->appendChild($attribute);
+       }
+
+       $parent->appendChild($element);
+}
+
+function ostatus_format_picture_post($body) {
+       $siteinfo = get_attached_data($body);
+
+       if (($siteinfo["type"] == "photo")) {
+               if (isset($siteinfo["preview"]))
+                       $preview = $siteinfo["preview"];
+               else
+                       $preview = $siteinfo["image"];
+
+               // Is it a remote picture? Then make a smaller preview here
+               $preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
+
+               // Is it a local picture? Then make it smaller here
+               $preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview);
+               $preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview);
+
+               if (isset($siteinfo["url"]))
+                       $url = $siteinfo["url"];
+               else
+                       $url = $siteinfo["image"];
+
+               $body = trim($siteinfo["text"])." [url]".$url."[/url]\n[img]".$preview."[/img]";
+       }
+
+       return $body;
+}
+
+function ostatus_add_header($doc, $owner) {
+       $a = get_app();
+
+       $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
+               intval($owner["uid"]));
+       if (!$r)
+               return;
+
+       $profile = $r[0];
+
+       $root = $doc->createElementNS(NS_ATOM, 'feed');
+       $doc->appendChild($root);
+
+       $root->setAttribute("xmlns:thr", NS_THR);
+       $root->setAttribute("xmlns:georss", NS_GEORSS);
+       $root->setAttribute("xmlns:activity", NS_ACTIVITY);
+       $root->setAttribute("xmlns:media", NS_MEDIA);
+       $root->setAttribute("xmlns:poco", NS_POCO);
+       $root->setAttribute("xmlns:ostatus", NS_OSTATUS);
+       $root->setAttribute("xmlns:statusnet", NS_STATUSNET);
+
+       $attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
+       xml_add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
+       xml_add_element($doc, $root, "id", $a->get_baseurl()."/profile/".$owner["nick"]);
+       xml_add_element($doc, $root, "title", sprintf("%s timeline", $profile["name"]));
+       xml_add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $profile["name"], $a->config["sitename"]));
+       xml_add_element($doc, $root, "logo", $profile["photo"]);
+       xml_add_element($doc, $root, "updated", datetime_convert("UTC", "UTC", "now", ATOM_TIME));
+
+       $author = ostatus_add_author($doc, $owner, $profile);
+       $root->appendChild($author);
+
+       $attributes = array("href" => $owner["url"], "rel" => "alternate", "type" => "text/html");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       // To-Do: We have to find out what this is
+       //$attributes = array("href" => $a->get_baseurl()."/sup",
+       //              "rel" => "http://api.friendfeed.com/2008/03#sup",
+       //              "type" => "application/json");
+       //xml_add_element($doc, $root, "link", "", $attributes);
+
+       ostatus_hublinks($doc, $root);
+
+       $attributes = array("href" => $a->get_baseurl()."/salmon/".$owner["nick"], "rel" => "salmon");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       $attributes = array("href" => $a->get_baseurl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       $attributes = array("href" => $a->get_baseurl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       $attributes = array("href" => $a->get_baseurl()."/api/statuses/user_timeline/".$owner["nick"].".atom",
+                       "rel" => "self", "type" => "application/atom+xml");
+       xml_add_element($doc, $root, "link", "", $attributes);
+
+       return $root;
+}
+
+function ostatus_hublinks($doc, $root) {
+       $a = get_app();
+       $hub = get_config('system','huburl');
+
+       $hubxml = '';
+       if(strlen($hub)) {
+               $hubs = explode(',', $hub);
+               if(count($hubs)) {
+                       foreach($hubs as $h) {
+                               $h = trim($h);
+                               if(! strlen($h))
+                                       continue;
+                               if ($h === '[internal]')
+                                       $h = $a->get_baseurl() . '/pubsubhubbub';
+                               xml_add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
+                       }
+               }
+       }
+}
+
+function ostatus_get_attachment($doc, $root, $item) {
+       $o = "";
+       $siteinfo = get_attached_data($item["body"]);
+
+       switch($siteinfo["type"]) {
+               case 'link':
+                       $attributes = array("rel" => "enclosure",
+                                       "href" => $siteinfo["url"],
+                                       "type" => "text/html; charset=UTF-8",
+                                       "length" => "",
+                                       "title" => $siteinfo["title"]);
+                       xml_add_element($doc, $root, "link", "", $attributes);
+                       break;
+               case 'photo':
+                       $imgdata = get_photo_info($siteinfo["image"]);
+                       $attributes = array("rel" => "enclosure",
+                                       "href" => $siteinfo["image"],
+                                       "type" => $imgdata["mime"],
+                                       "length" => intval($imgdata["size"]));
+                       xml_add_element($doc, $root, "link", "", $attributes);
+                       break;
+               case 'video':
+                       $attributes = array("rel" => "enclosure",
+                                       "href" => $siteinfo["url"],
+                                       "type" => "text/html; charset=UTF-8",
+                                       "length" => "",
+                                       "title" => $siteinfo["title"]);
+                       xml_add_element($doc, $root, "link", "", $attributes);
+                       break;
+               default:
+                       break;
+       }
+
+       if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) {
+               $photodata = get_photo_info($siteinfo["image"]);
+
+               $attributes = array("rel" => "preview", "href" => $siteinfo["image"], "media:width" => $photodata[0], "media:height" => $photodata[1]);
+               xml_add_element($doc, $root, "link", "", $attributes);
+       }
+
+
+       $arr = explode('[/attach],',$item['attach']);
+       if(count($arr)) {
+               foreach($arr as $r) {
+                       $matches = false;
+                       $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
+                       if($cnt) {
+                               $attributes = array("rel" => "enclosure",
+                                               "href" => $matches[1],
+                                               "type" => $matches[3]);
+
+                               if(intval($matches[2]))
+                                       $attributes["length"] = intval($matches[2]);
+
+                               if(trim($matches[4]) != "")
+                                       $attributes["title"] = trim($matches[4]);
+
+                               xml_add_element($doc, $root, "link", "", $attributes);
+                       }
+               }
+       }
+}
+
+function ostatus_add_author($doc, $owner, $profile) {
+       $a = get_app();
+
+       $author = $doc->createElement("author");
+       xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
+       xml_add_element($doc, $author, "uri", $owner["url"]);
+       xml_add_element($doc, $author, "name", $profile["name"]);
+
+       $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]);
+       xml_add_element($doc, $author, "link", "", $attributes);
+
+       $attributes = array(
+                       "rel" => "avatar",
+                       "type" => "image/jpeg", // To-Do?
+                       "media:width" => 175,
+                       "media:height" => 175,
+                       "href" => $profile["photo"]);
+       xml_add_element($doc, $author, "link", "", $attributes);
+
+       $attributes = array(
+                       "rel" => "avatar",
+                       "type" => "image/jpeg", // To-Do?
+                       "media:width" => 80,
+                       "media:height" => 80,
+                       "href" => $profile["thumb"]);
+       xml_add_element($doc, $author, "link", "", $attributes);
+
+       xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]);
+       xml_add_element($doc, $author, "poco:displayName", $profile["name"]);
+       xml_add_element($doc, $author, "poco:note", $profile["about"]);
+
+       if (trim($owner["location"]) != "") {
+               $element = $doc->createElement("poco:address");
+               xml_add_element($doc, $element, "poco:formatted", $owner["location"]);
+               $author->appendChild($element);
+       }
+
+       if (trim($profile["homepage"]) != "") {
+               $urls = $doc->createElement("poco:urls");
+               xml_add_element($doc, $urls, "poco:type", "homepage");
+               xml_add_element($doc, $urls, "poco:value", $profile["homepage"]);
+               xml_add_element($doc, $urls, "poco:primary", "true");
+               $author->appendChild($urls);
+       }
+
+       xml_add_element($doc, $author, "followers", "", array("url" => $a->get_baseurl()."/viewcontacts/".$owner["nick"]));
+       xml_add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
+
+       return $author;
+}
+
+/*
+To-Do: Picture attachments should look like this:
+
+<a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
+class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
+
+*/
+
+function ostatus_entry($doc, $item, $owner, $toplevel = false) {
+       $a = get_app();
+
+       if (!$toplevel) {
+               $entry = $doc->createElement("entry");
+               $title = sprintf("New note by %s", $owner["nick"]);
+       } else {
+               $entry = $doc->createElementNS(NS_ATOM, "entry");
+
+               $entry->setAttribute("xmlns:thr", NS_THR);
+               $entry->setAttribute("xmlns:georss", NS_GEORSS);
+               $entry->setAttribute("xmlns:activity", NS_ACTIVITY);
+               $entry->setAttribute("xmlns:media", NS_MEDIA);
+               $entry->setAttribute("xmlns:poco", NS_POCO);
+               $entry->setAttribute("xmlns:ostatus", NS_OSTATUS);
+               $entry->setAttribute("xmlns:statusnet", NS_STATUSNET);
+
+               $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`",
+                       intval($owner["uid"]));
+               if (!$r)
+                       return;
+
+               $profile = $r[0];
+
+               $author = ostatus_add_author($doc, $owner, $profile);
+               $entry->appendChild($author);
+
+               $title = sprintf("New comment by %s", $owner["nick"]);
+       }
+
+       // To use the object-type "bookmark" we have to implement these elements:
+       //
+       // <activity:object-type>http://activitystrea.ms/schema/1.0/bookmark</activity:object-type>
+       // <title>Historic Rocket Landing</title>
+       // <summary>Nur ein Testbeitrag.</summary>
+       // <link rel="related" href="https://www.youtube.com/watch?v=9pillaOxGCo"/>
+       // <link rel="preview" href="https://pirati.cc/file/thumb-4526-450x338-b48c8055f0c2fed0c3f67adc234c4b99484a90c42ed3cac73dc1081a4d0a7bc1.jpg.jpg" media:width="450" media:height="338"/>
+       //
+       // But: it seems as if it doesn't federate well between the GS servers
+       // So we just set it to "note" to be sure that it reaches their target systems
+
+       xml_add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
+       xml_add_element($doc, $entry, "id", $item["uri"]);
+       xml_add_element($doc, $entry, "title", $title);
+
+       if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+               $body = fix_private_photos($item['body'],$owner['uid'],$item, 0);
+       else
+               $body = $item['body'];
+
+       $body = ostatus_format_picture_post($body);
+
+       if ($item['title'] != "")
+               $body = "[b]".$item['title']."[/b]\n\n".$body;
+
+       //$body = bb_remove_share_information($body);
+       $body = bbcode($body, false, false, 7);
+
+       xml_add_element($doc, $entry, "content", $body, array("type" => "html"));
+
+       xml_add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
+                                                       "href" => $a->get_baseurl()."/display/".$item["guid"]));
+
+       xml_add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
+       xml_add_element($doc, $entry, "activity:verb", construct_verb($item));
+       xml_add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
+       xml_add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
+
+       if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+               $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
+               $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
+
+               $attributes = array(
+                               "ref" => $parent_item,
+                               "type" => "text/html",
+                               "href" => $a->get_baseurl()."/display/".$parent[0]["guid"]);
+               xml_add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
+
+               $attributes = array(
+                               "rel" => "related",
+                               "href" => $a->get_baseurl()."/display/".$parent[0]["guid"]);
+               xml_add_element($doc, $entry, "link", "", $attributes);
+        }
+
+       xml_add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation",
+                                                       "href" => $a->get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]));
+       xml_add_element($doc, $entry, "ostatus:conversation", $a->get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]);
+
+       $tags = item_getfeedtags($item);
+
+       if(count($tags))
+               foreach($tags as $t)
+                       if ($t[0] == "@")
+                               xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+                                                                               "ostatus:object-type" => ACTIVITY_OBJ_PERSON,
+                                                                               "href" => $t[1]));
+
+       if (!$item["private"])
+               xml_add_element($doc, $entry, "link", "", array("rel" => "mentioned",
+                                                               "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection",
+                                                               "href" => "http://activityschema.org/collection/public"));
+
+       if(count($tags))
+               foreach($tags as $t)
+                       if ($t[0] != "@")
+                               xml_add_element($doc, $entry, "category", "", array("term" => $t[2]));
+
+       ostatus_get_attachment($doc, $entry, $item);
+
+       // To-Do:
+       // The API call has yet to be implemented
+       //$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
+       //              "rel" => "self", "type" => "application/atom+xml");
+       //xml_add_element($doc, $entry, "link", "", $attributes);
+
+       //$attributes = array("href" => $a->get_baseurl()."/api/statuses/show/".$item["id"].".atom",
+       //              "rel" => "edit", "type" => "application/atom+xml");
+       //xml_add_element($doc, $entry, "link", "", $attributes);
+
+       $app = $item["app"];
+       if ($app == "")
+               $app = "web";
+
+       xml_add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item["id"], "source" => $app));
+
+       return $entry;
+}
+
+function ostatus_feed(&$a, $owner_nick, $last_update) {
+
+       $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`
+                       FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+                       WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
+                       dbesc($owner_nick));
+       if (!$r)
+               return;
+
+       $owner = $r[0];
+
+       if(!strlen($last_update))
+               $last_update = 'now -30 days';
+
+       $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
+
+       $items = q("SELECT STRAIGHT_JOIN `item`.*, `item`.`id` AS `item_id` FROM `item`
+                       INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
+                       LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`
+                       WHERE `item`.`uid` = %d AND `item`.`received` > '%s' AND NOT `item`.`private` AND NOT `item`.`deleted`
+                               AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+                               AND ((`item`.`wall` AND (`item`.`parent` = `item`.`id`))
+                                       OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s'))) AND `thread`.`mention`)
+                               AND (`item`.`owner-link` IN ('%s', '%s'))
+                       ORDER BY `item`.`received` DESC
+                       LIMIT 0, 300",
+                       intval($owner["uid"]), dbesc($check_date),
+                       dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS),
+                       dbesc($owner["nurl"]), dbesc(str_replace("http://", "https://", $owner["nurl"]))
+               );
+
+       $doc = new DOMDocument('1.0', 'utf-8');
+       $doc->formatOutput = true;
+
+       $root = ostatus_add_header($doc, $owner);
+
+       foreach ($items AS $item) {
+               $entry = ostatus_entry($doc, $item, $owner);
+               $root->appendChild($entry);
+       }
+
+       return(trim($doc->saveXML()));
+}
+
+function ostatus_salmon($item,$owner) {
+
+       $doc = new DOMDocument('1.0', 'utf-8');
+       $doc->formatOutput = true;
+
+       $entry = ostatus_entry($doc, $item, $owner, true);
+
+       $doc->appendChild($entry);
+
+       return(trim($doc->saveXML()));
+}
 ?>