From 9fadf8da1164d620284917b829329e195aa2a226 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 12:51:23 -0800
Subject: Put all required field setup into AtomUserNoticeFeed and
 AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo
 etc from the Atom data structure so we don't dupe it.) OStatus now calling
 the feed classes directly instead of faking a call into the API, should be
 less flakey.

---
 lib/atom10feed.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'lib/atom10feed.php')

diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index 8842840d5..c1fdeaae9 100644
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -49,6 +49,8 @@ class Atom10FeedException extends Exception
 class Atom10Feed extends XMLStringer
 {
     public  $xw;
+
+    // @fixme most of these should probably be read-only properties
     private $namespaces;
     private $authors;
     private $subject;
@@ -57,10 +59,12 @@ class Atom10Feed extends XMLStringer
     private $generator;
     private $icon;
     private $links;
-    private $logo;
+    private $selfLink;
+    private $selfLinkType;
+    public $logo;
     private $rights;
-    private $subtitle;
-    private $title;
+    public $subtitle;
+    public $title;
     private $published;
     private $updated;
     private $entries;
@@ -184,6 +188,10 @@ class Atom10Feed extends XMLStringer
 
         $this->renderAuthors();
 
+        if ($this->selfLink) {
+            $this->addLink($this->selfLink, array('rel' => 'self',
+                                                  'type' => $this->selfLinkType));
+        }
         $this->renderLinks();
     }
 
@@ -253,6 +261,12 @@ class Atom10Feed extends XMLStringer
         $this->id = $id;
     }
 
+    function setSelfLink($url, $type='application/atom+xml')
+    {
+        $this->selfLink = $url;
+        $this->selfLinkType = $type;
+    }
+
     function setTitle($title)
     {
         $this->title = $title;
-- 
cgit v1.2.3-54-g00ecf


From 79b392a39e9a847c398b697cf8f982a6b220ed56 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 4 Mar 2010 01:16:25 -0800
Subject: Add generator tag into Atom feeds.

---
 lib/atom10feed.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/atom10feed.php')

diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index c1fdeaae9..2d342e785 100644
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -176,6 +176,14 @@ class Atom10Feed extends XMLStringer
         }
         $this->elementStart('feed', $commonAttrs);
 
+        $this->element(
+            'generator', array(
+                'url'     => 'http://status.net',
+                'version' => STATUSNET_VERSION
+            ),
+            'StatusNet'
+        );
+
         $this->element('id', null, $this->id);
         $this->element('title', null, $this->title);
         $this->element('subtitle', null, $this->subtitle);
-- 
cgit v1.2.3-54-g00ecf