Merge pull request #238 from annando/master

API: Support of the statusnet application

2 files changed, 52 insertions, 54 deletions

diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
index 17860ca61..4a32b411b 100644
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
@@ -1,22 +1,20 @@
-<statuses type="array">
-  {{ for $statuses as $status }}
-  <status>
-    <created_at>$status.created_at</created_at>
-    <id>$status.id</id>
-    <text>$status.text</text>
-	<statusnet_html>$status.statusnet_html</statusnet_html>
-    <source>$status.source</source>
-    <truncated>$status.truncated</truncated>
-    <url>$status.url</url>
-    <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
-    <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
-    <favorited>$status.favorited</favorited>
-    <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
-    <geo>$status.geo</geo>
-    <coordinates>$status.coordinates</coordinates>
-    <place>$status.place</place>
-    <contributors>$status.contributors</contributors>
-  	{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}
-  </status>
-  {{ endfor }}
-</statuses>
\ No newline at end of file
+<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
+{{ for $statuses as $status }} <status>
+  <text>$status.text</text>
+  <truncated>$status.truncated</truncated>
+  <created_at>$status.created_at</created_at>
+  <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
+  <source>$status.source</source>
+  <id>$status.id</id>
+  <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
+  <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
+  <geo>$status.geo</geo>
+  <favorited>$status.favorited</favorited>
+{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
+  <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
+  <url>$status.url</url>
+  <coordinates>$status.coordinates</coordinates>
+  <place>$status.place</place>
+  <contributors>$status.contributors</contributors>
+ </status>
+{{ endfor }}</statuses>
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
index f1e122f3e..d286652c0 100644
--- a/view/api_user_xml.tpl
+++ b/view/api_user_xml.tpl
@@ -1,34 +1,34 @@
-<user>
-  <id>$user.id</id>
-  <name>$user.name</name>
-  <screen_name>$user.screen_name</screen_name>
-  <location>$user.location</location>
-  <description>$user.description</description>
-  <profile_image_url>$user.profile_image_url</profile_image_url>
-  <url>$user.url</url>
-  <protected>$user.protected</protected>
-  <followers_count>$user.followers_count</followers_count>
-  <profile_background_color>$user.profile_background_color</profile_background_color>
-  <profile_text_color>$user.profile_text_color</profile_text_color>
-  <profile_link_color>$user.profile_link_color</profile_link_color>
-  <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
-  <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
-  <friends_count>$user.friends_count</friends_count>
-  <created_at>$user.created_at</created_at>
-  <favourites_count>$user.favourites_count</favourites_count>
-  <utc_offset>$user.utc_offset</utc_offset>
-  <time_zone>$user.time_zone</time_zone>
-  <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
-  <profile_background_tile>$user.profile_background_tile</profile_background_tile>
-  <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
-  <notifications>$user.notifications</notifications>
-  <geo_enabled>$user.geo_enabled</geo_enabled>
-  <verified>$user.verified</verified>
-  <following>$user.following</following>
-  <statuses_count>$user.statuses_count</statuses_count>
-  <lang>$user.lang</lang>
-  <contributors_enabled>$user.contributors_enabled</contributors_enabled>
-  <status>{{ if $user.status }}
+  <user>
+   <id>$user.id</id>
+   <name>$user.name</name>
+   <screen_name>$user.screen_name</screen_name>
+   <location>$user.location</location>
+   <description>$user.description</description>
+   <profile_image_url>$user.profile_image_url</profile_image_url>
+   <url>$user.url</url>
+   <protected>$user.protected</protected>
+   <followers_count>$user.followers_count</followers_count>
+   <friends_count>$user.friends_count</friends_count>
+   <created_at>$user.created_at</created_at>
+   <favourites_count>$user.favourites_count</favourites_count>
+   <utc_offset>$user.utc_offset</utc_offset>
+   <time_zone>$user.time_zone</time_zone>
+   <statuses_count>$user.statuses_count</statuses_count>
+   <following>$user.following</following>
+   <profile_background_color>$user.profile_background_color</profile_background_color>
+   <profile_text_color>$user.profile_text_color</profile_text_color>
+   <profile_link_color>$user.profile_link_color</profile_link_color>
+   <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
+   <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
+   <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
+   <profile_background_tile>$user.profile_background_tile</profile_background_tile>
+   <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
+   <notifications>$user.notifications</notifications>
+   <geo_enabled>$user.geo_enabled</geo_enabled>
+   <verified>$user.verified</verified>
+   <lang>$user.lang</lang>
+   <contributors_enabled>$user.contributors_enabled</contributors_enabled>
+   <status>{{ if $user.status }}
     <created_at>$user.status.created_at</created_at>
     <id>$user.status.id</id>
     <text>$user.status.text</text>
@@ -43,4 +43,4 @@
     <place>$user.status.place</place>
     <contributors>$user.status.contributors</contributors>
   {{ endif }}</status>
-</user>
+  </user>