From 26e5bd91298747597df05bb467da8112d9597a70 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 2 Mar 2024 12:36:38 -0500 Subject: [PATCH] fix(pterodactyl): check if server message is from Server or Rcon before sending to chat channel --- .docs/pterodactyl/configuration.md | 2 +- pterodactyl/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.docs/pterodactyl/configuration.md b/.docs/pterodactyl/configuration.md index bd0213e..5bcac12 100644 --- a/.docs/pterodactyl/configuration.md +++ b/.docs/pterodactyl/configuration.md @@ -145,7 +145,7 @@ This regex pattern is used to detect whenever a server message is sent. You will Default value: ```re -^\[\d{2}:\d{2}:\d{2} INFO\]:( \[Not Secure\])? \[.*\] (.*) +^\[\d{2}:\d{2}:\d{2} INFO\]:( \[Not Secure\])? \[?:(Server|Rcon)\] (.*) ``` ## `serverid` diff --git a/pterodactyl/config.py b/pterodactyl/config.py index fec0336..accbc3b 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\])? \[?:(Server|Rcon)\] (.*)", 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) \[(.*)\]$",