From 698818bd7eee94e92f23967897862857a190c6ea Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 24 Oct 2010 23:05:33 -0400
Subject: show rel=edit links in notices for authenticated users

---
 classes/Notice.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'classes')

diff --git a/classes/Notice.php b/classes/Notice.php
index 60989f9ba..676e4cb54 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1613,6 +1613,20 @@ class Notice extends Memcached_DataObject
             Event::handle('EndActivityGeo', array(&$this, &$xs, $lat, $lon));
         }
 
+        // @fixme check this logic
+
+        if ($this->isLocal() && !empty($cur) && $cur->id == $this->profile_id) {
+            $relEditUrl = common_local_url('ApiStatusesShow', array('id' => $this->id,
+                                                                    'format' => 'atom'));
+
+            if (Event::handle('StartActivityRelEdit', array(&$this, &$xs, &$relEditUrl))) {
+                $xs->element('link', array('rel' => 'edit',
+                                           'type' => 'application/atom+xml',
+                                           'href' => $relEditUrl));
+                Event::handle('EndActivityRelEdit', array(&$this, &$xs, $relEditUrl));
+            }
+        }
+
         if (Event::handle('StartActivityEnd', array(&$this, &$xs))) {
             $xs->elementEnd('entry');
             Event::handle('EndActivityEnd', array(&$this, &$xs));
-- 
cgit v1.2.3-54-g00ecf


From e51ed96b89eb0229f890a3924c653eda51972a76 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 25 Oct 2010 09:48:01 -0400
Subject: add rel=self links to atom entries

---
 classes/Notice.php | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'classes')

diff --git a/classes/Notice.php b/classes/Notice.php
index 676e4cb54..90ea811b6 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1615,15 +1615,30 @@ class Notice extends Memcached_DataObject
 
         // @fixme check this logic
 
-        if ($this->isLocal() && !empty($cur) && $cur->id == $this->profile_id) {
-            $relEditUrl = common_local_url('ApiStatusesShow', array('id' => $this->id,
-                                                                    'format' => 'atom'));
+        if ($this->isLocal()) {
 
-            if (Event::handle('StartActivityRelEdit', array(&$this, &$xs, &$relEditUrl))) {
-                $xs->element('link', array('rel' => 'edit',
+            $selfUrl = common_local_url('ApiStatusesShow', array('id' => $this->id,
+                                                                 'format' => 'atom'));
+
+            if (Event::handle('StartActivityRelSelf', array(&$this, &$xs, &$selfUrl))) {
+                $xs->element('link', array('rel' => 'self',
                                            'type' => 'application/atom+xml',
-                                           'href' => $relEditUrl));
-                Event::handle('EndActivityRelEdit', array(&$this, &$xs, $relEditUrl));
+                                           'href' => $selfUrl));
+                Event::handle('EndActivityRelSelf', array(&$this, &$xs, $selfUrl));
+            }
+
+            if (!empty($cur) && $cur->id == $this->profile_id) {
+
+                // note: $selfUrl may have been changed by a plugin
+                $relEditUrl = common_local_url('ApiStatusesShow', array('id' => $this->id,
+                                                                        'format' => 'atom'));
+
+                if (Event::handle('StartActivityRelEdit', array(&$this, &$xs, &$relEditUrl))) {
+                    $xs->element('link', array('rel' => 'edit',
+                                               'type' => 'application/atom+xml',
+                                               'href' => $relEditUrl));
+                    Event::handle('EndActivityRelEdit', array(&$this, &$xs, $relEditUrl));
+                }
             }
         }
 
-- 
cgit v1.2.3-54-g00ecf