UseFileAsThumbnailException (helps support GIFs)

[quix0rs-gnu-social.git] / actions / apifriendshipscreate.php

diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index 993280981845331e8f95206f93272d33fc931737..873883c6513bd4ea8bac56c2dd2ebe79cedd5edb 100644 (file)
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Allows the authenticating users to follow (subscribe) the user specified in
  * the ID parameter.  Returns the befriended user in the requested format when
@@ -50,6 +48,8 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  */
 class ApiFriendshipsCreateAction extends ApiAuthAction
 {
+    protected $needPost = true;
+
     var $other  = null;
 
     /**
@@ -60,11 +60,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;
@@ -75,42 +74,20 @@ 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(
-                // TRANS: Client error. POST is a HTTP command. It should not be translated.
-                _('This method requires a POST.'),
-                400,
-                $this->format
-            );
-            return;
-        }
+        parent::handle();
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(
-                // TRANS: Client error displayed when coming across a non-supported API method.
-                _('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(
-                // TRANS: Client error displayed when trying follow who's profile could not be found.
-                _('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)) {
@@ -120,15 +97,13 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
                 _('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->user->getProfile(), $this->other);
+        } catch (Exception $e) {
+            $this->clientError($e->getMessage(), 403);
         }
 
         $this->initDocument($this->format);