forked from cswimr/SeaCogs
fix(pterodactyl): only check if a message is a chat message if it isn't a server message
This commit is contained in:
parent
1263f59cee
commit
3e18894bb5
1 changed files with 9 additions and 8 deletions
|
@ -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())
|
||||
|
|
Loading…
Reference in a new issue