From 3e18894bb5c80b704f6bad61c1fb08407b8dc0d9 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sat, 2 Mar 2024 15:20:33 -0500 Subject: [PATCH] fix(pterodactyl): only check if a message is a chat message if it isn't a server message --- pterodactyl/websocket.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pterodactyl/websocket.py b/pterodactyl/websocket.py index dbc86e3..dd5a006 100644 --- a/pterodactyl/websocket.py +++ b/pterodactyl/websocket.py @@ -57,20 +57,21 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None: for page in pagified_content: await channel.send(content=page) - chat_message = await check_if_chat_message(content) - if chat_message: - info = await get_info(chat_message['username']) - if info is not None: - await send_chat_discord(coginstance, chat_message['username'], chat_message['message'], info['data']['player']['avatar']) - else: - await send_chat_discord(coginstance, chat_message['username'], chat_message['message'], 'https://seafsh.cc/u/j3AzqQ.png') - server_message = await check_if_server_message(content) if server_message: channel = coginstance.bot.get_channel(await config.chat_channel()) if channel is not None: await channel.send(server_message if len(server_message) < 2000 else server_message[:1997] + '...', allowed_mentions=discord.AllowedMentions.none()) + else: + chat_message = await check_if_chat_message(content) + if chat_message: + info = await get_info(chat_message['username']) + if info is not None: + await send_chat_discord(coginstance, chat_message['username'], chat_message['message'], info['data']['player']['avatar']) + else: + await send_chat_discord(coginstance, chat_message['username'], chat_message['message'], 'https://seafsh.cc/u/j3AzqQ.png') + join_message = await check_if_join_message(content) if join_message: channel = coginstance.bot.get_channel(await config.chat_channel())