X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapifriendshipscreate.php;h=3997a8b51c4161d48621e0112bb143fe7683903f;hb=6924bb1d290643da7b4ffb13d9fbb09afaaba22c;hp=a7ec5b28a44452996e666d60c36ce72075fc400b;hpb=c038164c0f41ba5c33f578f395c9fede80d96db8;p=quix0rs-gnu-social.git

diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index a7ec5b28a4..3997a8b51c 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -29,11 +29,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apiauth.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Allows the authenticating users to follow (subscribe) the user specified in
@@ -48,9 +44,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 ApiFriendshipsCreateAction extends ApiAuthAction
 {
+    protected $needPost = true;
+
     var $other  = null;
 
     /**
@@ -61,12 +58,10 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
      * @return boolean success flag
      *
      */
-
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
-        $this->user   = $this->auth_user;
         $this->other  = $this->getTargetProfile($this->arg('id'));
 
         return true;
@@ -77,61 +72,40 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
      *
      * Check the format and show the user info
      *
-     * @param array $args $_REQUEST data (unused)
-     *
      * @return void
      */
-
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(
-                _('This method requires a POST.'),
-                400,
-                $this->format
-            );
-            return;
-        }
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(
-                _('API method not found.'),
-                404,
-                $this->format
-            );
-            return;
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), 404);
         }
 
         if (empty($this->other)) {
-            $this->clientError(
-                _('Could not follow user: profile not found.'),
-                403,
-                $this->format
-            );
-            return;
+            // TRANS: Client error displayed when trying follow who's profile could not be found.
+            $this->clientError(_('Could not follow user: profile not found.'), 403);
         }
 
-        if ($this->user->isSubscribed($this->other)) {
+        if ($this->scoped->isSubscribed($this->other)) {
             $errmsg = sprintf(
+                // TRANS: Client error displayed when trying to follow a user that's already being followed.
+                // TRANS: %s is the nickname of the user that is already being followed.
                 _('Could not follow user: %s is already on your list.'),
                 $this->other->nickname
             );
-            $this->clientError($errmsg, 403, $this->format);
-            return;
+            $this->clientError($errmsg, 403);
         }
 
-        $result = subs_subscribe_to($this->user, $this->other);
-
-        if (is_string($result)) {
-            $this->clientError($result, 403, $this->format);
-            return;
+        try {
+            Subscription::start($this->scoped, $this->other);
+        } catch (AlreadyFulfilledException $e) {
+            $this->clientError($e->getMessage(), 409);
         }
 
         $this->initDocument($this->format);
         $this->showProfile($this->other, $this->format);
         $this->endDocument($this->format);
     }
-
 }