Skip to content

Commit 99ea6f0

Browse files
authored
Merge pull request #11 from PyBotDevs/refactor-imports
Refactor `json.loads()` as `parse()`
2 parents 281e626 + f68b978 commit 99ea6f0

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

api.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Used for accessing the Skyblock API."""
22
# Imports
33
import requests
4-
import json
4+
from json import loads as parse
55

66
# Functions
77
class Skyblock:
@@ -10,15 +10,15 @@ def __init__(self, api_key: str):
1010

1111
def get_uuid(self, player_name: str) -> str:
1212
api_request = requests.get(f"https://api.mojang.com/users/profiles/minecraft/{player_name}")
13-
content = json.loads(api_request.content)
13+
content = parse(api_request.content)
1414
return content["id"]
1515

1616
# API Retrieval Commands
1717
def get_player_info(self, player_name: str) -> dict:
1818
"""Fetches data of a specific player, including game stats."""
1919
player_uuid = self.get_uuid(player_name)
2020
api_request = requests.get(f"https://api.hypixel.net/player?key={self.api_key}&uuid={player_uuid}").content
21-
player_data = json.loads(api_request)
21+
player_data = parse(api_request)
2222
return player_data
2323

2424
def get_auctions(self, page: int = 0) -> dict:
@@ -29,75 +29,75 @@ def get_auctions(self, page: int = 0) -> dict:
2929
* `page`: View a specific page of auctions.
3030
"""
3131
api_request = requests.get(f"https://api.hypixel.net/skyblock/auctions?key={self.api_key}&page={page}").content
32-
auctions = json.loads(api_request)
32+
auctions = parse(api_request)
3333
return auctions
3434

3535
def get_player_auctions(self, player_name: str) -> dict:
3636
"""Returns a `dict` of all Skyblock auctions from a particular player."""
3737
player_uuid = self.get_uuid(player_name)
3838
api_request = requests.get(f"https://api.hypixel.net/skyblock/auction?key={self.api_key}&player={player_uuid}").content
39-
player_auctions = json.loads(api_request)
39+
player_auctions = parse(api_request)
4040
return player_auctions
4141

4242
def get_recently_ended_auctions(self) -> dict:
4343
"""Returns a `dict` of all the auctions that have recently ended within 60 seconds."""
4444
api_request = requests.get("https://api.hypixel.net/skyblock/auctions_ended").content
45-
recently_ended_auctions = json.loads(api_request)
45+
recently_ended_auctions = parse(api_request)
4646
return recently_ended_auctions
4747

4848
def get_news(self) -> dict:
4949
"""Returns a `dict` of the latest Skyblock news from Hypixel."""
5050
api_request = requests.get(f"https://api.hypixel.net/skyblock/news?key={self.api_key}").content
51-
news = json.loads(api_request)
51+
news = parse(api_request)
5252
return news
5353

5454
def get_bazaar_data(self) -> dict:
5555
"""Returns a `dict` of Skyblock bazaar data."""
5656
api_request = requests.get(f"https://api.hypixel.net/skyblock/bazaar?key={self.api_key}").content
57-
bazaar_data = json.loads(api_request)
57+
bazaar_data = parse(api_request)
5858
return bazaar_data
5959

6060
def get_player_profile(self, player_name: str) -> dict:
6161
"""Returns a `dict` of profile data on a player."""
6262
player_uuid = self.get_uuid(player_name)
6363
api_request = requests.get(f"https://api.hypixel.net/skyblock/profiles?key={self.api_key}&uuid={player_uuid}").content
64-
player_profile_data = json.loads(api_request)
64+
player_profile_data = parse(api_request)
6565
return player_profile_data
6666

6767
def get_collections(self) -> dict:
6868
"""Returns a `dict` of information related to Skyblock Collections."""
6969
api_request = requests.get("https://api.hypixel.net/resources/skyblock/collections").content
70-
collections_data = json.loads(api_request)
70+
collections_data = parse(api_request)
7171
return collections_data
7272

7373
def get_skills(self) -> dict:
7474
"""Returns a `dict` of information related to Skyblock Skills."""
7575
api_request = requests.get("https://api.hypixel.net/resources/skyblock/skills").content
76-
collections_data = json.loads(api_request)
76+
collections_data = parse(api_request)
7777
return collections_data
7878

7979
def get_items(self) -> dict:
8080
"""Returns a `dict` of information related to Skyblock items."""
8181
api_request = requests.get("https://api.hypixel.net/resources/skyblock/items").content
82-
items_data = json.loads(api_request)
82+
items_data = parse(api_request)
8383
return items_data
8484

8585
def get_mayor_information(self) -> dict:
8686
"""Returns a `dict` of information regarding the current mayor in Skyblock."""
8787
api_request = requests.get("https://api.hypixel.net/resources/skyblock/election").content
88-
mayor_info = json.loads(api_request)
88+
mayor_info = parse(api_request)
8989
del mayor_info["current"]
9090
return mayor_info
9191

9292
def get_current_election(self) -> dict:
9393
"""Returns a `dict` of information regarding the current election in Skyblock."""
9494
api_request = requests.get("https://api.hypixel.net/resources/skyblock/election").content
95-
election_info = json.loads(api_request)
95+
election_info = parse(api_request)
9696
del election_info["mayor"]
9797
return election_info
9898

9999
def get_bingo_event(self) -> dict:
100100
"""Returns a `dict` of information regarding the current bingo event and goals in Skyblock."""
101101
api_request = requests.get("https://api.hypixel.net/resources/skyblock/bingo").content
102-
bingo_data = json.loads(api_request)
102+
bingo_data = parse(api_request)
103103
return bingo_data

0 commit comments

Comments
 (0)