nex/college-bot-v1
1
0
Fork 0
mirror of https://github.com/nexy7574/LCC-bot.git synced 2024-09-19 18:16:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix hash test not following redirects

Browse source
This commit is contained in:
Nexus 2023-04-11 14:47:44 +01:00
parent 5feafeea5c
commit 5610318b41
Signed by: nex
GPG key ID: 0FA334385D0B689F
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cogs/uptime.py
View file

@ -118,7 +118,7 @@ class UptimeCompetition(commands.Cog):
@staticmethod @staticmethod
def assert_uptime_server_response(response: Response, expected_hash: str = None): def assert_uptime_server_response(response: Response, expected_hash: str = None):
assert response.status_code == 200 assert response.status_code in range(200, 400), f"Status code {response.status_code} is not in range 200-400"
if expected_hash: if expected_hash:
md5 = hashlib.md5() md5 = hashlib.md5()
md5.update(response.content) md5.update(response.content)
@ -136,7 +136,7 @@ class UptimeCompetition(commands.Cog):
err = RuntimeError("Unknown Error") err = RuntimeError("Unknown Error")
while attempts < max_retries: while attempts < max_retries:
try: try:
response = await self.http.get(url, timeout=timeout) response = await self.http.get(url, timeout=timeout, follow_redirects=True)
response.raise_for_status() response.raise_for_status()
except (httpx.TimeoutException, httpx.HTTPStatusError, ConnectionError, TimeoutError) as err2: except (httpx.TimeoutException, httpx.HTTPStatusError, ConnectionError, TimeoutError) as err2:
attempts += 1 attempts += 1
@ -152,7 +152,7 @@ class UptimeCompetition(commands.Cog):
# First we need to check that we are online. # First we need to check that we are online.
# If we aren't online, this isn't very fair. # If we aren't online, this isn't very fair.
try: try:
await self.http.get("https://discord.com/") await self.http.get("https://google.co.uk/")
except (httpx.HTTPError, Exception): except (httpx.HTTPError, Exception):
return # Offline :pensive: return # Offline :pensive: