]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - plugins/OStatus/actions/groupsalmon.php
Debugging log fix.
[quix0rs-gnu-social.git] / plugins / OStatus / actions / groupsalmon.php
index d60725a71b7e4866625d96242fbca306858f207e..921221498fbc2f0337aa6ab66e860847b5183c37 100644 (file)
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+if (!defined('GNUSOCIAL')) { exit(1); }
+
 /**
  * @package OStatusPlugin
  * @author James Walker <james@status.net>
  */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
 class GroupsalmonAction extends SalmonAction
 {
     var $group = null;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
         $id = $this->trimmed('id');
 
         if (!$id) {
-            $this->clientError(_('No ID.'));
+            // TRANS: Client error.
+            $this->clientError(_m('No ID.'));
         }
 
-        $this->group = User_group::staticGet('id', $id);
+        $this->group = User_group::getKV('id', $id);
 
-        if (empty($this->group)) {
-            $this->clientError(_('No such group.'));
+        if (!$this->group instanceof User_group) {
+            // TRANS: Client error.
+            $this->clientError(_m('No such group.'));
         }
 
-        $oprofile = Ostatus_profile::staticGet('group_id', $id);
-        if ($oprofile) {
-            $this->clientError(_m("Can't accept remote posts for a remote group."));
+
+        $this->target = $this->group;
+
+        $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.'));
         }
 
         return true;
@@ -57,11 +60,10 @@ class GroupsalmonAction extends SalmonAction
     /**
      * We've gotten a post event on the Salmon backchannel, probably a reply.
      */
-
     function handlePost()
     {
         // @fixme process all objects?
-        switch ($this->act->objects[0]->type) {
+        switch ($this->activity->objects[0]->type) {
         case ActivityObject::ARTICLE:
         case ActivityObject::BLOGENTRY:
         case ActivityObject::NOTE:
@@ -69,24 +71,28 @@ class GroupsalmonAction extends SalmonAction
         case ActivityObject::COMMENT:
             break;
         default:
-            throw new ClientException("Can't handle that kind of post.");
+            // TRANS: Client exception.
+            throw new ClientException('Cannot handle that kind of post.');
         }
 
         // Notice must be to the attention of this group
-
-        $context = $this->act->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;
+        }
     }
 
     /**
@@ -116,74 +122,53 @@ class GroupsalmonAction extends SalmonAction
      *        currently we're doing the main logic in joingroup action
      *        and so have to repeat it here.
      */
-
     function handleJoin()
     {
-        $oprofile = $this->ensureProfile();
-        if (!$oprofile) {
-            $this->clientError(_m("Can't read profile to set up group membership."));
-        }
-        if ($oprofile->isGroup()) {
-            $this->clientError(_m("Groups can't join groups."));
+        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)) {
-            $this->clientError(_('You have been blocked from that group by the admin.'), 403);
-            return false;
+        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);
         }
 
         try {
-            // @fixme that event currently passes a user from main UI
-            // Event should probably move into Group_member::join
-            // and take a Profile object.
-            //
-            //if (Event::handle('StartJoinGroup', array($this->group, $profile))) {
-                Group_member::join($this->group->id, $profile->id);
-                //Event::handle('EndJoinGroup', array($this->group, $profile));
-            //}
+            $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()));
         }
     }
 
     /**
      * A remote user left our group.
      */
-
     function handleLeave()
     {
-        $oprofile = $this->ensureProfile();
-        if (!$oprofile) {
-            $this->clientError(_m("Can't read profile to cancel group membership."));
-        }
-        if ($oprofile->isGroup()) {
-            $this->clientError(_m("Groups can't join groups."));
+        if ($this->oprofile->isGroup()) {
+            // TRANS: Client error displayed when trying to have a group join another group.
+            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 {
-            // @fixme event needs to be refactored as above
-            //if (Event::handle('StartLeaveGroup', array($this->group, $profile))) {
-                Group_member::leave($this->group->id, $profile->id);
-                //Event::handle('EndLeaveGroup', array($this->group, $profile));
-            //}
+            $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()));
         }
     }
-
 }