Merge pull request #1263 from MoMMde/master

Improving status code & added Mojang/Minecraft
pull/1271/head
Siddharth Dushantha 3 years ago committed by GitHub
commit 2ab7ca6cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1103,6 +1103,14 @@
"username_claimed": "blue", "username_claimed": "blue",
"username_unclaimed": "noonewouldeverusethis7" "username_unclaimed": "noonewouldeverusethis7"
}, },
"Minecraft": {
"errorType": "status_code",
"errorCode": 204,
"url": "https://api.mojang.com/users/profiles/minecraft/{}",
"urlMain": "https://minecraft.net/",
"username_claimed": "blue",
"username_unclaimed": "noonewouldeverusethis7"
},
"MyAnimeList": { "MyAnimeList": {
"errorType": "status_code", "errorType": "status_code",
"url": "https://myanimelist.net/profile/{}", "url": "https://myanimelist.net/profile/{}",

@ -331,6 +331,7 @@ def sherlock(username, site_data, query_notify,
# Get the expected error type # Get the expected error type
error_type = net_info["errorType"] error_type = net_info["errorType"]
error_code = net_info.get("errorCode")
# Retrieve future and ensure it has finished # Retrieve future and ensure it has finished
future = net_info["request_future"] future = net_info["request_future"]
@ -395,8 +396,15 @@ def sherlock(username, site_data, query_notify,
QueryStatus.AVAILABLE, QueryStatus.AVAILABLE,
query_time=response_time) query_time=response_time)
elif error_type == "status_code": elif error_type == "status_code":
# Checks if the Status Code is equal to the optional "errorCode" given in 'data.json'
if error_code == r.status_code:
result = QueryResult(username,
social_network,
url,
QueryStatus.AVAILABLE,
query_time=response_time)
# Checks if the status code of the response is 2XX # Checks if the status code of the response is 2XX
if not r.status_code >= 300 or r.status_code < 200: elif not r.status_code >= 300 or r.status_code < 200:
result = QueryResult(username, result = QueryResult(username,
social_network, social_network,
url, url,

Loading…
Cancel
Save