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

fix(pterodactyl): don't detect messages from the server/rcon as chat messages
All checks were successful
Actions / Lint Code (Ruff & Pylint) (push) Successful in 18s
Details
Actions / Build Documentation (MkDocs) (push) Successful in 24s
Details

Browse source
This commit is contained in:
Seaswimmer 2024-03-02 15:29:59 -05:00
parent 8ccb174913
commit 3d7337c42c
Signed by: cswimr
GPG key ID: B8953EC01E5C4063
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.docs/pterodactyl/regex.md
View file

@ -11,7 +11,7 @@
### Chat ### Chat
```re ```re
\[\d{2}:\d{2}:\d{2}\sINFO\]: (?:<|\[)(\w+)(?:>|\]) (.*) \[\d{2}:\d{2}:\d{2}\sINFO\]: (?!\[(?:Server|Rcon)\])(?:<|\[)(\w+)(?:>|\]) (.*)
``` ```
### Join ### Join
@ -43,7 +43,7 @@
### Chat ### Chat
```re ```re
^\[\d{2}:\d{2}:\d{2}\] \[Server thread\/INFO\] \[minecraft\/MinecraftServer\]: (?:<|\[)(\w+)(?:>|\]) (.*) ^\[\d{2}:\d{2}:\d{2}\] \[Server thread\/INFO\] \[minecraft\/MinecraftServer\]: (?!\[(?:Server|Rcon)\])(?:<|\[)(\w+)(?:>|\]) (.*)
``` ```
### Join ### Join

2
pterodactyl/config.py
View file

@ -10,7 +10,7 @@ def register_config(config_obj: Config) -> None:
startup_jar=None, startup_jar=None,
startup_arguments=None, startup_arguments=None,
current_status='', current_status='',
chat_regex=r"\[\d{2}:\d{2}:\d{2}\sINFO\]: (?:<|\[)(\w+)(?:>|\]) (.*)", chat_regex=r"\[\d{2}:\d{2}:\d{2}\sINFO\]: (?!\[(?:Server|Rcon)\])(?:<|\[)(\w+)(?:>|\]) (.*)",
server_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]:(?: \[Not Secure\])? \[(?:Server|Rcon)\] (.*)", 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$", 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$", leave_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]: ([^<\n]+) left the game$",