Merge pull request #121 from VamatoHD/improve-roblox

Improve roblox check

Author: kaifcodec

user_scanner/gaming/roblox.py

@@ -1,8 +1,8 @@
-from user_scanner.core.orchestrator import generic_validate
+from user_scanner.core.orchestrator import generic_validate, status_validate
 from user_scanner.core.result import Result
 
 
-def validate_roblox(user):
+def validate_roblox(user: str) -> Result:
     # official api
     url = f"https://users.roblox.com/v1/users/search?keyword={user}&limit=10"
 
@@ -13,12 +13,13 @@ def process(response):
             return Result.error("Too many requests")
 
         if response.status_code == 400:
-            error = search_results["errors"][0] #Api states theres always an error
+            # Api states theres always an error
+            error = search_results["errors"][0]
             if error["code"] == 6:
                 return Result.error("Username is too short")
             if error["code"] == 5:
                 return Result.error("Username was filtered")
-            #Shouldn't be able to reach this
+            # Shouldn't be able to reach this
             return Result.error("Invalid username")
 
         # iterates through the entries in the search results
@@ -28,7 +29,16 @@ def process(response):
                 return Result.taken()
         return Result.available()
 
-    return generic_validate(url, process, follow_redirects=True)
+    # First try: Using roblox's API
+    result = generic_validate(url, process, follow_redirects=True)
+
+    if result.get_reason() != "Too many requests":
+        return result
+
+    # If rate limited, uses a simple status validation
+    url = f"https://www.roblox.com/user.aspx?username={user}"
+
+    return status_validate(url, 404, [200, 302], follow_redirects=True)
 
 
 if __name__ == "__main__":