Compare commits
6 commits
renovate/w
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
10b31c81b3
|
|||
|
3fdb0836cf
|
|||
|
6bd2a2cc68
|
|||
|
48c6289b2d
|
|||
|
346963fd4f
|
|||
d89c156744
|
8 changed files with 100 additions and 86 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ghcr.io/astral-sh/uv:0.5.24@sha256:2381d6aa60c326b71fd40023f921a0a3b8f91b14d5db6b90402e65a635053709 AS uv
|
FROM ghcr.io/astral-sh/uv:0.5.30@sha256:bb74263127d6451222fe7f71b330edfb189ab1c98d7898df2401fbf4f272d9b9 AS uv
|
||||||
FROM python:3.11-slim@sha256:6ed5bff4d7d377e2a27d9285553b8c21cfccc4f00881de1b24c9bc8d90016e82 AS python
|
FROM python:3.11-slim@sha256:6ed5bff4d7d377e2a27d9285553b8c21cfccc4f00881de1b24c9bc8d90016e82 AS python
|
||||||
FROM code.forgejo.org/forgejo/runner:6.2.1@sha256:fecc96a111a15811a6887ce488e75718089f24599e613e93db8e54fe70b706e8 AS forgejo-runner
|
FROM code.forgejo.org/forgejo/runner:6.2.1@sha256:fecc96a111a15811a6887ce488e75718089f24599e613e93db8e54fe70b706e8 AS forgejo-runner
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,8 @@ charset = utf-8
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
|
|
||||||
|
[*.py]
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
[*.md]
|
[*.md]
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,10 @@
|
||||||
"hidden": false,
|
"hidden": false,
|
||||||
"disabled": false,
|
"disabled": false,
|
||||||
"min_bot_version": "3.5.0",
|
"min_bot_version": "3.5.0",
|
||||||
"min_python_version": [3, 8, 0],
|
"min_python_version": [3, 10, 0],
|
||||||
"requirements": ["git+https://github.com/cswimr/pydactyl", "websockets"],
|
"requirements": [
|
||||||
|
"git+https://github.com/iamkubi/pydactyl@v2.0.5",
|
||||||
|
"websockets"
|
||||||
|
],
|
||||||
"tags": ["pterodactyl", "minecraft", "server", "management"]
|
"tags": ["pterodactyl", "minecraft", "server", "management"]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,14 @@ import aiohttp
|
||||||
|
|
||||||
|
|
||||||
async def get_status(host: str, port: int = 25565) -> tuple[bool, dict]:
|
async def get_status(host: str, port: int = 25565) -> tuple[bool, dict]:
|
||||||
|
"""Get the status of a Minecraft server using the [mcsrvstat.us API](https://api.mcsrvstat.us).
|
||||||
|
|
||||||
|
Args:
|
||||||
|
host (str): The host of the server.
|
||||||
|
port (int, optional): The port to connect to. Defaults to 25565.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
A tuple containing a boolean and a dictionary. The boolean is True if the server is online, or False if it is offline. The dictionary contains the response from the API."""
|
||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
async with session.get(f"https://api.mcsrvstat.us/2/{host}:{port}") as response:
|
async with session.get(f"https://api.mcsrvstat.us/2/{host}:{port}") as response:
|
||||||
response = await response.json() # noqa: PLW2901
|
response = await response.json() # noqa: PLW2901
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ class Pterodactyl(commands.Cog):
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
||||||
__version__ = "2.0.6"
|
__version__ = "2.0.8"
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/pterodactyl/"
|
__documentation__ = "https://seacogs.coastalcommits.com/pterodactyl/"
|
||||||
|
|
||||||
def __init__(self, bot: Red):
|
def __init__(self, bot: Red):
|
||||||
|
|
@ -416,7 +416,7 @@ class Pterodactyl(commands.Cog):
|
||||||
- `.$V` (version)
|
- `.$V` (version)
|
||||||
- `.$D` (description / Message of the Day)"""
|
- `.$D` (description / Message of the Day)"""
|
||||||
await config.topic.set(text)
|
await config.topic.set(text)
|
||||||
await ctx.send(f"Topic set to:\n{box(text, 'yaml')}")
|
await ctx.send(f"Topic set to:\n{box(text, 'markdown')}")
|
||||||
|
|
||||||
@pterodactyl_config.group(name="chat")
|
@pterodactyl_config.group(name="chat")
|
||||||
async def pterodactyl_config_chat(self, ctx: commands.Context):
|
async def pterodactyl_config_chat(self, ctx: commands.Context):
|
||||||
|
|
@ -607,19 +607,19 @@ class Pterodactyl(commands.Cog):
|
||||||
|
|
||||||
**Topic Hostname:** `{topic_hostname}`
|
**Topic Hostname:** `{topic_hostname}`
|
||||||
**Topic Port:** `{topic_port}`
|
**Topic Port:** `{topic_port}`
|
||||||
**Topic Text:** {box(topic_text, "yaml")}
|
**Topic Text:** {box(topic_text, "markdown")}
|
||||||
|
|
||||||
**Chat Command:** {box(chat_command, "json")}
|
**Chat Command:** {box(chat_command, "json")}
|
||||||
**Chat Regex:** {box(chat_regex, "re")}
|
**Chat Regex:** {box(chat_regex, "regex")}
|
||||||
**Server Regex:** {box(server_regex, "re")}
|
**Server Regex:** {box(server_regex, "regex")}
|
||||||
**Join Regex:** {box(join_regex, "re")}
|
**Join Regex:** {box(join_regex, "regex")}
|
||||||
**Leave Regex:** {box(leave_regex, "re")}
|
**Leave Regex:** {box(leave_regex, "regex")}
|
||||||
**Achievement Regex:** {box(achievement_regex, "re")}"""
|
**Achievement Regex:** {box(achievement_regex, "regex")}"""
|
||||||
await ctx.send(embed=embed)
|
await ctx.send(embed=embed)
|
||||||
if not len(regex_blacklist) == 0:
|
if not len(regex_blacklist) == 0:
|
||||||
regex_blacklist_embed = discord.Embed(color=await ctx.embed_color(), title="Regex Blacklist")
|
regex_blacklist_embed = discord.Embed(color=await ctx.embed_color(), title="Regex Blacklist")
|
||||||
for name, regex in regex_blacklist.items():
|
for name, regex in regex_blacklist.items():
|
||||||
regex_blacklist_embed.add_field(name=name, value=box(regex, "re"), inline=False)
|
regex_blacklist_embed.add_field(name=name, value=box(regex, "regex"), inline=False)
|
||||||
await ctx.send(embed=regex_blacklist_embed)
|
await ctx.send(embed=regex_blacklist_embed)
|
||||||
|
|
||||||
def get_bool_str(self, inp: bool) -> str:
|
def get_bool_str(self, inp: bool) -> str:
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ async def retrieve_websocket_credentials(coginstance: Pterodactyl) -> dict:
|
||||||
|
|
||||||
client = PterodactylClient(base_url, api_key).client
|
client = PterodactylClient(base_url, api_key).client
|
||||||
coginstance.client = client
|
coginstance.client = client
|
||||||
websocket_credentials: dict[str, Any] = client.servers.get_websocket(server_id).json()
|
websocket_credentials: dict[str, Any] = client.servers.get_websocket(server_id)
|
||||||
if not websocket_credentials:
|
if not websocket_credentials:
|
||||||
coginstance.maybe_cancel_task()
|
coginstance.maybe_cancel_task()
|
||||||
raise ValueError("Failed to retrieve websocket credentials. Please ensure the API details are correctly configured.")
|
raise ValueError("Failed to retrieve websocket credentials. Please ensure the API details are correctly configured.")
|
||||||
|
|
|
||||||
138
pyproject.toml
138
pyproject.toml
|
|
@ -7,36 +7,36 @@ license = { file = "LICENSE" }
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aiosqlite>=0.20.0",
|
"aiosqlite>=0.20.0",
|
||||||
"beautifulsoup4>=4.12.3",
|
"beautifulsoup4>=4.12.3",
|
||||||
"colorthief>=0.2.1",
|
"colorthief>=0.2.1",
|
||||||
"markdownify>=0.14.1",
|
"markdownify>=0.14.1",
|
||||||
"numpy>=2.2.2",
|
"numpy>=2.2.2",
|
||||||
"phx-class-registry>=5.1.1",
|
"phx-class-registry>=5.1.1",
|
||||||
"pillow>=10.4.0",
|
"pillow>=10.4.0",
|
||||||
"pip>=25.0",
|
"pip>=25.0",
|
||||||
"py-dactyl",
|
"py-dactyl",
|
||||||
"pydantic>=2.10.6",
|
"pydantic>=2.10.6",
|
||||||
"red-discordbot>=3.5.14",
|
"red-discordbot>=3.5.14",
|
||||||
"watchdog>=6.0.0",
|
"watchdog>=6.0.0",
|
||||||
"websockets>=14.2",
|
"websockets>=14.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependency-groups]
|
[dependency-groups]
|
||||||
documentation = [
|
documentation = [
|
||||||
"mkdocs>=1.6.1",
|
"mkdocs>=1.6.1",
|
||||||
"mkdocs-git-authors-plugin>=0.9.2",
|
"mkdocs-git-authors-plugin>=0.9.2",
|
||||||
"mkdocs-git-revision-date-localized-plugin>=1.3.0",
|
"mkdocs-git-revision-date-localized-plugin>=1.3.0",
|
||||||
"mkdocs-material[imaging]>=9.5.50",
|
"mkdocs-material[imaging]>=9.5.50",
|
||||||
"mkdocs-redirects>=1.2.2",
|
"mkdocs-redirects>=1.2.2",
|
||||||
"mkdocstrings[python]>=0.27.0",
|
"mkdocstrings[python]>=0.27.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.uv]
|
[tool.uv]
|
||||||
dev-dependencies = ["pylint>=3.3.3", "ruff>=0.9.3", "sqlite-web>=0.6.4"]
|
dev-dependencies = ["pylint>=3.3.3", "ruff>=0.9.3", "sqlite-web>=0.6.4"]
|
||||||
|
|
||||||
[tool.uv.sources]
|
[tool.uv.sources]
|
||||||
py-dactyl = { git = "https://github.com/cswimr/pydactyl" }
|
py-dactyl = { git = "https://github.com/iamkubi/pydactyl", tag = "v2.0.5" }
|
||||||
|
|
||||||
[tool.basedpyright]
|
[tool.basedpyright]
|
||||||
typeCheckingMode = "basic"
|
typeCheckingMode = "basic"
|
||||||
|
|
@ -45,32 +45,32 @@ reportAttributeAccessIssue = false # disabled because `commands.group.command` i
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
# Exclude a variety of commonly ignored directories.
|
# Exclude a variety of commonly ignored directories.
|
||||||
exclude = [
|
exclude = [
|
||||||
".bzr",
|
".bzr",
|
||||||
".direnv",
|
".direnv",
|
||||||
".eggs",
|
".eggs",
|
||||||
".git",
|
".git",
|
||||||
".git-rewrite",
|
".git-rewrite",
|
||||||
".hg",
|
".hg",
|
||||||
".ipynb_checkpoints",
|
".ipynb_checkpoints",
|
||||||
".mypy_cache",
|
".mypy_cache",
|
||||||
".nox",
|
".nox",
|
||||||
".pants.d",
|
".pants.d",
|
||||||
".pyenv",
|
".pyenv",
|
||||||
".pytest_cache",
|
".pytest_cache",
|
||||||
".pytype",
|
".pytype",
|
||||||
".ruff_cache",
|
".ruff_cache",
|
||||||
".svn",
|
".svn",
|
||||||
".tox",
|
".tox",
|
||||||
".venv",
|
".venv",
|
||||||
".vscode",
|
".vscode",
|
||||||
"__pypackages__",
|
"__pypackages__",
|
||||||
"_build",
|
"_build",
|
||||||
"buck-out",
|
"buck-out",
|
||||||
"build",
|
"build",
|
||||||
"dist",
|
"dist",
|
||||||
"node_modules",
|
"node_modules",
|
||||||
"site-packages",
|
"site-packages",
|
||||||
"venv",
|
"venv",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Same as Black.
|
# Same as Black.
|
||||||
|
|
@ -85,29 +85,29 @@ target-version = "py311"
|
||||||
# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
|
# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
|
||||||
# McCabe complexity (`C901`) by default.
|
# McCabe complexity (`C901`) by default.
|
||||||
select = [
|
select = [
|
||||||
"I",
|
"I",
|
||||||
"N",
|
"N",
|
||||||
"F",
|
"F",
|
||||||
"W",
|
"W",
|
||||||
"E",
|
"E",
|
||||||
"G",
|
"G",
|
||||||
"A",
|
"A",
|
||||||
"COM",
|
"COM",
|
||||||
"INP",
|
"INP",
|
||||||
"T20",
|
"T20",
|
||||||
"PLC",
|
"PLC",
|
||||||
"PLE",
|
"PLE",
|
||||||
"PLW",
|
"PLW",
|
||||||
"PLR",
|
"PLR",
|
||||||
"LOG",
|
"LOG",
|
||||||
"SLF",
|
"SLF",
|
||||||
"ERA",
|
"ERA",
|
||||||
"FIX",
|
"FIX",
|
||||||
"PERF",
|
"PERF",
|
||||||
"C4",
|
"C4",
|
||||||
"EM",
|
"EM",
|
||||||
"RET",
|
"RET",
|
||||||
"RSE",
|
"RSE",
|
||||||
]
|
]
|
||||||
ignore = ["PLR0911", "PLR0912", "PLR0915", "PLR2004", "PLR0913", "EM101"]
|
ignore = ["PLR0911", "PLR0912", "PLR0915", "PLR2004", "PLR0913", "EM101"]
|
||||||
|
|
||||||
|
|
|
||||||
8
uv.lock
generated
8
uv.lock
generated
|
|
@ -592,7 +592,7 @@ name = "importlib-metadata"
|
||||||
version = "8.5.0"
|
version = "8.5.0"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "zipp" },
|
{ name = "zipp", marker = "python_full_version >= '3.12'" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/cd/12/33e59336dca5be0c398a7482335911a33aa0e20776128f038019f1a95f1b/importlib_metadata-8.5.0.tar.gz", hash = "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7", size = 55304 }
|
sdist = { url = "https://files.pythonhosted.org/packages/cd/12/33e59336dca5be0c398a7482335911a33aa0e20776128f038019f1a95f1b/importlib_metadata-8.5.0.tar.gz", hash = "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7", size = 55304 }
|
||||||
wheels = [
|
wheels = [
|
||||||
|
|
@ -1227,8 +1227,8 @@ wheels = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "py-dactyl"
|
name = "py-dactyl"
|
||||||
version = "2.0.4"
|
version = "2.0.5"
|
||||||
source = { git = "https://github.com/cswimr/pydactyl#a8ad40c21b3fe2248451fd85a1146b32d29f10df" }
|
source = { git = "https://github.com/iamkubi/pydactyl?tag=v2.0.5#ef5d8b9b807f67067dc1214097abf01ddb7e551f" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "requests" },
|
{ name = "requests" },
|
||||||
]
|
]
|
||||||
|
|
@ -1701,7 +1701,7 @@ requires-dist = [
|
||||||
{ name = "phx-class-registry", specifier = ">=5.1.1" },
|
{ name = "phx-class-registry", specifier = ">=5.1.1" },
|
||||||
{ name = "pillow", specifier = ">=10.4.0" },
|
{ name = "pillow", specifier = ">=10.4.0" },
|
||||||
{ name = "pip", specifier = ">=25.0" },
|
{ name = "pip", specifier = ">=25.0" },
|
||||||
{ name = "py-dactyl", git = "https://github.com/cswimr/pydactyl" },
|
{ name = "py-dactyl", git = "https://github.com/iamkubi/pydactyl?tag=v2.0.5" },
|
||||||
{ name = "pydantic", specifier = ">=2.10.6" },
|
{ name = "pydantic", specifier = ">=2.10.6" },
|
||||||
{ name = "red-discordbot", specifier = ">=3.5.14" },
|
{ name = "red-discordbot", specifier = ">=3.5.14" },
|
||||||
{ name = "watchdog", specifier = ">=6.0.0" },
|
{ name = "watchdog", specifier = ">=6.0.0" },
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue