maxigames/SeaCogs
1
0
Fork 0
forked from blizzthewolf/SeaCogs
Code Pull requests Activity

fix(pterodactyl): pylint fixes

Browse source
This commit is contained in:
Seaswimmer 2024-02-29 22:15:44 -05:00
parent 84b0201662
commit 37cdca09ec
Signed by untrusted user: cswimr
GPG key ID: B8953EC01E5C4063
1 changed files with 44 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pterodactyl/pterodactyl.py
View file

@ -71,7 +71,7 @@ class Pterodactyl(commands.Cog):
while True: while True:
message = await websocket.recv() message = await websocket.recv()
if json.loads(message)['event'] in ['token expiring', 'token expired']: if json.loads(message)['event'] in ('token expiring', 'token expired'):
self.logger.debug("Received token expiring/expired event. Refreshing token.") self.logger.debug("Received token expiring/expired event. Refreshing token.")
websocket_credentials = client.servers.get_websocket(server_id) websocket_credentials = client.servers.get_websocket(server_id)
auth_message = json.dumps({"event": "auth", "args": [websocket_credentials['data']['token']]}) auth_message = json.dumps({"event": "auth", "args": [websocket_credentials['data']['token']]})
@ -82,7 +82,7 @@ class Pterodactyl(commands.Cog):
self.logger.info("WebSocket authentication successful") self.logger.info("WebSocket authentication successful")
if json.loads(message)['event'] == 'console output' and await self.config.console_channel() is not None: if json.loads(message)['event'] == 'console output' and await self.config.console_channel() is not None:
if current_status == 'running' or current_status == 'offline' or current_status == '': if current_status in ('running', 'offline', ''):
content = self.remove_ansi_escape_codes(json.loads(message)['args'][0]) content = self.remove_ansi_escape_codes(json.loads(message)['args'][0])
channel = self.bot.get_channel(await self.config.console_channel()) channel = self.bot.get_channel(await self.config.console_channel())
@ -117,9 +117,9 @@ class Pterodactyl(commands.Cog):
regex = await self.config.chat_regex() regex = await self.config.chat_regex()
match: Optional[re.Match[str]] = re.match(regex, text) match: Optional[re.Match[str]] = re.match(regex, text)
if match: if match:
dict = {"time": match.group(1), "username": match.group(2), "message": match.group(3)} groups = {"time": match.group(1), "username": match.group(2), "message": match.group(3)}
self.logger.debug("Message is a chat message\n%s", json.dumps(dict)) self.logger.debug("Message is a chat message\n%s", json.dumps(groups))
return dict return groups
self.logger.debug("Message is not a chat message") self.logger.debug("Message is not a chat message")
return False return False
@ -131,7 +131,6 @@ class Pterodactyl(commands.Cog):
if response.status == 200: if response.status == 200:
self.logger.debug("Player info retrieved for %s\n%s", username, json.dumps(await response.json())) self.logger.debug("Player info retrieved for %s\n%s", username, json.dumps(await response.json()))
return await response.json() return await response.json()
else:
self.logger.error("Failed to retrieve player info for %s: %s", username, response.status) self.logger.error("Failed to retrieve player info for %s: %s", username, response.status)
return None return None
@ -165,7 +164,7 @@ class Pterodactyl(commands.Cog):
fut.result() fut.result()
except asyncio.CancelledError: except asyncio.CancelledError:
pass pass
except Exception as e: except Exception as e: # pylint: disable=broad-exception-caught
self.logger.error("WebSocket task has failed: %s", e, exc_info=e) self.logger.error("WebSocket task has failed: %s", e, exc_info=e)
self.task.cancel() self.task.cancel()
self.task = self.get_task() self.task = self.get_task()