Rosie-Val/SeaCogs
1
0
Fork 0
Code Pull requests Activity

fix(pterodactyl): use re.search instead of re.match (thanks zephyrkul)

Browse source
This commit is contained in:
Seaswimmer 2024-03-02 20:09:39 -05:00
parent 9106675276
commit 58e88f2dd6
Signed by untrusted user: cswimr
GPG key ID: B8953EC01E5C4063
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pterodactyl/websocket.py
View file

@ -47,9 +47,7 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
if json.loads(message)['event'] == 'console output' and await config.console_channel() is not None: if json.loads(message)['event'] == 'console output' and await config.console_channel() is not None:
msg = json.loads(message)['args'][0] msg = json.loads(message)['args'][0]
regex_blacklist: dict = await config.regex_blacklist() regex_blacklist: dict = await config.regex_blacklist()
for regex in regex_blacklist.values(): matches = [re.search(regex, msg) for regex in regex_blacklist.values()]
logger.debug(regex)
matches = [re.match(regex, msg) for regex in regex_blacklist.values()]
if await config.current_status() in ('running', 'offline', '') and not any(matches): if await config.current_status() in ('running', 'offline', '') and not any(matches):
content = remove_ansi_escape_codes(msg) content = remove_ansi_escape_codes(msg)