OStatus: New fields in OStatus export/ Auto-tagging of replyed authors.

diff --git a/include/items.php b/include/items.php
index 588bd353f7d27cb6c63b4c706f19ba33ecb6fda3..809d9dcd6d6826480ac8a95e4187f4f5a6976e1a 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -208,7 +208,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0,
 
                call_hooks('atom_feed_end', $atom);
 
-               $atom .= '</feed>' . "\r\n";
+               $atom .= '</feed>'."\r\n";
                return $atom;
        }
 
@@ -235,7 +235,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0,
 
        call_hooks('atom_feed_end', $atom);
 
-       $atom .= '</feed>' . "\r\n";
+       $atom .= '</feed>'."\r\n";
 
        return $atom;
 }
@@ -250,18 +250,18 @@ function construct_verb($item) {
 function construct_activity_object($item) {
 
        if($item['object']) {
-               $o = '<as:object>' . "\r\n";
+               $o = '<as:object>'."\r\n";
                $r = parse_xml_string($item['object'],false);
 
 
                if(! $r)
                        return '';
                if($r->type)
-                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
+                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>'."\r\n";
                if($r->id)
-                       $o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
+                       $o .= '<id>' . xmlify($r->id) . '</id>'."\r\n";
                if($r->title)
-                       $o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
+                       $o .= '<title>' . xmlify($r->title) . '</title>'."\r\n";
                if($r->link) {
                        if(substr($r->link,0,1) === '<') {
                                // patch up some facebook "like" activity objects that got stored incorrectly
@@ -273,11 +273,11 @@ function construct_activity_object($item) {
                                $o .= $r->link;
                        }
                        else
-                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
+                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />'."\r\n";
                }
                if($r->content)
-                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
-               $o .= '</as:object>' . "\r\n";
+                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>'."\r\n";
+               $o .= '</as:object>'."\r\n";
                return $o;
        }
 
@@ -287,16 +287,16 @@ function construct_activity_object($item) {
 function construct_activity_target($item) {
 
        if($item['target']) {
-               $o = '<as:target>' . "\r\n";
+               $o = '<as:target>'."\r\n";
                $r = parse_xml_string($item['target'],false);
                if(! $r)
                        return '';
                if($r->type)
-                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
+                       $o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>'."\r\n";
                if($r->id)
-                       $o .= '<id>' . xmlify($r->id) . '</id>' . "\r\n";
+                       $o .= '<id>' . xmlify($r->id) . '</id>'."\r\n";
                if($r->title)
-                       $o .= '<title>' . xmlify($r->title) . '</title>' . "\r\n";
+                       $o .= '<title>' . xmlify($r->title) . '</title>'."\r\n";
                if($r->link) {
                        if(substr($r->link,0,1) === '<') {
                                if(strstr($r->link,'&') && (! strstr($r->link,'&amp;')))
@@ -305,11 +305,11 @@ function construct_activity_target($item) {
                                $o .= $r->link;
                        }
                        else
-                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
+                               $o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />'."\r\n";
                }
                if($r->content)
-                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>' . "\r\n";
-               $o .= '</as:target>' . "\r\n";
+                       $o .= '<content type="html" >' . xmlify(bbcode($r->content)) . '</content>'."\r\n";
+               $o .= '</as:target>'."\r\n";
                return $o;
        }
 
@@ -4321,8 +4321,8 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) {
        $o .= "<$tag>\r\n";
        $o .= "<name>$name</name>\r\n";
        $o .= "<uri>$uri</uri>\r\n";
-       $o .= '<link rel="photo"  type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-       $o .= '<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+       $o .= '<link rel="photo"  type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />'."\r\n";
+       $o .= '<link rel="avatar" type="image/jpeg" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />'."\r\n";
 
        call_hooks('atom_author', $o);
 
@@ -4338,7 +4338,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
                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";
+               return '<at:deleted-entry ref="' . xmlify($item['uri']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />'."\r\n";
 
 
        if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
@@ -4346,69 +4346,87 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
        else
                $body = $item['body'];
 
+       $htmlbody = $body;
+
+       if ($item['title'] != "")
+               $htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+
+       $htmlbody = bbcode(bb_remove_share_information($htmlbody), false, false, 7);
 
        $o = "\r\n\r\n<entry>\r\n";
 
+       // OStatus stuff
+       $o .= "\t".'<id>' . xmlify($item['uri']) . '</id>'."\r\n";
+       $o .= "\t".'<title>' . xmlify($item['title']) . '</title>'."\r\n";
+       $o .= "\t".'<content type="' . $type . '" >' . xmlify((($type === 'html') ? $htmlbody : $body)) . '</content>'."\r\n";
+       $o .= "\t".'<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />'."\r\n";
+
+       $verb = construct_verb($item);
+       $o .= "\t".'<activity:verb>'.xmlify($verb).'</activity:verb>'."\r\n";
+       $o .= "\t".'<as:verb>' . xmlify($verb) . '</as:verb>'."\r\n";
+
+       $o .= "\t".'<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>'."\r\n";
+       $o .= "\t".'<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>'."\r\n";
        if(is_array($author))
                $o .= atom_author('author',$author['name'],$author['url'],80,80,$author['thumb']);
        else
                $o .= atom_author('author',(($item['author-name']) ? $item['author-name'] : $item['name']),(($item['author-link']) ? $item['author-link'] : $item['url']),80,80,(($item['author-avatar']) ? $item['author-avatar'] : $item['thumb']));
-       if(strlen($item['owner-name']))
-               $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
 
        if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
                $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
-               $o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['parent']) . '" />' . "\r\n";
+               $o .= "\t".'<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['parent']) . '" />'."\r\n";
+               $o .= "\t".'<link rel="related" href="'.xmlify($a->get_baseurl().'/display/'.$owner['nickname'].'/'.$item['parent']).'"/>'."\r\n";
        }
 
-       $htmlbody = $body;
+       $o .= "\t".'<link rel="ostatus:conversation" href="'.xmlify($a->get_baseurl().'/display/'.$owner['nickname'].'/'.$item['parent']).'"/>'."\r\n";
 
-       if ($item['title'] != "")
-               $htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+       $o .= item_getfeedattach($item);
 
-       $htmlbody = bbcode(bb_remove_share_information($htmlbody), false, false, 7);
+       $mentioned = get_mentions($item);
+       if($mentioned)
+               $o .= $mentioned;
+
+       $o .= "\t".'<link rel="self" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
+       $o .= "\t".'<link rel="edit" type="application/atom+xml" href="'.xmlify($a->get_baseurl().'/api/statuses/show/'.$item['id'].'.atom').'"/>'."\r\n";
+       $o .= "\t".'<statusnet:notice_info local_id="'.$item['id'].'" source="'.$item['app'].'"></statusnet:notice_info>'."\r\n";
+
+       // DFRN stuff
+       if(strlen($item['owner-name']))
+               $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
 
-       $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') ? $htmlbody : $body)) . '</content>' . "\r\n";
-       $o .= '<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
+       $o .= "\t".'<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>'."\r\n";
 
 
        if($comment)
-               $o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";
+               $o .= "\t".'<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>'."\r\n";
 
        if($item['location']) {
-               $o .= '<dfrn:location>' . xmlify($item['location']) . '</dfrn:location>' . "\r\n";
-               $o .= '<poco:address><poco:formatted>' . xmlify($item['location']) . '</poco:formatted></poco:address>' . "\r\n";
+               $o .= "\t".'<dfrn:location>' . xmlify($item['location']) . '</dfrn:location>'."\r\n";
+               $o .= "\t".'<poco:address><poco:formatted>' . xmlify($item['location']) . '</poco:formatted></poco:address>'."\r\n";
        }
 
        if($item['coord'])
-               $o .= '<georss:point>' . xmlify($item['coord']) . '</georss:point>' . "\r\n";
+               $o .= "\t".'<georss:point>' . xmlify($item['coord']) . '</georss:point>'."\r\n";
 
        if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
-               $o .= '<dfrn:private>' . (($item['private']) ? $item['private'] : 1) . '</dfrn:private>' . "\r\n";
+               $o .= "\t".'<dfrn:private>' . (($item['private']) ? $item['private'] : 1) . '</dfrn:private>'."\r\n";
 
        if($item['extid'])
-               $o .= '<dfrn:extid>' . xmlify($item['extid']) . '</dfrn:extid>' . "\r\n";
+               $o .= "\t".'<dfrn:extid>' . xmlify($item['extid']) . '</dfrn:extid>'."\r\n";
        if($item['bookmark'])
-               $o .= '<dfrn:bookmark>true</dfrn:bookmark>' . "\r\n";
+               $o .= "\t".'<dfrn:bookmark>true</dfrn:bookmark>'."\r\n";
 
        if($item['app'])
-               $o .= '<statusnet:notice_info local_id="' . $item['id'] . '" source="' . xmlify($item['app']) . '" ></statusnet:notice_info>' . "\r\n";
+               $o .= "\t".'<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";
+               $o .= "\t".'<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";
+               $o .= "\t".'<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);
        if(strlen($actobj))
                $o .= $actobj;
@@ -4419,19 +4437,13 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
        $tags = item_getfeedtags($item);
        if(count($tags)) {
                foreach($tags as $t) {
-                       $o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
+                       $o .= "\t".'<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />'."\r\n";
                }
        }
 
-       $o .= item_getfeedattach($item);
-
-       $mentioned = get_mentions($item);
-       if($mentioned)
-               $o .= $mentioned;
-
        call_hooks('atom_entry', $o);
 
-       $o .= '</entry>' . "\r\n";
+       $o .= '</entry>'."\r\n";
 
        return $o;
 }
@@ -4613,7 +4625,7 @@ function item_getfeedattach($item) {
                                        $ret .= 'length="' . intval($matches[2]) . '" ';
                                if($matches[4] !== ' ')
                                        $ret .= 'title="' . xmlify(trim($matches[4])) . '" ';
-                               $ret .= ' />' . "\r\n";
+                               $ret .= ' />'."\r\n";
                        }
                }
        }

diff --git a/mod/item.php b/mod/item.php
index 45b86c31001f5083f25e019c0f5ec13d19ee695f..093316dbeea2ab56b9e19372743d6c6e0476aa84 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -565,23 +565,19 @@ function item_post(&$a) {
 
        $tags = get_tags($body);
 
-       if($parent) {
-               /**
-                * add a statusnet style reply tag if the original post was from there
-                * and we are replying, and there isn't one already
-                */
+       /**
+        * add a statusnet style reply tag if the original post was from there
+        * and we are replying, and there isn't one already
+        */
 
+       if($parent AND ($parent_contact['network'] === NETWORK_OSTATUS)) {
                if ($parent_contact['id'] != "")
                        $contact = '@'.$parent_contact['nick'].'+'.$parent_contact['id'];
-               //elseif ($parent_contact['addr'] != "")
-               //      $contact = '@'.$parent_contact['addr'];
                else
                        $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
 
                if (!in_array($contact,$tags)) {
-                       if ($parent_contact['network'] === NETWORK_OSTATUS)
-                               $body = $contact.' '.$body;
-
+                       $body = $contact.' '.$body;
                        $tags[] = $contact;
                }