use "contacts/<id_contact>" url as subject id, as statusnet and twitter use urls...

This seem to make StatusNet Desktop client work better.

diff --git a/include/api.php b/include/api.php
index 556bc062278069771f601f97d30b21f959461f4d..4e5ea43bdb567d8e09569997a2d7ac3114ded469 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -243,6 +243,7 @@
                        'location' => '', //$uinfo[0]['default-location'],
                        'profile_image_url' => $uinfo[0]['micro'],
                        'url' => $uinfo[0]['url'],
+                       'contact_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
                        'protected' => false,   #
                        'friends_count' => $countfriends,
                        'created_at' => api_date($uinfo[0]['name-date']),

diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index f9c70ebb5bd6f23c7b1052d2f52c42d3c61961d6..bd674f3302c43377fac39fad1dda1cca091d3237 100644 (file)
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@@ -32,7 +32,7 @@
  <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
  <activity:subject>
        <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-       <id>$user.url</id>
+       <id>$user.contact_url</id>
        <title>$user.name</title>
        <link rel="alternate" type="text/html" href="$user.url"/>
        <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/>
@@ -100,7 +100,7 @@
                <!--Deprecation warning: activity:actor is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
                <activity:actor>
                        <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-                       <id>$status.user.url</id>
+                       <id>$status.user.contact_url</id>
                        <title>$status.user.name</title>
                        <link rel="alternate" type="text/html" href="$status.user.url"/>
                        <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$status.user.profile_image_url"/>