add remove_user hook (it looks like dreamhost changed all my file permissions, this...

[friendica.git] / view / api_timeline_atom.tpl

diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
old mode 100644 (file)
new mode 100755 (executable)
index bd674f3..fb4f51f
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@@ -1,10 +1,10 @@
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
  <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
- <id>tag:friendika:PublicTimeline</id>
- <title>Network on Friendika</title>
- <subtitle>Your network updates on Friendika</subtitle>
+ <id>$rss.self</id>
+ <title>Friendika</title>
+ <subtitle>Friendika API feed</subtitle>
  <logo>$rss.logo</logo>
- <updated>$rss.updated</updated>
+ <updated>$rss.atom_updated</updated>
  <link type="text/html" rel="alternate" href="$rss.alternate"/>
  <link type="application/atom+xml" rel="self" href="$rss.self"/>
  
@@ -53,28 +53,17 @@
        {{ for $statuses as $status }}
        <entry>
                <activity:object-type>$status.objecttype</activity:object-type>
-               <id>$status.id</id>
+               <id>$status.message_id</id>
                <title>$status.text</title>
-               <content type="html">$status.html</content>
+               <content type="html">$status.statusnet_html</content>
                <link rel="alternate" type="text/html" href="$status.url"/>
                <activity:verb>$status.verb</activity:verb>
                <published>$status.published</published>
                <updated>$status.updated</updated>
 
-               <!--
-               <source>
-               <id>http://identi.ca/api/statuses/user_timeline/397830.atom</id>
-               <title>Sin Mobopolitan</title>
-               <link rel="alternate" type="text/html" href="http://identi.ca/mobopolitan"/>
-               <link rel="self" type="application/atom+xml" href="http://identi.ca/api/statuses/user_timeline/397830.atom"/>
-               <link rel="license" href="http://creativecommons.org/licenses/by/3.0/"/>
-               <icon>http://avatar.identi.ca/397830-96-20110312195623.jpeg</icon>
-               <updated>2011-04-21T18:39:32+00:00</updated>
-               </source>
-               -->
                <link rel="self" type="application/atom+xml" href="$status.self"/>
                <link rel="edit" type="application/atom+xml" href="$status.edit"/>
-               <statusnet:notice_info local_id="$status.id" source="$status.source" favorite="false" repeated="false">
+               <statusnet:notice_info local_id="$status.id" source="$status.source" >
                </statusnet:notice_info>
 
                <author>
@@ -82,10 +71,8 @@
                        <uri>$status.user.url</uri>
                        <name>$status.user.name</name>
                        <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"/>
-                       <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$status.user.profile_image_url"/>
                        <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$status.user.profile_image_url"/>
-                       <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$status.user.profile_image_url"/>
+
                        <georss:point/>
                        <poco:preferredUsername>$status.user.screen_name</poco:preferredUsername>
                        <poco:displayName>$status.user.name</poco:displayName>
@@ -95,30 +82,8 @@
                                <poco:value>$status.user.url</poco:value>
                                <poco:primary>true</poco:primary>
                        </poco:urls>
-                       <!-- <statusnet:profile_info local_id="123710" following="true" blocking="false"></statusnet:profile_info> -->                  
                </author>
-               <!--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.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"/>
-                       <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$status.user.profile_image_url"/>
-                       <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$status.user.profile_image_url"/>
-                       <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$status.user.profile_image_url"/>
-                       <georss:point/>
-                       <poco:preferredUsername>$status.user.screen_name</poco:preferredUsername>
-                       <poco:displayName>$status.user.name</poco:displayName>
-                       <poco:address />
-                       <poco:urls>
-                               <poco:type>homepage</poco:type>
-                               <poco:value>$status.user.url</poco:value>
-                               <poco:primary>true</poco:primary>
-                       </poco:urls>
-                       <!-- <statusnet:profile_info local_id="123710" following="true" blocking="false"></statusnet:profile_info> -->
-               </activity:actor>
-               <link rel="ostatus:conversation" href="$status.url"/> 
+               <link rel="ostatus:conversation" type="text/html" href="$status.url"/> 
 
        </entry>    
     {{ endfor }}