forked from blizzthewolf/SeaCogs
feat(pterodactyl): added a regex blacklist command
This commit is contained in:
parent
5c2bfea238
commit
f6ebbae583
4 changed files with 58 additions and 3 deletions
|
@ -99,6 +99,10 @@ Default value: `Server started!`
|
||||||
If you're not running on recent versions of Paper, which this cog was developed against, or you're otherwise changing for format of chat messages, you'll need to add custom regex through the `[p]pterodactyl config regex` command. Same thing applies if any other type of message isn't being detected. I recomend using ChatGPT or something similar for this, or if you need help, you can join my [Discord server](https://discord.gg/eMUMe77Yb8).
|
If you're not running on recent versions of Paper, which this cog was developed against, or you're otherwise changing for format of chat messages, you'll need to add custom regex through the `[p]pterodactyl config regex` command. Same thing applies if any other type of message isn't being detected. I recomend using ChatGPT or something similar for this, or if you need help, you can join my [Discord server](https://discord.gg/eMUMe77Yb8).
|
||||||
See [Regex Examples](regex.md) for default values.
|
See [Regex Examples](regex.md) for default values.
|
||||||
|
|
||||||
|
### `blacklist`
|
||||||
|
|
||||||
|
This group of commands allows you to add regex patterns that will be ignored by the console logger. The intended use for this is if you're getting ratelimited by messages that flood the console after the server sets its status to `running` but before it actually finishes starting.
|
||||||
|
|
||||||
### `achievement`
|
### `achievement`
|
||||||
|
|
||||||
This regex pattern is used to detect advacnements/challenges. The default should work for most Minecraft servers.
|
This regex pattern is used to detect advacnements/challenges. The default should work for most Minecraft servers.
|
||||||
|
|
|
@ -21,4 +21,5 @@ def register_config(config_obj: Config) -> None:
|
||||||
join_msg='Welcome to the server! 👋',
|
join_msg='Welcome to the server! 👋',
|
||||||
leave_msg='Goodbye! 👋',
|
leave_msg='Goodbye! 👋',
|
||||||
mask_ip=True,
|
mask_ip=True,
|
||||||
|
regex_blacklist={},
|
||||||
)
|
)
|
||||||
|
|
|
@ -8,6 +8,7 @@ from pydactyl import PterodactylClient
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
from redbot.core.bot import Red
|
from redbot.core.bot import Red
|
||||||
from redbot.core.utils.chat_formatting import box
|
from redbot.core.utils.chat_formatting import box
|
||||||
|
from redbot.core.utils.views import ConfirmView
|
||||||
|
|
||||||
from pterodactyl.config import config, register_config
|
from pterodactyl.config import config, register_config
|
||||||
from pterodactyl.logger import logger
|
from pterodactyl.logger import logger
|
||||||
|
@ -286,6 +287,45 @@ class Pterodactyl(commands.Cog):
|
||||||
await config.api_endpoint.set(endpoint)
|
await config.api_endpoint.set(endpoint)
|
||||||
await ctx.send(f"API endpoint set to {endpoint}")
|
await ctx.send(f"API endpoint set to {endpoint}")
|
||||||
|
|
||||||
|
@pterodactyl_config_regex.group(name = "blacklist", aliases = ['block', 'blocklist'])
|
||||||
|
async def pterodactyl_config_regex_blacklist(self, ctx: commands.Context):
|
||||||
|
"""Blacklist regex patterns."""
|
||||||
|
|
||||||
|
@pterodactyl_config_regex_blacklist.command(name = "add")
|
||||||
|
async def pterodactyl_config_regex_blacklist_add(self, ctx: commands.Context, name: str, *, regex: str) -> None:
|
||||||
|
"""Add a regex pattern to the blacklist."""
|
||||||
|
async with config.regex_blacklist() as blacklist:
|
||||||
|
blacklist: dict
|
||||||
|
if name not in blacklist:
|
||||||
|
blacklist.update({name: regex})
|
||||||
|
await ctx.send(f"Added `{name}` to the regex blacklist.\n{box(regex, 're')}")
|
||||||
|
else:
|
||||||
|
view = ConfirmView(ctx.author, disable_buttons=True)
|
||||||
|
msg = await ctx.send(f"Name `{name}` already exists in the blacklist. Would you like to update it? Current value:\n{box(blacklist[name], 're')}", view=view)
|
||||||
|
await view.wait()
|
||||||
|
if view.result is True:
|
||||||
|
blacklist.update({name: regex})
|
||||||
|
await msg.edit(f"Updated `{name}` in the regex blacklist.\n{box(regex, 're')}")
|
||||||
|
else:
|
||||||
|
await msg.edit(content="Cancelled.")
|
||||||
|
|
||||||
|
@pterodactyl_config_regex_blacklist.command(name = "remove")
|
||||||
|
async def pterodactyl_config_regex_blacklist_remove(self, ctx: commands.Context, name: str) -> None:
|
||||||
|
"""Remove a regex pattern from the blacklist."""
|
||||||
|
async with config.regex_blacklist() as blacklist:
|
||||||
|
blacklist: dict
|
||||||
|
if name in blacklist:
|
||||||
|
view = ConfirmView(ctx.author, disable_buttons=True)
|
||||||
|
msg = await ctx.send(f"Are you sure you want to remove `{name}` from the regex blacklist?\n{box(blacklist[name], 're')}", view=view)
|
||||||
|
await view.wait()
|
||||||
|
if view.result is True:
|
||||||
|
del blacklist[name]
|
||||||
|
await msg.edit(f"Removed `{name}` from the regex blacklist.")
|
||||||
|
else:
|
||||||
|
await msg.edit(content="Cancelled.")
|
||||||
|
else:
|
||||||
|
await ctx.send(f"Name `{name}` does not exist in the blacklist.")
|
||||||
|
|
||||||
@pterodactyl_config.command(name = 'view', aliases = ['show'])
|
@pterodactyl_config.command(name = 'view', aliases = ['show'])
|
||||||
async def pterodactyl_config_view(self, ctx: commands.Context) -> None:
|
async def pterodactyl_config_view(self, ctx: commands.Context) -> None:
|
||||||
"""View the current configuration."""
|
"""View the current configuration."""
|
||||||
|
@ -305,6 +345,7 @@ class Pterodactyl(commands.Cog):
|
||||||
leave_msg = await config.leave_msg()
|
leave_msg = await config.leave_msg()
|
||||||
mask_ip = await config.mask_ip()
|
mask_ip = await config.mask_ip()
|
||||||
api_endpoint = await config.api_endpoint()
|
api_endpoint = await config.api_endpoint()
|
||||||
|
regex_blacklist = await config.regex_blacklist()
|
||||||
embed = discord.Embed(color = await ctx.embed_color(), title="Pterodactyl Configuration")
|
embed = discord.Embed(color = await ctx.embed_color(), title="Pterodactyl Configuration")
|
||||||
embed.description = f"""**Base URL:** {base_url}
|
embed.description = f"""**Base URL:** {base_url}
|
||||||
**Server ID:** `{server_id}`
|
**Server ID:** `{server_id}`
|
||||||
|
@ -323,7 +364,14 @@ class Pterodactyl(commands.Cog):
|
||||||
**Join Regex:** {box(join_regex, 're')}
|
**Join Regex:** {box(join_regex, 're')}
|
||||||
**Leave Regex:** {box(leave_regex, 're')}
|
**Leave Regex:** {box(leave_regex, 're')}
|
||||||
**Achievement Regex:** {box(achievement_regex, 're')}"""
|
**Achievement Regex:** {box(achievement_regex, 're')}"""
|
||||||
await ctx.send(embed=embed)
|
await ctx.send(embes=embed)
|
||||||
|
if not len(regex_blacklist) == 0:
|
||||||
|
regex_blacklist_embed = discord.Embed(color = await ctx.embed_color(), title="Regex Blacklist")
|
||||||
|
regex_string = ''
|
||||||
|
for regex in regex_blacklist:
|
||||||
|
regex_string += f"{box(regex, 're')}\n"
|
||||||
|
regex_blacklist_embed.description = regex_string
|
||||||
|
await ctx.send(embed=regex_blacklist_embed)
|
||||||
|
|
||||||
def get_bool_str(self, inp: bool) -> str:
|
def get_bool_str(self, inp: bool) -> str:
|
||||||
"""Return a string representation of a boolean."""
|
"""Return a string representation of a boolean."""
|
||||||
|
|
|
@ -45,8 +45,10 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
|
||||||
logger.info("WebSocket authentication successful")
|
logger.info("WebSocket authentication successful")
|
||||||
|
|
||||||
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:
|
||||||
if await config.current_status() in ('running', 'offline', ''):
|
msg = json.loads(message)['args'][0]
|
||||||
content = remove_ansi_escape_codes(json.loads(message)['args'][0])
|
regex_blacklist = await config.regex_blacklist()
|
||||||
|
if await config.current_status() in ('running', 'offline', '') and not any(re.match(regex, msg) for regex in regex_blacklist):
|
||||||
|
content = remove_ansi_escape_codes(msg)
|
||||||
if await config.mask_ip() is True:
|
if await config.mask_ip() is True:
|
||||||
content = mask_ip(content)
|
content = mask_ip(content)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue