Minor changes to ApiCheckNicknameAction, syntax and exception handling mostly

diff --git a/actions/apichecknickname.php b/actions/apichecknickname.php
index b0e1c1c1db7bf66c814cfae2c36f9aaa061f82e8..4f80a7f29ea7e1bb92b846bd09cbc8457aa52d30 100644 (file)
--- a/actions/apichecknickname.php
+++ b/actions/apichecknickname.php
@@ -41,23 +41,22 @@ class ApiCheckNicknameAction extends ApiAction
         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);
+            $nickname_ok = $this->nicknameExists($nickname) ? 0 : 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);
@@ -67,7 +66,6 @@ class ApiCheckNicknameAction extends ApiAction
     function nicknameExists($nickname)
     {
         $user = User::staticGet('nickname', $nickname);
-        return is_object($user);
-    }    
-    
+        return ($user instanceof User);
+    }
 }