Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/actions/apichecknickname.php b/actions/apichecknickname.php
index b0e1c1c1db7bf66c814cfae2c36f9aaa061f82e8..a950dee135dfc72f039edb505af6e8fcbd455f07 100644 (file)
--- a/actions/apichecknickname.php
+++ b/actions/apichecknickname.php
@@ -5,7 +5,7 @@
  *
  * Check nickname
  *
- * Returns 1 if nickname is ok, 0 if not
+ * Returns 1 if nickname is available on this instance, 0 if not. Error if site is private.
  *
  * PHP version 5
  *
@@ -34,40 +34,36 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 class ApiCheckNicknameAction extends ApiAction
 {
 
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
+        if (common_config('site', 'private')) {
+            $this->clientError(_('This site is private.'), 403);
+        }
+
         if ($this->format !== 'json') {
             $this->clientError('This method currently only serves JSON.', 415);
         }
-        
+
         return true;
     }
 
     protected function handle()
     {
         parent::handle();
-       
+
         $nickname = $this->trimmed('nickname');
-               
-        if ($this->nicknameExists($nickname)) {
+
+        try {
+            Nickname::normalize($nickname, true);
+            $nickname_ok = 1;
+        } catch (NicknameException $e) {
             $nickname_ok = 0;
-        } else if (!User::allowed_nickname($nickname)) {
-            $nickname_ok = 0;        }
-        else {
-            $nickname_ok = 1;          
-               }
+        }
 
         $this->initDocument('json');
         $this->showJsonObjects($nickname_ok);
         $this->endDocument('json');
     }
-    
-    function nicknameExists($nickname)
-    {
-        $user = User::staticGet('nickname', $nickname);
-        return is_object($user);
-    }    
-    
 }