X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapigroupjoin.php;h=3e571801f265ac3fd21493beb5491931367e6b65;hb=0a20abf1d8a9a068df9310d6903cc303f39b25ed;hp=5265ec629ed85a2e205cb5ad5d35571640491071;hpb=696e4ba393c658d5b2e1fe46e1389bd7b2cfdb34;p=quix0rs-gnu-social.git

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 5265ec629e..3e571801f2 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Joins the authenticated user to the group speicified by ID
  *
@@ -49,9 +47,10 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiGroupJoinAction extends ApiAuthAction
 {
+    protected $needPost = true;
+
     var $group   = null;
 
     /**
@@ -60,14 +59,11 @@ class ApiGroupJoinAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $this->user  = $this->auth_user;
         $this->group = $this->getTargetGroup($this->arg('id'));
 
         return true;
@@ -76,72 +72,41 @@ class ApiGroupJoinAction extends ApiAuthAction
     /**
      * Handle the request
      *
-     * Save the new message
-     *
-     * @param array $args $_REQUEST data (unused)
+     * Join the authenticated user to the group
      *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(
-                _('This method requires a POST.'),
-                400,
-                $this->format
-            );
-            return;
-        }
-
-        if (empty($this->user)) {
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return;
+        if (empty($this->scoped)) {
+            // TRANS: Client error displayed when trying to have a non-existing user join a group.
+            $this->clientError(_('No such user.'), 404);
         }
 
         if (empty($this->group)) {
-            $this->clientError(_('Group not found.'), 404, $this->format);
-            return false;
+            // TRANS: Client error displayed when trying to join a group that does not exist.
+            $this->clientError(_('Group not found.'), 404);
         }
 
-        if ($this->user->isMember($this->group)) {
-            $this->clientError(
-                _('You are already a member of that group.'),
-                403,
-                $this->format
-            );
-            return;
+        if ($this->scoped->isMember($this->group)) {
+            // TRANS: Server error displayed when trying to join a group the user is already a member of.
+            $this->clientError(_('You are already a member of that group.'), 403);
         }
 
-        if (Group_block::isBlocked($this->group, $this->user->getProfile())) {
-            $this->clientError(
-                _('You have been blocked from that group by the admin.'),
-                403,
-                $this->format
-            );
-            return;
+        if (Group_block::isBlocked($this->group, $this->scoped)) {
+            // TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+            $this->clientError(_('You have been blocked from that group by the admin.'), 403);
         }
 
-        $member = new Group_member();
-
-        $member->group_id   = $this->group->id;
-        $member->profile_id = $this->user->id;
-        $member->created    = common_sql_now();
-
-        $result = $member->insert();
-
-        if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(
-                sprintf(
-                    _('Could not join user %1$s to group %2$s.'),
-                    $this->user->nickname,
-                    $this->group->nickname
-                )
-            );
-            return;
+        try {
+            $this->scoped->joinGroup($this->group);
+        } catch (Exception $e) {
+            // TRANS: Server error displayed when joining a group failed in the database.
+            // TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
+            $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
+                                       $this->scoped->nickname, $this->group->nickname));
         }
 
         switch($this->format) {
@@ -152,13 +117,8 @@ class ApiGroupJoinAction extends ApiAuthAction
             $this->showSingleJsonGroup($this->group);
             break;
         default:
-            $this->clientError(
-                _('API method not found.'),
-                404,
-                $this->format
-            );
-            break;
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), 404);
         }
     }
-
 }