From 207cc8907475cb75091e6f1a05fb096fdf477b48 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 25 Feb 2010 18:06:03 -0800
Subject: Set avatar height correctly

---
 lib/activity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/activity.php b/lib/activity.php
index 0f30e8bf5..161232c42 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -480,7 +480,7 @@ class AvatarLink
         }
         $alink = new AvatarLink();
         $alink->type   = $avatar->mediatype;
-        $alink->height = $avatar->mediatype;
+        $alink->height = $avatar->height;
         $alink->width  = $avatar->width;
         $alink->url    = $avatar->displayUrl();
         return $alink;
-- 
cgit v1.2.3-54-g00ecf


From 792f0942f761fe8b29363689eb7cbe4317f64b96 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 25 Feb 2010 18:12:34 -0800
Subject: Fix atom feed IDs in user and group atom feeds

---
 actions/apitimelinegroup.php | 18 ++++--------------
 actions/apitimelineuser.php  | 19 ++++---------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 0bb4860ea..04456ffea 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -107,8 +107,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
         $sitename   = common_config('site', 'name');
         $avatar     = $this->group->homepage_logo;
         $title      = sprintf(_("%s timeline"), $this->group->nickname);
-        $taguribase = TagURI::base();
-        $id         = "tag:$taguribase:GroupTimeline:" . $this->group->id;
 
         $subtitle   = sprintf(
             _('Updates from %1$s on %2$s!'),
@@ -138,19 +136,9 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
             try {
 
-                // If this was called using an integer ID, i.e.: using the canonical
-                // URL for this group's feed, then pass the Group object into the feed, 
-                // so the OStatus plugin, and possibly other plugins, can access it. 
-                // Feels sorta hacky. -- Z
+                $atom = new AtomGroupNoticeFeed($this->group);
 
-                $atom = null;
-                $id = $this->arg('id');
-
-                if (strval(intval($id)) === strval($id)) {
-                    $atom = new AtomGroupNoticeFeed($this->group);
-                } else {
-                    $atom = new AtomGroupNoticeFeed();
-                }
+                // @todo set all this Atom junk up inside the feed class
 
                 $atom->setId($id);
                 $atom->setTitle($title);
@@ -169,6 +157,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
                     $aargs['id'] = $id;
                 }
 
+                $atom->setId($this->getSelfUri('ApiTimelineGroup', $aargs));
+
                 $atom->addLink(
                     $this->getSelfUri('ApiTimelineGroup', $aargs),
                     array('rel' => 'self', 'type' => 'application/atom+xml')
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 3e849cc78..b3ded97c0 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -116,8 +116,6 @@ class ApiTimelineUserAction extends ApiBareAuthAction
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(_("%s timeline"), $this->user->nickname);
-        $taguribase = TagURI::base();
-        $id         = "tag:$taguribase:UserTimeline:" . $this->user->id;
         $link       = common_local_url(
             'showstream',
             array('nickname' => $this->user->nickname)
@@ -148,21 +146,10 @@ class ApiTimelineUserAction extends ApiBareAuthAction
 
             header('Content-Type: application/atom+xml; charset=utf-8');
 
-            // If this was called using an integer ID, i.e.: using the canonical
-            // URL for this user's feed, then pass the User object into the feed,
-            // so the OStatus plugin, and possibly other plugins, can access it.
-            // Feels sorta hacky. -- Z
+            // @todo set all this Atom junk up inside the feed class
 
-            $atom = null;
-            $id = $this->arg('id');
-
-            if (strval(intval($id)) === strval($id)) {
-                $atom = new AtomUserNoticeFeed($this->user);
-            } else {
-                $atom = new AtomUserNoticeFeed();
-            }
+            $atom = new AtomUserNoticeFeed($this->user);
 
-            $atom->setId($id);
             $atom->setTitle($title);
             $atom->setSubtitle($subtitle);
             $atom->setLogo($logo);
@@ -181,6 +168,8 @@ class ApiTimelineUserAction extends ApiBareAuthAction
                 $aargs['id'] = $id;
             }
 
+            $atom->setId($this->getSelfUri('ApiTimelineUser', $aargs));
+
             $atom->addLink(
                 $this->getSelfUri('ApiTimelineUser', $aargs),
                 array('rel' => 'self', 'type' => 'application/atom+xml')
-- 
cgit v1.2.3-54-g00ecf