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 +-
 classes/Profile.php | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'classes')

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()
                     )
                 );
             }
diff --git a/classes/Profile.php b/classes/Profile.php
index 8f578c95a..5a86619fd 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -810,10 +810,7 @@ class Profile extends Memcached_DataObject
         $xs->element(
             'id',
             null,
-            common_local_url(
-                'userbyid',
-                array('id' => $this->id)
-                )
+            $this->getUri()
             );
         $xs->element('title', null, $this->getBestName());
 
@@ -835,9 +832,21 @@ class Profile extends Memcached_DataObject
         return $xs->getString();
     }
 
-    function getAcctUri()
+    function getUri()
     {
-        return $this->nickname . '@' . common_config('site', 'server');
+        if (Event::handle('GetProfileUri', array($this))) {
+
+            $remote = Remote_profile::staticGet('id', $this->id);
+
+            if (!empty($remote)) {
+                return $remote->uri;
+            } else {
+                return common_local_url(
+                    'userbyid',
+                    array('id' => $this->id)
+                );
+            }
+        }
     }
 
 }
-- 
cgit v1.2.3-54-g00ecf