From 2f1953ca257ed3d65701357b9535daa691ea6494 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 18 Sep 2011 14:06:35 -0400
Subject: [PATCH] Correct args for join event

---
 plugins/OStatus/OStatusPlugin.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 78408365df..a7179eb47a 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -752,11 +752,11 @@ class OStatusPlugin extends Plugin
      * deny the join.
      *
      * @param User_group $group
-     * @param User $user
+     * @param Profile    $profile
      *
      * @return mixed hook return value
      */
-    function onStartJoinGroup($group, $user)
+    function onStartJoinGroup($group, $profile)
     {
         $oprofile = Ostatus_profile::staticGet('group_id', $group->id);
         if ($oprofile) {
@@ -768,15 +768,13 @@ class OStatusPlugin extends Plugin
             // NOTE: we don't use Group_member::asActivity() since that record
             // has not yet been created.
 
-            $member = Profile::staticGet($user->id);
-
             $act = new Activity();
             $act->id = TagURI::mint('join:%d:%d:%s',
-                                    $member->id,
+                                    $profile->id,
                                     $group->id,
                                     common_date_iso8601(time()));
 
-            $act->actor = ActivityObject::fromProfile($member);
+            $act->actor = ActivityObject::fromProfile($profile);
             $act->verb = ActivityVerb::JOIN;
             $act->object = $oprofile->asActivityObject();
 
@@ -786,10 +784,10 @@ class OStatusPlugin extends Plugin
             // TRANS: Success message for subscribe to group attempt through OStatus.
             // TRANS: %1$s is the member name, %2$s is the subscribed group's name.
             $act->content = sprintf(_m('%1$s has joined group %2$s.'),
-                                    $member->getBestName(),
+                                    $profile->getBestName(),
                                     $oprofile->getBestName());
 
-            if ($oprofile->notifyActivity($act, $member)) {
+            if ($oprofile->notifyActivity($act, $profile)) {
                 return true;
             } else {
                 $oprofile->garbageCollect();
@@ -809,7 +807,7 @@ class OStatusPlugin extends Plugin
      * it'll be left with a stray membership record.
      *
      * @param User_group $group
-     * @param Profile $user
+     * @param Profile $profile
      *
      * @return mixed hook return value
      */
-- 
2.39.2