From 0c62c686756de0752cdd44b63c10cf6e4047860f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 20 Feb 2010 20:34:29 -0500
Subject: [PATCH] do some double-checks on favor and disfavor handlers in
 OStatusPlugin

---
 plugins/OStatus/OStatusPlugin.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 5081c4d983..29799b0dc1 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -365,16 +365,21 @@ class OStatusPlugin extends Plugin
      * @param Notice $notice being favored
      * @return hook return value
      */
-    function onEndFavorNotice($profile, Notice $notice)
+    function onEndFavorNotice(Profile $profile, Notice $notice)
     {
-        if ($profile instanceof User) {
-            // @fixme upstream function should clarify its parameters
-            $profile = $profile->getProfile();
+        $user = User::staticGet('id', $profile->id);
+
+        if (empty($user)) {
+            return true;
         }
+
         $oprofile = Ostatus_profile::staticGet('profile_id', $notice->profile_id);
+
         if ($oprofile) {
             $oprofile->notify($profile, ActivityVerb::FAVORITE, $notice);
         }
+
+        return true;
     }
 
     /**
@@ -386,10 +391,18 @@ class OStatusPlugin extends Plugin
      */
     function onEndDisfavorNotice(Profile $profile, Notice $notice)
     {
+        $user = User::staticGet('id', $profile->id);
+
+        if (empty($user)) {
+            return true;
+        }
+
         $oprofile = Ostatus_profile::staticGet('profile_id', $notice->profile_id);
+
         if ($oprofile) {
             $oprofile->notify($profile, ActivityVerb::UNFAVORITE, $notice);
         }
-    }
 
+        return true;
+    }
 }