From e9523d5f70a8f2477c865d39d59169924f39e82b Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Fri, 1 Mar 2024 22:24:02 -0500 Subject: [PATCH] fix(pterodactyl): fixed server messages sometimes not logging --- pterodactyl/config.py | 2 +- pterodactyl/websocket.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pterodactyl/config.py b/pterodactyl/config.py index d377614..a116375 100644 --- a/pterodactyl/config.py +++ b/pterodactyl/config.py @@ -11,7 +11,7 @@ def register_config(config_obj: Config) -> None: startup_arguments=None, current_status='', chat_regex=r"\[(\d{2}:\d{2}:\d{2})\sINFO\]:\s<(\w+)>\s(.*)", - server_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]: \[Not Secure\] \[.*\] (.*)", + server_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]:( \[Not Secure\])? \[.*\] (.*)", join_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]: ([^<\n]+) joined the game$", leave_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]: ([^<\n]+) left the game$", achievement_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]: (.*) has (made the advancement|completed the challenge) \[(.*)\]$", diff --git a/pterodactyl/websocket.py b/pterodactyl/websocket.py index 7c5f605..5f8e159 100644 --- a/pterodactyl/websocket.py +++ b/pterodactyl/websocket.py @@ -153,7 +153,7 @@ async def check_if_server_message(text: str) -> Union[bool, str]: match: Optional[re.Match[str]] = re.match(regex, text) if match: logger.debug("Message is a server message") - return match.group(1) + return match.group(2) logger.debug("Message is not a server message") return False