Merge remote branch 'remotes/macno/pushatom'

* remotes/macno/pushatom:
  As per spec, we permit to have more then 1 hub
  As suggested by Elrond, we use only one setting
  Default is now PuSH disabled
  Added PuSH capability

1 files changed, 15 insertions, 6 deletions

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index a234722f..29360e23 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -228,16 +228,25 @@ def atom_feed(request):
     """
     ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI)
     """
+    atomlinks = [{
+           'href': request.urlgen(
+               'mediagoblin.user_pages.user_home',
+               qualified=True,user=request.matchdict['user']),
+           'rel': 'alternate',
+           'type': 'text/html'
+           }];
+    if mg_globals.app_config["push_urls"]:
+        for push_url in mg_globals.app_config["push_urls"]:
+            atomlinks.append({
+                'rel': 'hub',
+                'href': push_url})
+
     feed = AtomFeed(
                "MediaGoblin: Feed for user '%s'" % request.matchdict['user'],
                feed_url=request.url,
                id='tag:'+request.host+',2011:gallery.user-'+request.matchdict['user'],
-               links=[{
-                   'href': request.urlgen(
-                       'mediagoblin.user_pages.user_home',
-                       qualified=True,user=request.matchdict['user']),
-                   'rel': 'alternate',
-                   'type': 'text/html'}])
+               links=atomlinks)
+
 
     for entry in cursor:
         feed.add(entry.get('title'),