cswimr/SeaCogs
cswimr/SeaCogs
1
1
Fork 1
Code Issues 10 Pull requests 4 Projects 1 Packages 1 Wiki Activity Actions

fix(pterodactyl): removed a bunch of useless/redundant logging statements
Some checks failed
Actions / Lint Code (Ruff & Pylint) (push) Failing after 19s
Details
Actions / Build Documentation (MkDocs) (push) Successful in 23s
Details

Browse source
This commit is contained in:
Seaswimmer 2024-03-04 23:12:32 -05:00
parent 0baad46298
commit d01985eea6
Signed by: cswimr
GPG key ID: B8953EC01E5C4063
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pterodactyl/websocket.py
View file

@ -167,38 +167,31 @@ async def check_if_server_message(text: str) -> Union[bool, str]:
return False return False
async def check_if_chat_message(text: str) -> Union[bool, dict]: async def check_if_chat_message(text: str) -> Union[bool, dict]:
logger.debug("Checking if message is a chat message")
regex = await config.chat_regex() regex = await 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:
groups = {"username": match.group(1), "message": match.group(2)} groups = {"username": match.group(1), "message": match.group(2)}
logger.debug("Message is a chat message\n%s", json.dumps(groups)) logger.debug("Message is a chat message\n%s", json.dumps(groups))
return groups return groups
logger.debug("Message is not a chat message")
return False return False
async def check_if_join_message(text: str) -> Union[bool, str]: async def check_if_join_message(text: str) -> Union[bool, str]:
logger.debug("Checking if message is a join message")
regex = await config.join_regex() regex = await config.join_regex()
match: Optional[re.Match[str]] = re.match(regex, text) match: Optional[re.Match[str]] = re.match(regex, text)
if match: if match:
logger.debug("Message is a join message") logger.debug("Message is a join message")
return match.group(1) return match.group(1)
logger.debug("Message is not a join message")
return False return False
async def check_if_leave_message(text: str) -> Union[bool, str]: async def check_if_leave_message(text: str) -> Union[bool, str]:
logger.debug("Checking if message is a leave message")
regex = await config.leave_regex() regex = await config.leave_regex()
match: Optional[re.Match[str]] = re.match(regex, text) match: Optional[re.Match[str]] = re.match(regex, text)
if match: if match:
logger.debug("Message is a leave message") logger.debug("Message is a leave message")
return match.group(1) return match.group(1)
logger.debug("Message is not a leave message")
return False return False
async def check_if_achievement_message(text: str) -> Union[bool, dict]: async def check_if_achievement_message(text: str) -> Union[bool, dict]:
logger.debug("Checking if message is an achievement message")
regex = await config.achievement_regex() regex = await config.achievement_regex()
match: Optional[re.Match[str]] = re.match(regex, text) match: Optional[re.Match[str]] = re.match(regex, text)
if match: if match:
@ -207,9 +200,8 @@ async def check_if_achievement_message(text: str) -> Union[bool, dict]:
groups["challenge"] = True groups["challenge"] = True
else: else:
groups["challenge"] = False groups["challenge"] = False
logger.debug("Message is an achievement message\n%s", json.dumps(groups)) logger.debug("Message is an achievement message")
return groups return groups
logger.debug("Message is not an achievement message")
return False return False
async def get_info(username: str) -> Optional[dict]: async def get_info(username: str) -> Optional[dict]:
@ -218,7 +210,7 @@ async def get_info(username: str) -> Optional[dict]:
async with aiohttp.ClientSession() as session: async with aiohttp.ClientSession() as session:
async with session.get(f"https://playerdb.co/api/player/{endpoint}/{username}") as response: async with session.get(f"https://playerdb.co/api/player/{endpoint}/{username}") as response:
if response.status == 200: if response.status == 200:
logger.debug("Player info retrieved for %s\n%s", username, json.dumps(await response.json())) logger.debug("Player info retrieved for %s", username)
return await response.json() return await response.json()
logger.error("Failed to retrieve player info for %s: %s", username, response.status) logger.error("Failed to retrieve player info for %s: %s", username, response.status)
return None return None
@ -234,7 +226,7 @@ async def send_chat_discord(coginstance: Pterodactyl, username: str, message: st
await webhook.send(content=message, username=username, avatar_url=avatar_url, allowed_mentions=discord.AllowedMentions(everyone=False, roles=False, users=True)) await webhook.send(content=message, username=username, avatar_url=avatar_url, allowed_mentions=discord.AllowedMentions(everyone=False, roles=False, users=True))
logger.debug("Chat message sent to Discord") logger.debug("Chat message sent to Discord")
else: else:
logger.debug("Chat channel not set. Skipping sending chat message to Discord") logger.warn("Chat channel not set. Skipping sending chat message to Discord")
async def generate_join_leave_embed(username: str, join: bool) -> discord.Embed: async def generate_join_leave_embed(username: str, join: bool) -> discord.Embed:
embed = discord.Embed() embed = discord.Embed()
@ -261,7 +253,7 @@ async def generate_achievement_embed(username: str, achievement: str, challenge:
return embed return embed
def mask_ip(string: str) -> str: def mask_ip(string: str) -> str:
def check(match): def check(match: re.Match[str]):
ip = match.group(0) ip = match.group(0)
masked_ip = '.'.join(r'\*' * len(octet) for octet in ip.split('.')) masked_ip = '.'.join(r'\*' * len(octet) for octet in ip.split('.'))
return masked_ip return masked_ip