Debugging log fix.

[quix0rs-gnu-social.git] / plugins / OStatus / actions / groupsalmon.php

diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php
index 0a43c37237ff2942e1726f78d4f8b636b9366319..921221498fbc2f0337aa6ab66e860847b5183c37 100644 (file)
--- a/plugins/OStatus/actions/groupsalmon.php
+++ b/plugins/OStatus/actions/groupsalmon.php
@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * @package OStatusPlugin
@@ -29,7 +27,7 @@ class GroupsalmonAction extends SalmonAction
 {
     var $group = null;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -40,9 +38,9 @@ class GroupsalmonAction extends SalmonAction
             $this->clientError(_m('No ID.'));
         }
 
-        $this->group = User_group::staticGet('id', $id);
+        $this->group = User_group::getKV('id', $id);
 
-        if (empty($this->group)) {
+        if (!$this->group instanceof User_group) {
             // TRANS: Client error.
             $this->clientError(_m('No such group.'));
         }
@@ -50,8 +48,8 @@ class GroupsalmonAction extends SalmonAction
 
         $this->target = $this->group;
 
-        $oprofile = Ostatus_profile::staticGet('group_id', $id);
-        if ($oprofile) {
+        $remote_group = Ostatus_profile::getKV('group_id', $id);
+        if ($remote_group instanceof Ostatus_profile) {
             // TRANS: Client error.
             $this->clientError(_m('Cannot accept remote posts for a remote group.'));
         }
@@ -78,21 +76,23 @@ class GroupsalmonAction extends SalmonAction
         }
 
         // Notice must be to the attention of this group
-        $context = $this->activity->context;
-
-        if (empty($context->attention)) {
+        if (empty($this->activity->context->attention)) {
             // TRANS: Client exception.
             throw new ClientException("Not to the attention of anyone.");
         } else {
             $uri = common_local_url('groupbyid', array('id' => $this->group->id));
-            if (!in_array($uri, $context->attention)) {
+
+            if (!array_key_exists($uri, $this->activity->context->attention)) {
                 // TRANS: Client exception.
                 throw new ClientException("Not to the attention of this group.");
             }
         }
 
-        $profile = $this->ensureProfile();
-        $this->saveNotice();
+        try {
+            $this->saveNotice();
+        } catch (AlreadyFulfilledException $e) {
+            return;
+        }
     }
 
     /**
@@ -124,37 +124,30 @@ class GroupsalmonAction extends SalmonAction
      */
     function handleJoin()
     {
-        $oprofile = $this->ensureProfile();
-        if (!$oprofile) {
-            // TRANS: Client error.
-            $this->clientError(_m('Cannot read profile to set up group membership.'));
-        }
-        if ($oprofile->isGroup()) {
+        if ($this->oprofile->isGroup()) {
             // TRANS: Client error.
             $this->clientError(_m('Groups cannot join groups.'));
         }
 
-        common_log(LOG_INFO, "Remote profile {$oprofile->uri} joining local group {$this->group->nickname}");
-        $profile = $oprofile->localProfile();
+        common_log(LOG_INFO, sprintf('Remote profile %s joining local group %s', $this->oprofile->getUri(), $this->group->getNickname()));
 
-        if ($profile->isMember($this->group)) {
+        if ($this->actor->isMember($this->group)) {
             // Already a member; we'll take it silently to aid in resolving
             // inconsistencies on the other side.
             return true;
         }
 
-        if (Group_block::isBlocked($this->group, $profile)) {
+        if (Group_block::isBlocked($this->group, $this->actor)) {
             // TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
             $this->clientError(_m('You have been blocked from that group by the admin.'), 403);
-            return false;
         }
 
         try {
-            $profile->joinGroup($this->group);
+            $this->actor->joinGroup($this->group);
         } catch (Exception $e) {
             // TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
             $this->serverError(sprintf(_m('Could not join remote user %1$s to group %2$s.'),
-                                       $oprofile->uri, $this->group->nickname));
+                                       $this->oprofile->getUri(), $this->group->getNickname()));
         }
     }
 
@@ -163,27 +156,19 @@ class GroupsalmonAction extends SalmonAction
      */
     function handleLeave()
     {
-        $oprofile = $this->ensureProfile();
-        if (!$oprofile) {
-            // TRANS: Client error displayed when group membership cannot be cancelled
-            // TRANS: because the remote profile could not be read.
-            $this->clientError(_m('Cannot read profile to cancel group membership.'));
-        }
-        if ($oprofile->isGroup()) {
+        if ($this->oprofile->isGroup()) {
             // TRANS: Client error displayed when trying to have a group join another group.
-            $this->clientError(_m('Groups cannot join groups.'));
+            throw new AlreadyFulfilledException(_m('Groups cannot be members of groups'));
         }
 
-        common_log(LOG_INFO, "Remote profile {$oprofile->uri} leaving local group {$this->group->nickname}");
-        $profile = $oprofile->localProfile();
+        common_log(LOG_INFO, sprintf('Remote profile %s leaving local group %s', $this->oprofile->getUri(), $this->group->getNickname()));
 
         try {
-            $profile->leaveGroup($this->group);
+            $this->actor->leaveGroup($this->group);
         } catch (Exception $e) {
             // TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
             $this->serverError(sprintf(_m('Could not remove remote user %1$s from group %2$s.'),
-                                       $oprofile->uri, $this->group->nickname));
-            return;
+                                       $this->oprofile->getUri(), $this->group->getNickname()));
         }
     }
 }