From c892726c80b4e466b2bbad0f7b396cf0c7a137d9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 16 Feb 2010 16:22:58 -0800
Subject: Take remote profiles into account when looking up canonical profile
 URIs

---
 classes/Notice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/Notice.php')

diff --git a/classes/Notice.php b/classes/Notice.php
index 73b22d58a..f184b9c52 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1036,7 +1036,7 @@ class Notice extends Memcached_DataObject
                 $xs->element(
                     'link', array(
                         'rel' => 'ostatus:attention',
-                        'href' => $profile->getAcctUri()
+                        'href' => $profile->getUri()
                     )
                 );
             }
-- 
cgit v1.2.3-54-g00ecf


From 198c046c896c2a1c4dc9037fa538c14179e827ce Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 17 Feb 2010 01:12:13 -0800
Subject: - Set the root of a new local conversation to a new conversation.id -
 Output conversation URIs from conversation.uri

---
 classes/Notice.php | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'classes/Notice.php')

diff --git a/classes/Notice.php b/classes/Notice.php
index f184b9c52..b0edb6de6 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -309,7 +309,8 @@ class Notice extends Memcached_DataObject
             // the beginning of a new conversation.
 
             if (empty($notice->conversation)) {
-                $notice->conversation = $notice->id;
+                $conv = Conversation::create();
+                $notice->conversation = $conv->id;
                 $changed = true;
             }
 
@@ -331,14 +332,15 @@ class Notice extends Memcached_DataObject
         return $notice;
     }
 
-    function blowOnInsert()
+    function blowOnInsert($conversation = false)
     {
         self::blow('profile:notice_ids:%d', $this->profile_id);
         self::blow('public');
 
-        if ($this->conversation != $this->id) {
-            self::blow('notice:conversation_ids:%d', $this->conversation);
-        }
+        // XXX: Before we were blowing the casche only if the notice id
+        // was not the root of the conversation.  What to do now?
+
+        self::blow('notice:conversation_ids:%d', $this->conversation);
 
         if (!empty($this->repeat_of)) {
             self::blow('notice:repeats:%d', $this->repeat_of);
@@ -1015,24 +1017,25 @@ class Notice extends Memcached_DataObject
             }
         }
 
-        if (!empty($this->conversation)
-            && $this->conversation != $this->id) {
-            $xs->element(
-                'link', array(
-                    'rel' => 'ostatus:conversation',
-                    'href' => common_local_url(
-                        'conversation',
-                        array('id' => $this->conversation)
-                        )
+        if (!empty($this->conversation)) {
+
+            $conv = Conversation::staticGet('id', $this->conversation);
+
+            if (!empty($conv)) {
+                $xs->element(
+                    'link', array(
+                        'rel' => 'ostatus:conversation',
+                        'href' => $conv->uri
                     )
                 );
+            }
         }
 
         $reply_ids = $this->getReplies();
 
         foreach ($reply_ids as $id) {
             $profile = Profile::staticGet('id', $id);
-            if (!empty($profile)) {
+           if (!empty($profile)) {
                 $xs->element(
                     'link', array(
                         'rel' => 'ostatus:attention',
-- 
cgit v1.2.3-54-g00ecf