fix(speedtest): just show the speedtest.net image

.docs/aurora/index.md

@@ -10,7 +10,7 @@ Aurora is a fully-featured moderation system. It is heavily inspired by Galactic
 ## Installation
 
 ```bash
-[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 [p]cog install seacogs aurora
 [p]cog load aurora
 ```

.docs/backup.md

@@ -1,18 +1,18 @@
 # Backup
 
-Backup allows you to export a JSON list of all of your installed repositories and cogs, then reimport them and automatically reinstall the cogs.
+Backup allows you to export a JSON list of all of your installed repositories and cogs, then reimport them and automatically reinstall/reload the cogs.
 
 ## Installation
 
 ```bash
-[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 [p]cog install seacogs backup
 [p]cog load backup
 ```
 
 ## Version Compatibility
 
-As of commit [1edb08a](https://www.coastalcommits.com/cswimr/SeaCogs/commit/1edb08a1271f12098ca0bed11a735f7162cedd14), the Backup cog no longer supports Red versions older than 3.5.6. If you want to use the cog on an earlier version (3.5.0 - 3.5.5), install the cog pinned to this commit: `43464db6a7c51bc69282b1ae3dc507a4aae851de`.
+As of commit [1edb08a](https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs/commit/1edb08a1271f12098ca0bed11a735f7162cedd14), the Backup cog no longer supports Red versions older than 3.5.6. If you want to use the cog on an earlier version (3.5.0 - 3.5.5), install the cog pinned to this commit: `43464db6a7c51bc69282b1ae3dc507a4aae851de`.
 
 ```bash
 [p]cog installversion sea-cogs 43464db6a7c51bc69282b1ae3dc507a4aae851de backup

.docs/bible.md

@@ -6,7 +6,7 @@ This cog does require an api key to work.
 ## Installation
 
 ```bash
-[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 [p]cog install seacogs bible
 [p]cog load bible
 ```

.docs/emojiinfo.md

@@ -5,7 +5,7 @@ EmojiInfo allows you to retrieve information about an emoji.
 ## Installation
 
 ```bash
-[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 [p]cog install seacogs emojiinfo
 [p]cog load emojiinfo
 ```

.docs/nerdify.md

@@ -5,7 +5,7 @@ Nerdify allows you to nerdify other people's text.
 ## Installation
 
 ```bash
-[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 [p]cog install seacogs nerdify
 [p]cog load nerdify
 ```

.docs/pterodactyl/getting-started.md

@@ -28,7 +28,7 @@ The Downloader cog allows you to add Git repositories to your bot in order to do
 Now, use Downloader to add my repository to your bot:
 
 ```
-[p]repo add sea-cogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add sea-cogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 ```
 
 Now, install the Pterodactyl cog:

.docs/pterodactyl/index.md

@@ -10,7 +10,7 @@ Pterodactyl allows for connecting to a Pterodactyl server through websockets. It
 ## Installation
 
 ```bash
-[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 [p]cog install seacogs pterodactyl
 [p]cog load aurora
 ```

.docs/pterodactyl/installing-red.md

@@ -10,7 +10,7 @@ There are a few caveats to running an instance of Red on Pterodactyl.
 
 - You will not receive any support from the Red developers.
 - The built-in Audio cog will not work.
-- Depending on your host, you might have to request a [`tmpfs` size increase](https://github.com/pelican-eggs/eggs/tree/master/bots/discord/redbot#additional-requirements).
+- Depending on your host, you might have to request a [`tmpfs` size increase](https://github.com/ign-gg/Pterodactyl-Eggs/tree/master/bots/discord/redbot#additional-requirements).
 
 If these are unacceptable to you, you should [install Red normally](https://docs.discord.red/en/stable/install_guides/index.html).
 ///
@@ -64,7 +64,7 @@ Red is quite a large bot, so I'll focus on the specifics of getting the bot work
 ```
 2. Add my repository to the bot
 ```bash
-[p]repo add sea-cogs https://www.coastalcommits.com/cswimr/SeaCogs
+[p]repo add sea-cogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 ```
 3. Install and load the Pterodactyl cog
 ```bash

.envrc

@@ -1,10 +0,0 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
-fi
-
-watch_file flake.nix
-watch_file flake.lock
-if ! use flake . --no-pure-eval
-then
-  echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
-fi

.forgejo/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,6 +1,8 @@
 name: Bug Report
 about: File a bug report
+title: "[Cog Name] "
 labels: [bug]
+ref: master
 body:
   - type: markdown
     attributes:
@@ -11,7 +13,7 @@ body:
     attributes:
       label: Please confirm that;
       options:
-        - label: I have checked that this bug does not already have an opened/closed [issue](https://www.coastalcommits.com/cswimr/SeaCogs/issues) or [pull request](https://www.coastalcommits.com/cswimr/SeaCogs/pulls) associated with it.
+        - label: I have checked that this bug does not already have an opened/closed [issue](https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs/issues) or [pull request](https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs/pulls) associated with it.
           required: true
         - label: I have checked that I am on the latest version of [Red-DiscordBot](https://github.com/CogCreators/Red-DiscordBot), and SeaCogs.
           required: true

.forgejo/ISSUE_TEMPLATE/suggestion.yaml

@@ -1,6 +1,8 @@
 name: Suggestion
 about: Trying to suggest something for SeaCogs? Use this.
-labels: [enhancement]
+title: "[Cog Name] "
+labels: enhancement
+ref: master
 body:
   - type: markdown
     attributes:
@@ -11,7 +13,7 @@ body:
     attributes:
       label: What cog is your feature request for?
       description: Specify the cog within the repository.
-      placeholder: E.g., Pterodactyl
+      placeholder: E.g., ModerationCog
     validations:
       required: true
   - type: textarea

.forgejo/pull_request_template.md

@@ -2,5 +2,5 @@
 
 <!-- Create a new issue, if it doesn't exist yet -->
 
-- [ ] By submitting this pull request, I permit cswimr to license my work under
-  the [Mozilla Public License Version 2.0](https://www.coastalcommits.com/cswimr/SeaCogs/src/branch/main/LICENSE).
+- [ ] By submitting this pull request, I permit SeaswimmerTheFsh to license my work under
+  the [Mozilla Public License Version 2.0](https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs/src/branch/main/LICENSE).

.forgejo/workflows/config/.pylintrc

@@ -18,5 +18,4 @@
     import-self,
     relative-beyond-top-level,
     too-many-instance-attributes,
-    duplicate-code,
-    too-many-nested-blocks
+    duplicate-code

.forgejo/workflows/workflow.yaml

@@ -1,46 +1,39 @@
 name: Actions
 on:
   push:
+    branches:
+      - 'main'
   pull_request:
 
 jobs:
-  lint:
-    name: Lint Code (Ruff & Pylint)
+  Lint Code (Ruff & Pylint):
     runs-on: docker
-    container: www.coastalcommits.com/cswimr/actions:uv
+    container: www.coastalcommits.com/seaswimmerthefsh/actionscontainers-seacogs:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install python
-        run: uv python install 3.11
-
       - name: Install dependencies
-        run: uv sync
+        run: poetry install --with dev --no-root
 
       - name: Analysing code with Ruff
-        run: uv run ruff check $(git ls-files '*.py')
+        run: ./.venv/bin/ruff check $(git ls-files '*.py')
         continue-on-error: true
 
       - name: Analysing code with Pylint
-        run: uv run pylint --rcfile=.forgejo/workflows/config/.pylintrc $(git ls-files '*.py')
+        run: ./.venv/bin/pylint --rcfile=.forgejo/workflows/config/.pylintrc $(git ls-files '*.py')
 
-  docs:
-    name: Build Documentation (MkDocs)
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+  Build Documentation (MkDocs):
     runs-on: docker
-    container: www.coastalcommits.com/cswimr/actions:docs
+    container: www.coastalcommits.com/seaswimmerthefsh/actionscontainers-seacogs:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Install python
-        run: uv python install 3.11
-
       - name: Install dependencies
-        run: uv sync --no-dev --extra=documentation
+        run: poetry install --with docs --no-root
 
       - name: Set environment variables
         uses: actions/env@v2
@@ -49,7 +42,7 @@ jobs:
         run: |
           export SITE_URL="https://$CI_ACTION_REF_NAME_SLUG.seacogs.coastalcommits.com"
           export EDIT_URI="src/branch/$CI_ACTION_REF_NAME/.docs"
-          uv run mkdocs build -v
+          ./.venv/bin/mkdocs build -v
 
       - name: Deploy documentation
         run: |
@@ -65,7 +58,7 @@ jobs:
           npx -p "@getmeli/cli" meli upload ./site \
             --url "https://pages.coastalcommits.com" \
             --site "${{ vars.MELI_SITE_ID }}" \
-            --token "${{ secrets.MELI_TOKEN }}" \
+            --token "${{ secrets.MELI_SITE_SECRET }}" \
             --release "$CI_ACTION_REF_NAME_SLUG/${{ env.GITHUB_SHA }}" \
             --branch "$CI_ACTION_REF_NAME_SLUG"
 

.gitignore

@@ -2,6 +2,3 @@
 .vscode
 site
 .venv
-__pycache__
-.direnv
-.devenv

README.md

@@ -11,7 +11,7 @@ My assorted cogs for Red-DiscordBot.
 To get started with a development environment, first clone this repository.
 
 ```sh
-git clone https://coastalcommits.com/cswimr/SeaCogs.git
+git clone https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs.git
 ```
 
 Then, install Poetry.

antipolls/antipolls.py

@@ -9,15 +9,14 @@ import discord
 from red_commons.logging import getLogger
 from redbot.core import commands
 from redbot.core.bot import Config, Red
-from redbot.core.utils.chat_formatting import bold, humanize_list
+from redbot.core.utils.chat_formatting import humanize_list
 
 
 class AntiPolls(commands.Cog):
     """AntiPolls deletes messages that contain polls, with a configurable per-guild role and channel whitelist and support for default Discord permissions (Manage Messages)."""
 
-    __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
-    __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
-    __version__ = "1.0.1"
+    __author__ = ["SeaswimmerTheFsh"]
+    __version__ = "1.0.0"
     __documentation__ = "https://seacogs.coastalcommits.com/antipolls/"
 
     def __init__(self, bot: Red):
@@ -39,9 +38,9 @@ class AntiPolls(commands.Cog):
         n = "\n" if "\n\n" not in pre_processed else ""
         text = [
             f"{pre_processed}{n}",
-            f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
-            f"{bold('Author:')} {humanize_list(self.__author__)}",
-            f"{bold('Documentation:')} {self.__documentation__}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {humanize_list(self.__author__)}",
+            f"Documentation: {self.__documentation__}",
         ]
         return "\n".join(text)
 

antipolls/info.json

@@ -1,11 +1,11 @@
 {
-  "author" : ["cswimr"],
-  "install_msg" : "Thank you for installing AntiPolls!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing AntiPolls!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
   "name" : "AntiPolls",
   "short" : "AntiPolls deletes messages that contain polls.",
   "description" : "AntiPolls deletes messages that contain polls, with a configurable per-guild role and channel whitelist and support for default Discord permissions (Manage Messages).",
   "end_user_data_statement" : "This cog does not store any user data.",
-  "hidden": true,
+  "hidden": false,
   "disabled": false,
   "min_bot_version": "3.5.0",
   "min_python_version": [3, 10, 0],

aurora/aurora.py

@@ -39,7 +39,7 @@ class Aurora(commands.Cog):
     It is heavily inspired by GalacticBot, and is designed to be a more user-friendly alternative to Red's core Mod cogs.
     This cog stores all of its data in an SQLite database."""
 
-    __author__ = ["cswimr"]
+    __author__ = ["SeaswimmerTheFsh"]
     __version__ = "2.1.3"
     __documentation__ = "https://seacogs.coastalcommits.com/aurora/"
 

aurora/info.json

@@ -1,6 +1,6 @@
 {
-  "author" : ["cswimr"],
-  "install_msg" : "Thank you for installing Aurora!\nMost of this cog's functionality requires enabling slash commands.\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing Aurora!\nMost of this cog's functionality requires enabling slash commands.\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
   "name" : "Aurora",
   "short" : "A full replacement for Red's core Mod cogs.",
   "description" : "Aurora is a fully-featured moderation system. It is heavily inspired by GalacticBot, and is designed to be a more user-friendly alternative to Red's core Mod cogs. This cog stores all of its data in an SQLite database.",

backup/backup.py

@@ -14,16 +14,15 @@ from redbot.cogs.downloader import errors
 from redbot.cogs.downloader.converters import InstalledCog
 from redbot.core import commands
 from redbot.core.bot import Red
-from redbot.core.utils.chat_formatting import bold, error, humanize_list, text_to_file
+from redbot.core.utils.chat_formatting import error, humanize_list, text_to_file
 
 
 # pylint: disable=protected-access
 class Backup(commands.Cog):
     """A utility to make reinstalling repositories and cogs after migrating the bot far easier."""
 
-    __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
-    __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
-    __version__ = "1.1.1"
+    __author__ = ["SeaswimmerTheFsh"]
+    __version__ = "1.1.0"
     __documentation__ = "https://seacogs.coastalcommits.com/backup/"
 
     def __init__(self, bot: Red):
@@ -36,9 +35,9 @@ class Backup(commands.Cog):
         n = "\n" if "\n\n" not in pre_processed else ""
         text = [
             f"{pre_processed}{n}",
-            f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
-            f"{bold('Author:')} {humanize_list(self.__author__)}",
-            f"{bold('Documentation:')} {self.__documentation__}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {humanize_list(self.__author__)}",
+            f"Documentation: {self.__documentation__}",
         ]
         return "\n".join(text)
 
@@ -101,7 +100,7 @@ class Backup(commands.Cog):
         except (json.JSONDecodeError, IndexError):
             try:
                 export = json.loads(await ctx.message.reference.resolved.attachments[0].read())
-            except (json.JSONDecodeError, IndexError, AttributeError):
+            except (json.JSONDecodeError, IndexError):
                 await ctx.send(error("Please provide a valid JSON export file."))
                 return
 
@@ -197,7 +196,7 @@ class Backup(commands.Cog):
                 cog_modules = []
                 for cog in cogs:
                     # If you're forking this cog, make sure to change these strings!
-                    if cog["name"] == "backup" and "cswimr/SeaCogs" in url:
+                    if cog["name"] == "backup" and "SeaswimmerTheFsh/SeaCogs" in url:
                         continue
                     try:
                         cog_module = await InstalledCog.convert(ctx, cog["name"])
@@ -233,7 +232,7 @@ class Backup(commands.Cog):
                         commit = None
 
                     # If you're forking this cog, make sure to change these strings!
-                    if cog_name == "backup" and "cswimr/SeaCogs" in url:
+                    if cog_name == "backup" and "SeaswimmerTheFsh/SeaCogs" in url:
                         continue
 
                     async with repository.checkout(

backup/info.json

@@ -1,6 +1,6 @@
 {
-  "author" : ["cswimr"],
-  "install_msg" : "Thank you for installing Backup!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing Backup!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
   "name" : "Backup",
   "short" : "A utility to make reinstalling repositories and cogs after migrating the bot far easier.",
   "description" : "A utility to make reinstalling repositories and cogs after migrating the bot far easier.",
@@ -8,7 +8,7 @@
   "hidden": false,
   "disabled": false,
   "min_bot_version": "3.5.6",
-  "max_bot_version": "3.5.13",
+  "max_bot_version": "3.5.9",
   "min_python_version": [3, 9, 0],
   "tags": [
     "utility",

bible/bible.py

@@ -15,7 +15,7 @@ from PIL import Image
 from red_commons.logging import getLogger
 from redbot.core import Config, commands, data_manager
 from redbot.core.bot import Red
-from redbot.core.utils.chat_formatting import bold, error, humanize_list
+from redbot.core.utils.chat_formatting import error, humanize_list
 
 import bible.errors
 from bible.models import Version
@@ -24,10 +24,9 @@ from bible.models import Version
 class Bible(commands.Cog):
     """Retrieve Bible verses from the API.bible API."""
 
-    __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
-    __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
-    __version__ = "1.1.1"
-    __documentation__ = "https://seacogs.coastalcommits.com/pterodactyl/"
+    __author__ = ["SeaswimmerTheFsh"]
+    __version__ = "1.1.0"
+    __documentation__ = "https://seacogs.coastalcommits.com/bible/"
 
     def __init__(self, bot: Red):
         super().__init__()
@@ -45,13 +44,12 @@ class Bible(commands.Cog):
         n = "\n" if "\n\n" not in pre_processed else ""
         text = [
             f"{pre_processed}{n}",
-            f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
-            f"{bold('Author:')} {humanize_list(self.__author__)}",
-            f"{bold('Documentation:')} {self.__documentation__}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {humanize_list(self.__author__)}",
+            f"Documentation: {self.__documentation__}",
         ]
         return "\n".join(text)
 
-
     def get_icon(self, color: Colour) -> File:
         """Get the docs.api.bible favicon with a given color."""
         image_path = data_manager.bundled_data_path(self) / "api.bible-logo.png"

bible/info.json

@@ -1,6 +1,6 @@
 {
-  "author" : ["cswimr"],
-  "install_msg" : "Thank you for installing Bible!\nThis cog requires setting an API key for API.Bible. Please read the [documentation](https://seacogs.coastalcommits.com/bible/#setup) for more information.\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing Bible!\nThis cog requires setting an API key for API.Bible. Please read the [documentation](https://seacogs.coastalcommits.com/bible/#setup) for more information.\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
   "name" : "Bible",
   "short" : "Retrieve Bible verses from API.Bible.",
   "description" : "Retrieve Bible verses from the API.Bible API. This cog requires an API.Bible api key.",

emojiinfo/emojiinfo.py

@@ -1,4 +1,5 @@
 import io
+from typing import Any, Literal
 
 import aiohttp
 import discord
@@ -14,10 +15,9 @@ from .model import PartialEmoji
 class EmojiInfo(commands.Cog):
     """Retrieve information about emojis."""
 
-    __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
-    __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
-    __version__ = "1.0.1"
-    __documentation__ = "https://seacogs.coastalcommits.com/emojiinfo/"
+    __author__: list[str] = ["SeaswimmerTheFsh"]
+    __version__: str = "1.0.0"
+    __documentation__: str = "https://seacogs.coastalcommits.com/emojiinfo/"
 
     def __init__(self, bot: Red) -> None:
         super().__init__()
@@ -25,17 +25,16 @@ class EmojiInfo(commands.Cog):
         self.logger: RedTraceLogger = getLogger(name="red.SeaCogs.Emoji")
 
     def format_help_for_context(self, ctx: commands.Context) -> str:
-        pre_processed = super().format_help_for_context(ctx) or ""
-        n = "\n" if "\n\n" not in pre_processed else ""
-        text = [
+        pre_processed: Any | Literal[''] = super().format_help_for_context(ctx) or ""
+        n: Literal['\n'] | Literal[''] = "\n" if "\n\n" not in pre_processed else ""
+        text: list[str] = [
             f"{pre_processed}{n}",
-            f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
-            f"{bold('Author:')} {humanize_list(self.__author__)}",
-            f"{bold('Documentation:')} {self.__documentation__}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {humanize_list(items=self.__author__)}",
+            f"Documentation: {self.__documentation__}",
         ]
         return "\n".join(text)
 
-
     async def fetch_twemoji(self, unicode_emoji) -> str:
         base_url = "https://cdn.jsdelivr.net/gh/jdecked/twemoji@latest/assets/72x72/"
         emoji_codepoint = "-".join([hex(ord(char))[2:] for char in unicode_emoji])

emojiinfo/info.json

@@ -1,5 +1,5 @@
 {
-  "author" : ["cswimr"],
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
   "install_msg" : "Thank you for installing Emoji!",
   "name" : "Emoji",
   "short" : "Retrieve information about emojis.",

emojiinfo/model.py

@@ -81,7 +81,6 @@ class PartialEmoji(discord.PartialEmoji):
         with open(path, "r", encoding="UTF-8") as file:
             emojis: dict = json.load(file)
         emoji_aliases = []
-        emoji_group = None
         for dict_name, group in emojis.items():
             for k, v in group.items():
                 if v == value:

flake.lock

@@ -1,303 +0,0 @@
-{
-  "nodes": {
-    "cachix": {
-      "inputs": {
-        "devenv": [
-          "devenv"
-        ],
-        "flake-compat": [
-          "devenv"
-        ],
-        "git-hooks": [
-          "devenv"
-        ],
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1728672398,
-        "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=",
-        "owner": "cachix",
-        "repo": "cachix",
-        "rev": "aac51f698309fd0f381149214b7eee213c66ef0a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "ref": "latest",
-        "repo": "cachix",
-        "type": "github"
-      }
-    },
-    "devenv": {
-      "inputs": {
-        "cachix": "cachix",
-        "flake-compat": "flake-compat",
-        "git-hooks": "git-hooks",
-        "nix": "nix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732121232,
-        "narHash": "sha256-CmJt7aeSCJnJYGtYpyslRI+pC28RPVD43PD/7kkIVuM=",
-        "owner": "cachix",
-        "repo": "devenv",
-        "rev": "6ff1e5f92c0d74bbb12f7454a239ca2f02e05ea1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "devenv",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "devenv",
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "devenv"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "devenv",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "devenv"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730302582,
-        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "devenv",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "libgit2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1697646580,
-        "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
-        "owner": "libgit2",
-        "repo": "libgit2",
-        "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "libgit2",
-        "repo": "libgit2",
-        "type": "github"
-      }
-    },
-    "nix": {
-      "inputs": {
-        "flake-compat": [
-          "devenv"
-        ],
-        "flake-parts": "flake-parts",
-        "libgit2": "libgit2",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-23-11": [
-          "devenv"
-        ],
-        "nixpkgs-regression": [
-          "devenv"
-        ],
-        "pre-commit-hooks": [
-          "devenv"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727438425,
-        "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=",
-        "owner": "domenkozar",
-        "repo": "nix",
-        "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546",
-        "type": "github"
-      },
-      "original": {
-        "owner": "domenkozar",
-        "ref": "devenv-2.24",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1730531603,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-python": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730716553,
-        "narHash": "sha256-n4cibCp/ggDlSacCTnP8dVnywclQKYcHy6PRfe35Hk0=",
-        "owner": "cachix",
-        "repo": "nixpkgs-python",
-        "rev": "8fcdb8ec34a1c2bae3f5326873a41b310e948ccc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "nixpkgs-python",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1717432640,
-        "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1731676054,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "devenv": "devenv",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-python": "nixpkgs-python",
-        "systems": "systems"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,46 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-python.url = "github:cachix/nixpkgs-python";
-    nixpkgs-python.inputs = { nixpkgs.follows = "nixpkgs"; };
-    systems.url = "github:nix-systems/default";
-    devenv.url = "github:cachix/devenv";
-    devenv.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  nixConfig = {
-    extra-trusted-public-keys =
-      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=";
-    extra-substituters = "https://devenv.cachix.org";
-  };
-
-  outputs = { self, nixpkgs, devenv, systems, ... }@inputs:
-    let forEachSystem = nixpkgs.lib.genAttrs (import systems);
-    in {
-      packages = forEachSystem (system: {
-        devenv-up = self.devShells.${system}.default.config.procfileScript;
-        devenv-test = self.devShells.${system}.default.config.test;
-      });
-
-      devShells = forEachSystem (system:
-        let pkgs = nixpkgs.legacyPackages.${system};
-        in {
-          default = devenv.lib.mkShell {
-            inherit inputs pkgs;
-            modules = [{
-              languages.python = {
-                enable = true;
-                version = "3.11";
-                uv = {
-                  enable = true;
-                  sync = {
-                    enable = true;
-                    allExtras = true;
-                  };
-                };
-              };
-            }];
-          };
-        });
-    };
-}

info.json

@@ -1,9 +1,9 @@
 {
     "author": [
-        "cswimr"
+        "SeaswimmerTheFsh (seasw.)"
     ],
-    "install_msg": "Thanks for installing my repo!\n\nIf you have any issues with any of the cogs, please create an issue [here](https://coastalcommits.com/cswimr/SeaCogs/issues) or join my [Discord Server](https://discord.gg/eMUMe77Yb8 ).",
+    "install_msg": "Thanks for installing my repo!\n\nIf you have any issues with any of the cogs, please create an issue [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs/issues) or join my [Discord Server](https://discord.gg/eMUMe77Yb8 ).",
     "index_name": "sea-cogs",
-    "short": "Various cogs for Red, by cswimr",
-    "description": "Various cogs for Red, by cswimr"
+    "short": "Various cogs for Red, by SeaswimmerTheFsh (seasw.)",
+    "description": "Various cogs for Red, by SeaswimmerTheFsh (seasw.)"
 }

mkdocs.yml

@@ -1,12 +1,12 @@
 site_name: SeaCogs Documentation
 site_url: !ENV [SITE_URL, 'https://seacogs.coastalcommits.com']
 repo_name: CoastalCommits
-repo_url: https://coastalcommits.com/cswimr/SeaCogs
+repo_url: https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs
 edit_uri: !ENV [EDIT_URI, 'src/branch/main/.docs']
-copyright: Copyright © 2023-2024, cswimr
+copyright: Copyright © 2023-2024, SeaswimmerTheFsh
 docs_dir: .docs
 
-site_author: cswimr
+site_author: SeaswimmerTheFsh
 site_description: Documentation for my Red-DiscordBot Cogs.
 
 nav:
@@ -30,7 +30,7 @@ nav:
 plugins:
   - git-authors
   - search
-  - social
+  #- social
   - git-revision-date-localized:
       enable_creation_date: true
       type: timeago
@@ -113,5 +113,3 @@ watch:
   - ./bible
   - ./nerdify
   - ./pterodactyl
-  - ./emojiinfo
-  - ./antipolls

nerdify/info.json

@@ -1,6 +1,6 @@
 {
-  "author" : ["cswimr"],
-  "install_msg" : "Thank you for installing Nerdify!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs). Based off of PhasecoreX's [UwU](<https://github.com/PhasecoreX/PCXCogs/tree/master/uwu>) cog.",
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing Nerdify!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs). Based off of PhasecoreX's [UwU](<https://github.com/PhasecoreX/PCXCogs/tree/master/uwu>) cog.",
   "name" : "Nerdify",
   "short" : "Nerdify your text!",
   "description" : "Nerdify your text!",

nerdify/nerdify.py

@@ -12,15 +12,13 @@ from typing import Any, Optional, Union
 import discord
 from redbot.core import commands
 from redbot.core.utils import chat_formatting, common_filters
-from redbot.core.utils.chat_formatting import bold, humanize_list
 
 
 class Nerdify(commands.Cog):
     """Nerdify your text."""
 
-    __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
-    __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
-    __version__ = "1.3.5"
+    __author__ = ["SeaswimmerTheFsh"]
+    __version__ = "1.3.4"
     __documentation__ = "https://seacogs.coastalcommits.com/nerdify/"
 
     def __init__(self, bot):
@@ -31,13 +29,12 @@ class Nerdify(commands.Cog):
         n = "\n" if "\n\n" not in pre_processed else ""
         text = [
             f"{pre_processed}{n}",
-            f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
-            f"{bold('Author:')} {humanize_list(self.__author__)}",
-            f"{bold('Documentation:')} {self.__documentation__}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {chat_formatting.humanize_list(self.__author__)}",
+            f"Documentation: {self.__documentation__}"
         ]
         return "\n".join(text)
 
-
     @commands.command(aliases=["nerd"])
     async def nerdify(
         self, ctx: commands.Context, *, text: Optional[str] = None

pterodactyl/info.json

@@ -1,6 +1,6 @@
 {
-  "author" : ["cswimr"],
-  "install_msg" : "Thank you for installing Pterodactyl!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).\nDocumentation can be found [here](https://seacogs.coastalcommits.com/pterodactyl ).",
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing Pterodactyl!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).\nDocumentation can be found [here](https://seacogs.coastalcommits.com/pterodactyl ).",
   "name" : "Pterodactyl",
   "short" : "Interface with Pterodactyl through websockets.",
   "description" : "Interface with Pterodactyl through websockets.",
@@ -9,7 +9,7 @@
   "disabled": false,
   "min_bot_version": "3.5.0",
   "min_python_version": [3, 8, 0],
-  "requirements": ["git+https://github.com/cswimr/pydactyl", "websockets"],
+  "requirements": ["git+https://github.com/SeaswimmerTheFsh/pydactyl", "websockets"],
   "tags": [
       "pterodactyl",
       "minecraft",

pterodactyl/pterodactyl.py

@@ -9,7 +9,7 @@ from pydactyl import PterodactylClient
 from redbot.core import app_commands, commands
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
-from redbot.core.utils.chat_formatting import bold, box, error, humanize_list
+from redbot.core.utils.chat_formatting import box, error, humanize_list
 from redbot.core.utils.views import ConfirmView
 
 from pterodactyl import mcsrvstatus
@@ -20,9 +20,8 @@ from pterodactyl.logger import logger
 class Pterodactyl(commands.Cog):
     """Pterodactyl allows you to manage your Pterodactyl Panel from Discord."""
 
-    __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
-    __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
-    __version__ = "2.0.4"
+    __author__ = ["SeaswimmerTheFsh"]
+    __version__ = "2.0.0"
     __documentation__ = "https://seacogs.coastalcommits.com/pterodactyl/"
 
     def __init__(self, bot: Red):
@@ -40,29 +39,12 @@ class Pterodactyl(commands.Cog):
         n = "\n" if "\n\n" not in pre_processed else ""
         text = [
             f"{pre_processed}{n}",
-            f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
-            f"{bold('Author:')} {humanize_list(self.__author__)}",
-            f"{bold('Documentation:')} {self.__documentation__}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {humanize_list(self.__author__)}",
+            f"Documentation: {self.__documentation__}",
         ]
         return "\n".join(text)
 
-    async def cog_load(self) -> None:
-        pterodactyl_keys = await self.bot.get_shared_api_tokens("pterodactyl")
-        api_key = pterodactyl_keys.get("api_key")
-        if api_key is None:
-            self.task.cancel()
-            raise ValueError("Pterodactyl API key not set. Please set it using `[p]set api`.")
-        base_url = await config.base_url()
-        if base_url is None:
-            self.task.cancel()
-            raise ValueError("Pterodactyl base URL not set. Please set it using `[p]pterodactyl config url`.")
-        server_id = await config.server_id()
-        if server_id is None:
-            self.task.cancel()
-            raise ValueError("Pterodactyl server ID not set. Please set it using `[p]pterodactyl config serverid`.")
-
-        self.client = PterodactylClient(base_url, api_key).client
-
     async def cog_unload(self) -> None:
         self.update_topic.cancel()
         self.task.cancel()
@@ -193,47 +175,76 @@ class Pterodactyl(commands.Cog):
 
     async def power(self, ctx: Union[discord.Interaction, commands.Context], action: str, action_ing: str, warning: str = '') -> None:
         if isinstance(ctx, discord.Interaction):
-            ctx = await self.bot.get_context(ctx)
+            author = ctx.user
+        else:
+            author = ctx.author
 
         current_status = await config.current_status()
 
         if current_status == action_ing:
-            return await ctx.send(f"Server is already {action_ing}.", ephemeral=True)
+            if isinstance(ctx, discord.Interaction):
+                return await ctx.response.send_message(f"Server is already {action_ing}.", ephemeral=True)
+            return await ctx.send(f"Server is already {action_ing}.")
 
         if current_status in ["starting", "stopping"] and action != "kill":
-            return await ctx.send("Another power action is already in progress.", ephemeral=True)
+            if isinstance(ctx, discord.Interaction):
+                return await ctx.response.send_message("Another power action is already in progress.", ephemeral=True)
+            return await ctx.send("Another power action is already in progress.")
 
-        view = ConfirmView(ctx.author, disable_buttons=True)
+        view = ConfirmView(author, disable_buttons=True)
 
-        message = await ctx.send(f"{warning}Are you sure you want to {action} the server?", view=view)
+        if isinstance(ctx, discord.Interaction):
+            await ctx.response.send_message(f"{warning}Are you sure you want to {action} the server?", view=view)
+        else:
+            message = await ctx.send(f"{warning}Are you sure you want to {action} the server?", view=view)
 
         await view.wait()
 
         if view.result is True:
-            await message.edit(content=f"Sending websocket command to {action} server...", view=None)
+            if isinstance(ctx, discord.Interaction):
+                await ctx.edit_original_response(content=f"Sending websocket command to {action} server...", view=None)
+            else:
+                await message.edit(content=f"Sending websocket command to {action} server...", view=None)
 
             await self.websocket.send(json.dumps({"event": "set state", "args": [action]}))
 
-            await message.edit(content=f"Server {action_ing}", view=None)
+            if isinstance(ctx, discord.Interaction):
+                await ctx.edit_original_response(content=f"Server {action_ing}", view=None)
+            else:
+                await message.edit(content=f"Server {action_ing}", view=None)
 
         else:
-            await message.edit(content="Cancelled.", view=None)
+            if isinstance(ctx, discord.Interaction):
+                await ctx.edit_original_response(content="Cancelled.", view=None)
+            else:
+                await message.edit(content="Cancelled.", view=None)
 
     async def send_command(self, ctx: Union[discord.Interaction, commands.Context], command: str):
         channel = self.bot.get_channel(await config.console_channel())
         if isinstance(ctx, discord.Interaction):
-            ctx = await self.bot.get_context(ctx)
-        if channel:
-            await channel.send(f"Received console command from {ctx.author.id}: {command[:1900]}", allowed_mentions=discord.AllowedMentions.none())
-        try:
-            await self.websocket.send(json.dumps({"event": "send command", "args": [command]}))
-            await ctx.send(f"Command sent to server. {box(command, 'json')}")
-        except websockets.exceptions.ConnectionClosed as e:
-            logger.error("WebSocket connection closed: %s", e)
-            await ctx.send(error("WebSocket connection closed."))
-            self.task.cancel()
-            self.retry_counter = 0
-            self.task = self.get_task()
+            if channel:
+                await channel.send(f"Received console command from {ctx.user.id}: {command[:1900]}", allowed_mentions=discord.AllowedMentions.none())
+            try:
+                await self.websocket.send(json.dumps({"event": "send command", "args": [command]}))
+                await ctx.response.send_message(f"Command sent to server. {box(command, 'json')}", ephemeral=True)
+            except websockets.exceptions.ConnectionClosed as e:
+                logger.error("WebSocket connection closed: %s", e)
+                await ctx.response.send_message(error("WebSocket connection closed."))
+                self.task.cancel()
+                self.retry_counter = 0
+                self.task = self.get_task()
+        else:
+            if channel:
+                await channel.send(f"Received console command from {ctx.author.id}: {command[:1900]}", allowed_mentions=discord.AllowedMentions.none())
+            try:
+                await self.websocket.send(json.dumps({"event": "send command", "args": [command]}))
+                await ctx.send(f"Command sent to server. {box(command, 'json')}")
+            except websockets.exceptions.ConnectionClosed as e:
+                logger.error("WebSocket connection closed: %s", e)
+                await ctx.send(error("WebSocket connection closed."))
+                self.task.cancel()
+                self.retry_counter = 0
+                self.task = self.get_task()
 
     @commands.Cog.listener()
     async def on_red_api_tokens_update(self, service_name: str, api_tokens: Mapping[str,str]): # pylint: disable=unused-argument

pterodactyl/websocket.py

@@ -1,14 +1,12 @@
 # pylint: disable=cyclic-import
 import json
 import re
-from pathlib import Path
-from typing import Optional, Tuple, Union
+from typing import Optional, Union
 
 import aiohttp
 import discord
 import websockets
 from pydactyl import PterodactylClient
-from redbot.core.data_manager import bundled_data_path
 from redbot.core.utils.chat_formatting import bold, pagify
 
 from pterodactyl.config import config
@@ -80,12 +78,7 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
                     if join_message:
                         if chat_channel is not None:
                             if coginstance.bot.embed_requested(chat_channel):
-                                embed, img = await generate_join_leave_embed(coginstance=coginstance, username=join_message,join=True)
-                                if img:
-                                    with open(img, 'rb') as file:
-                                        await chat_channel.send(embed=embed, file=file)
-                                else:
-                                    await chat_channel.send(embed=embed)
+                                await chat_channel.send(embed=await generate_join_leave_embed(join_message, True))
                             else:
                                 await chat_channel.send(f"{join_message} joined the game", allowed_mentions=discord.AllowedMentions.none())
 
@@ -93,12 +86,7 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
                     if leave_message:
                         if chat_channel is not None:
                             if coginstance.bot.embed_requested(chat_channel):
-                                embed, img = await generate_join_leave_embed(coginstance=coginstance, username=leave_message,join=False)
-                                if img:
-                                    with open(img, 'rb') as file:
-                                        await chat_channel.send(embed=embed, file=file)
-                                else:
-                                    await chat_channel.send(embed=embed)
+                                await chat_channel.send(embed=await generate_join_leave_embed(leave_message, False))
                             else:
                                 await chat_channel.send(f"{leave_message} left the game", allowed_mentions=discord.AllowedMentions.none())
 
@@ -106,7 +94,7 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
                     if achievement_message:
                         if chat_channel is not None:
                             if coginstance.bot.embed_requested(chat_channel):
-                                await chat_channel.send(embed=await generate_achievement_embed(coginstance, achievement_message['username'], achievement_message['achievement'], achievement_message['challenge']))
+                                await chat_channel.send(embed=await generate_achievement_embed(achievement_message['username'], achievement_message['achievement'], achievement_message['challenge']))
                             else:
                                 await chat_channel.send(f"{achievement_message['username']} has {'completed the challenge' if achievement_message['challenge'] else 'made the advancement'} {achievement_message['achievement']}")
 
@@ -165,7 +153,7 @@ async def check_if_server_message(text: str) -> Union[bool, str]:
     regex = await config.server_regex()
     match: Optional[re.Match[str]] = re.match(regex, text)
     if match:
-        logger.trace("Message is a server message")
+        logger.debug("Message is a server message")
         return match.group(1)
     return False
 
@@ -174,7 +162,7 @@ async def check_if_chat_message(text: str) -> Union[bool, dict]:
     match: Optional[re.Match[str]] = re.match(regex, text)
     if match:
         groups = {"username": match.group(1), "message": match.group(2)}
-        logger.trace("Message is a chat message\n%s", json.dumps(groups))
+        logger.debug("Message is a chat message\n%s", json.dumps(groups))
         return groups
     return False
 
@@ -182,7 +170,7 @@ async def check_if_join_message(text: str) -> Union[bool, str]:
     regex = await config.join_regex()
     match: Optional[re.Match[str]] = re.match(regex, text)
     if match:
-        logger.trace("Message is a join message")
+        logger.debug("Message is a join message")
         return match.group(1)
     return False
 
@@ -190,7 +178,7 @@ async def check_if_leave_message(text: str) -> Union[bool, str]:
     regex = await config.leave_regex()
     match: Optional[re.Match[str]] = re.match(regex, text)
     if match:
-        logger.trace("Message is a leave message")
+        logger.debug("Message is a leave message")
         return match.group(1)
     return False
 
@@ -203,23 +191,23 @@ async def check_if_achievement_message(text: str) -> Union[bool, dict]:
             groups["challenge"] = True
         else:
             groups["challenge"] = False
-        logger.trace("Message is an achievement message")
+        logger.debug("Message is an achievement message")
         return groups
     return False
 
 async def get_info(username: str) -> Optional[dict]:
-    logger.verbose("Retrieving player info for %s", username)
+    logger.debug("Retrieving player info for %s", username)
     endpoint = await config.api_endpoint()
     async with aiohttp.ClientSession() as session:
         async with session.get(f"https://playerdb.co/api/player/{endpoint}/{username}") as response:
             if response.status == 200:
-                logger.verbose("Player info retrieved for %s", username)
+                logger.debug("Player info retrieved for %s", username)
                 return await response.json()
-            logger.warning("Failed to retrieve player info for %s: %s", username, response.status)
+            logger.error("Failed to retrieve player info for %s: %s", username, response.status)
             return None
 
 async def send_chat_discord(coginstance: Pterodactyl, username: str, message: str, avatar_url: str) -> None:
-    logger.trace("Sending chat message to Discord")
+    logger.debug("Sending chat message to Discord")
     channel = coginstance.bot.get_channel(await config.chat_channel())
     if channel is not None:
         webhooks = await channel.webhooks()
@@ -227,37 +215,33 @@ async def send_chat_discord(coginstance: Pterodactyl, username: str, message: st
         if webhook is None:
             webhook = await channel.create_webhook(name="Pterodactyl Chat")
         await webhook.send(content=message, username=username, avatar_url=avatar_url, allowed_mentions=discord.AllowedMentions(everyone=False, roles=False, users=True))
-        logger.trace("Chat message sent to Discord")
+        logger.debug("Chat message sent to Discord")
     else:
         logger.warning("Chat channel not set. Skipping sending chat message to Discord")
 
-async def generate_join_leave_embed(coginstance: Pterodactyl, username: str, join: bool) -> Tuple[discord.Embed, Optional[Union[str, Path]]]:
+async def generate_join_leave_embed(username: str, join: bool) -> discord.Embed:
     embed = discord.Embed()
     embed.color = discord.Color.green() if join else discord.Color.red()
     embed.description = await config.join_msg() if join else await config.leave_msg()
     info = await get_info(username)
     if info:
-        img = None
         embed.set_author(name=username, icon_url=info['data']['player']['avatar'])
     else:
-        img = bundled_data_path(coginstance) / "unknown.png"
-        embed.set_author(name=username, icon_url='attachment://unknown.png')
+        embed.set_author(name=username, icon_url='https://seafsh.cc/u/j3AzqQ.png')
     embed.timestamp = discord.utils.utcnow()
-    return embed, img
+    return embed
 
-async def generate_achievement_embed(coginstance: Pterodactyl, username: str, achievement: str, challenge: bool) -> Tuple[discord.Embed, Optional[Union[str, Path]]]:
+async def generate_achievement_embed(username: str, achievement: str, challenge: bool) -> discord.Embed:
     embed = discord.Embed()
     embed.color = discord.Color.from_str('#a800a7') if challenge else discord.Color.from_str('#54fb54')
     embed.description = f"{bold(username)} has {'completed the challenge' if challenge else 'made the advancement'} {bold(achievement)}"
     info = await get_info(username)
     if info:
-        img = None
         embed.set_author(name=username, icon_url=info['data']['player']['avatar'])
     else:
-        img = bundled_data_path(coginstance) / "unknown.png"
-        embed.set_author(name=username, icon_url='attachment://unknown.png')
+        embed.set_author(name=username, icon_url='https://seafsh.cc/u/j3AzqQ.png')
     embed.timestamp = discord.utils.utcnow()
-    return embed, img
+    return embed
 
 def mask_ip(string: str) -> str:
     def check(match: re.Match[str]):

pyproject.toml

@@ -1,44 +1,42 @@
-[project]
+[tool.poetry]
 name = "seacogs"
 version = "0.1.0"
 description = "My assorted cogs for Red-DiscordBot."
-authors = [{name = "cswimr", email = "seaswimmerthefsh@gmail.com"}]
-license = {file="LICENSE"}
+authors = ["SeaswimmerTheFsh"]
+license = "MPL 2"
 readme = "README.md"
-requires-python = ">=3.11"
-dependencies = [
-    "aiosqlite>=0.20.0",
-    "beautifulsoup4>=4.12.3",
-    "colorthief>=0.2.1",
-    "markdownify>=0.13.1",
-    "numpy>=2.1.2",
-    "phx-class-registry>=5.0.0",
-    "pillow>=10.4.0",
-    "py-dactyl",
-    "pydantic>=2.9.2",
-    "red-discordbot>=3.5.13",
-    "websockets>=13.1",
-]
+package-mode = false
 
-[project.optional-dependencies]
-documentation = [
-    "mkdocs>=1.6.1",
-    "mkdocs-git-authors-plugin>=0.9.0",
-    "mkdocs-git-revision-date-localized-plugin>=1.2.9",
-    "mkdocs-material[imaging]>=9.5.40",
-    "mkdocstrings[python]>=0.26.1",
-    "mkdocs-redirects>=1.2.1",
-]
+[tool.poetry.dependencies]
+python = ">=3.11,<3.12"
+Red-DiscordBot = "^3.5.5"
+py-dactyl = "^2.0.4"
+websockets = "^12.0"
+pillow = "^10.3.0"
+numpy = "^1.26.4"
+colorthief = "^0.2.1"
 
-[tool.uv]
-dev-dependencies = [
-    "pylint>=3.3.1",
-    "ruff>=0.6.9",
-    "sqlite-web>=0.6.4",
-]
+[tool.poetry.group.dev]
+optional = true
 
-[tool.uv.sources]
-py-dactyl = { git = "https://github.com/cswimr/pydactyl" }
+[tool.poetry.group.dev.dependencies]
+ruff = "^0.3.1"
+pylint = "^3.1.0"
+
+[tool.poetry.group.docs]
+optional = true
+
+[tool.poetry.group.docs.dependencies]
+mkdocs = "1.5.3"
+mkdocstrings = {extras = ["python"], version = "0.24.0"}
+mkdocs-git-authors-plugin = "0.7.2"
+mkdocs-git-revision-date-localized-plugin = "1.2.2"
+mkdocs-material = {extras = ["imaging"], version = "^9.5.2"}
+mkdocs-redirects = "^1.2.1"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
 # Exclude a variety of commonly ignored directories.

seautils/info.json

@@ -1,6 +1,6 @@
 {
-  "author" : ["cswimr"],
-  "install_msg" : "Thank you for installing SeaUtils!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing SeaUtils!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
   "name" : "SeaUtils",
   "short" : "A collection of useful utilities.",
   "description" : "A collection of useful utilities.",
@@ -8,6 +8,5 @@
   "hidden": true,
   "disabled": false,
   "min_bot_version": "3.5.0",
-  "min_python_version": [3, 8, 0],
-  "requirements": ["beautifulsoup4", "markdownify"]
+  "min_python_version": [3, 8, 0]
 }

seautils/seautils.py

@@ -5,20 +5,13 @@
 #  ____) |  __/ (_| \__ \\ V  V /| | | | | | | | | | | |  __/ |
 # |_____/ \___|\__,_|___/ \_/\_/ |_|_| |_| |_|_| |_| |_|\___|_|
 
-import asyncio
 import inspect
 import operator
-import re
-from asyncio.subprocess import Process
 from functools import partial, partialmethod
 from typing import Any
 
-import aiohttp
-import yaml
-from bs4 import BeautifulSoup
-from discord import Color, Embed, app_commands
+from discord import Embed, app_commands
 from discord.utils import CachedSlotProperty, cached_property
-from markdownify import MarkdownConverter
 from redbot.core import commands
 from redbot.core.bot import Red
 from redbot.core.dev_commands import cleanup_code
@@ -26,24 +19,13 @@ from redbot.core.utils import chat_formatting as cf
 from redbot.core.utils.views import SimpleMenu
 
 
-def md(soup: BeautifulSoup, **options) -> Any | str:
-    return MarkdownConverter(**options).convert_soup(soup=soup)
-
-def format_rfc_text(text: str, number: int) -> str:
-    one: str = re.sub(r"\(\.\/rfc(\d+)", r"(https://www.rfc-editor.org/rfc/rfc\1.html", text)
-    two: str = re.sub(r"\((#(?:section|page)-\d+(?:.\d+)?)\)", f"(https://www.rfc-editor.org/rfc/rfc{number}.html\1)", one)
-    three: str = re.sub(r"\n{3,}", "\n\n", two)
-    return three
-
 class SeaUtils(commands.Cog):
     """A collection of random utilities."""
 
-    __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
-    __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
-    __version__ = "1.0.1"
-    __documentation__ = "https://seacogs.coastalcommits.com/seautils/"
+    __author__ = ["SeaswimmerTheFsh"]
+    __version__ = "1.0.0"
 
-    def __init__(self, bot: Red) -> None:
+    def __init__(self, bot: Red):
         self.bot = bot
 
     def format_help_for_context(self, ctx: commands.Context) -> str:
@@ -51,17 +33,15 @@ class SeaUtils(commands.Cog):
         n = "\n" if "\n\n" not in pre_processed else ""
         text = [
             f"{pre_processed}{n}",
-            f"{cf.bold('Cog Version:')} [{self.__version__}]({self.__git__})",
-            f"{cf.bold('Author:')} {cf.humanize_list(self.__author__)}",
-            f"{cf.bold('Documentation:')} {self.__documentation__}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {cf.humanize_list(self.__author__)}"
         ]
         return "\n".join(text)
 
-
     def format_src(self, obj: Any) -> str:
         """A large portion of this code is repurposed from Zephyrkul's RTFS cog.
         https://github.com/Zephyrkul/FluffyCogs/blob/master/rtfs/rtfs.py"""
-        obj = inspect.unwrap(func=obj)
+        obj = inspect.unwrap(obj)
         src: Any = getattr(obj, "__func__", obj)
         if isinstance(obj, (commands.Command, app_commands.Command)):
             src = obj.callback
@@ -71,11 +51,11 @@ class SeaUtils(commands.Cog):
             src = obj.fget
         elif isinstance(obj, (cached_property, CachedSlotProperty)):
             src = obj.function
-        return inspect.getsource(object=src)
+        return inspect.getsource(src)
 
     @commands.command(aliases=["source", "src", "code", "showsource"])
     @commands.is_owner()
-    async def showcode(self, ctx: commands.Context, *, object: str) -> None: # pylint: disable=redefined-builtin
+    async def showcode(self, ctx: commands.Context, *, object: str): # pylint: disable=redefined-builtin
         """Show the code for a particular object."""
         try:
             if object.startswith("/") and (obj := ctx.bot.tree.get_command(object[1:])):
@@ -84,8 +64,6 @@ class SeaUtils(commands.Cog):
                 text = self.format_src(type(obj))
             elif obj := ctx.bot.get_command(object):
                 text = self.format_src(obj)
-            else:
-                raise AttributeError
             temp_content = cf.pagify(
                 text=cleanup_code(text),
                 escape_mass_mentions=True,
@@ -104,151 +82,3 @@ class SeaUtils(commands.Cog):
                 await ctx.send(embed=embed, reference=ctx.message.to_reference(fail_if_not_exists=False))
             else:
                 await ctx.send(content="Object not found!", reference=ctx.message.to_reference(fail_if_not_exists=False))
-
-    @commands.command(name='dig', aliases=['dnslookup', 'nslookup'])
-    @commands.is_owner()
-    async def dig(self, ctx: commands.Context, name: str, record_type: str | None = None, server: str | None = None, port: int = 53) -> None:
-        """Retrieve DNS information for a domain.
-
-        Uses `dig` to perform a DNS query. Will fall back to `nslookup` if `dig` is not installed on the system.
-        `nslookup` does not provide as much information as `dig`, so only the `name` parameter will be used if `nslookup` is used.
-        Will return the A, AAAA, and CNAME records for a domain by default. You can specify a different record type with the `type` parameter."""
-        command_opts: list[str | int] = ['dig']
-        query_types: list[str] = [record_type] if record_type else ['A', 'AAAA', 'CNAME']
-        if server:
-            command_opts.extend(['@', server])
-        for query_type in query_types:
-            command_opts.extend([name, query_type])
-        command_opts.extend(['-p', str(port), '+yaml'])
-
-        try:
-            process: Process = await asyncio.create_subprocess_exec(*command_opts, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
-            stdout, stderr = await process.communicate()
-            if stderr:
-                await ctx.maybe_send_embed(message="An error was encountered!\n" + cf.box(text=stderr.decode()))
-            else:
-                data = yaml.safe_load(stdout.decode())
-                message_data: dict = data[0]['message']
-                response_data: dict = message_data['response_message_data']
-                if ctx.embed_requested():
-                    embed = Embed(
-                        title="DNS Query Result",
-                        color=await ctx.embed_color(),
-                        timestamp=message_data['response_time']
-                    )
-                    embed.add_field(name="Response Address", value=message_data['response_address'], inline=True)
-                    embed.add_field(name="Response Port", value=message_data['response_port'], inline=True)
-                    embed.add_field(name="Query Address", value=message_data['query_address'], inline=True)
-                    embed.add_field(name="Query Port", value=message_data['query_port'], inline=True)
-                    embed.add_field(name="Status", value=response_data['status'], inline=True)
-                    embed.add_field(name="Flags", value=response_data['flags'], inline=True)
-
-                    if response_data.get('status') != 'NOERROR':
-                        embed.colour = Color.red()
-                        embed.description = cf.error("Dig query did not return `NOERROR` status.")
-
-                    questions = []
-                    answers = []
-                    authorities = []
-                    for m in data:
-                        response = m['message']['response_message_data']
-                        if 'QUESTION_SECTION' in response:
-                            for question in response['QUESTION_SECTION']:
-                                if question not in questions:
-                                    questions.append(question)
-
-                        if 'ANSWER_SECTION' in response:
-                            for answer in response['ANSWER_SECTION']:
-                                if answer not in answers:
-                                    answers.append(answer)
-
-                        if 'AUTHORITY_SECTION' in response:
-                            for authority in response['AUTHORITY_SECTION']:
-                                if authority not in authorities:
-                                    authorities.append(authority)
-
-                    if questions:
-                        question_section = "\n".join(questions)
-                        embed.add_field(name="Question Section", value=f"{cf.box(text=question_section, lang='prolog')}", inline=False)
-
-                    if answers:
-                        answer_section = "\n".join(answers)
-                        if len(answer_section) > 1024:
-                            embed.description = cf.warning("Answer section is too long to fit within embed field, falling back to description.") + cf.box(answer_section)
-                        else:
-                            embed.add_field(name="Answer Section", value=f"{cf.box(text=answer_section, lang='prolog')}", inline=False)
-
-                    if authorities:
-                        authority_section = "\n".join(authorities)
-                        embed.add_field(name="Authority Section", value=f"{cf.box(text=authority_section, lang='prolog')}", inline=False)
-                    await ctx.send(embed=embed)
-                else:
-                    await ctx.send(content=cf.box(text=stdout, lang='yaml'))
-        except (FileNotFoundError):
-            try:
-                ns_process = await asyncio.create_subprocess_exec('nslookup', name, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
-                ns_stdout, ns_stderr = await ns_process.communicate()
-                if ns_stderr:
-                    await ctx.maybe_send_embed(message="An error was encountered!\n" + cf.box(text=ns_stderr.decode()))
-                else:
-                    warning = cf.warning("`dig` is not installed! Defaulting to `nslookup`.\nThis command provides more information when `dig` is installed on the system.\n")
-                    if await ctx.embed_requested():
-                        embed = Embed(
-                            title="DNS Query Result",
-                            color=await ctx.embed_color(),
-                            timestamp=ctx.message.created_at
-                        )
-                        embed.description = warning + cf.box(text=ns_stdout.decode())
-                        await ctx.send(embed=embed)
-                    else:
-                        await ctx.send(content = warning + cf.box(text=ns_stdout.decode()))
-            except (FileNotFoundError):
-                await ctx.maybe_send_embed(message=cf.error("Neither `dig` nor `nslookup` are installed on the system. Unable to resolve DNS query."))
-
-    @commands.command()
-    async def rfc(self, ctx: commands.Context, number: int) -> None:
-        """Retrieve the text of an RFC document.
-
-        This command uses the [RFC Editor website](https://www.rfc-editor.org/) to fetch the text of an RFC document.
-        A [Request for Comments (RFC)](https://en.wikipedia.org/wiki/Request_for_Comments) is a publication in a series from the principal technical development and standards-setting bodies for the [Internet](https://en.wikipedia.org/wiki/Internet), most prominently the [Internet Engineering Task Force](https://en.wikipedia.org/wiki/Internet_Engineering_Task_Force). An RFC is authored by individuals or groups of engineers and [computer scientists](https://en.wikipedia.org/wiki/Computer_scientist) in the form of a [memorandum](https://en.wikipedia.org/wiki/Memorandum) describing methods, behaviors, research, or innovations applicable to the working of the Internet and Internet-connected systems. It is submitted either for [peer review](https://en.wikipedia.org/wiki/Peer_review) or to convey new concepts, information, or, occasionally, engineering humor.""" # noqa: E501
-        url = f"https://www.rfc-editor.org/rfc/rfc{number}.html"
-        datatracker_url = f"https://datatracker.ietf.org/doc/rfc{number}"
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url=url) as response:
-                if response.status == 200:
-                    html = await response.text()
-                    soup = BeautifulSoup(html, 'html.parser')
-                    pre_tags = soup.find_all('pre')
-                    content: list[Embed | str] = []
-                    for pre_tag in pre_tags:
-                        text = format_rfc_text(md(pre_tag), number)
-                        if len(text) > 4096:
-                            pagified_text = cf.pagify(text, delims=["\n\n"], page_length=4096)
-                            for page in pagified_text:
-                                if await ctx.embed_requested():
-                                    embed = Embed(
-                                        title=f"RFC Document {number}",
-                                        url=datatracker_url,
-                                        description=page,
-                                        color=await ctx.embed_color()
-                                    )
-                                    content.append(embed)
-                                else:
-                                    content.append(page)
-                        else:
-                            if await ctx.embed_requested():
-                                embed = Embed(
-                                    title=f"RFC Document {number}",
-                                    url=datatracker_url,
-                                    description=text,
-                                    color=await ctx.embed_color()
-                                )
-                                content.append(embed)
-                            else:
-                                content.append(text)
-                    if await ctx.embed_requested():
-                        for embed in content:
-                            embed.set_footer(text=f"Page {content.index(embed) + 1}/{len(content)}")
-                    await SimpleMenu(pages=content, disable_after_timeout=True, timeout=300).start(ctx)
-                else:
-                    await ctx.maybe_send_embed(message=cf.error(f"An error occurred while fetching RFC {number}. Status code: {response.status}."))

speedtest/__init__.py

@@ -0,0 +1,5 @@
+from .speedtest import Speedtest
+
+
+async def setup(bot):
+    await bot.add_cog(Speedtest(bot))

speedtest/info.json

@@ -0,0 +1,14 @@
+{
+  "author" : ["SeaswimmerTheFsh (seasw.)"],
+  "install_msg" : "Thank you for installing Speedtest!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
+  "name" : "Speedtest",
+  "short" : "A collection of useful utilities.",
+  "description" : "A collection of useful utilities.",
+  "end_user_data_statement" : "This cog does not store end user data.",
+  "hidden": true,
+  "disabled": false,
+  "min_bot_version": "3.5.0",
+  "min_python_version": [3, 10, 0],
+  "tags" : ["utility", "information"],
+  "requirements": ["pydantic"]
+}

speedtest/models.py

@@ -0,0 +1,76 @@
+from datetime import datetime
+
+from pydantic import BaseModel
+
+
+class Speedtest(BaseModel):
+    type: str
+    timestamp: datetime
+    ping: "Ping"
+    download: "Bandwidth"
+    upload: "Bandwidth"
+    isp: str
+    interface: "Interface"
+    server: "Server"
+    result: "Result"
+
+    @classmethod
+    def from_json(cls, data: dict) -> "Speedtest":
+        return cls(
+            type=data["type"],
+            timestamp=datetime.fromisoformat(data["timestamp"]),
+            ping=Ping(**data["ping"]),
+            download=Bandwidth(**data["download"]),
+            upload=Bandwidth(**data["upload"]),
+            isp=data["isp"],
+            interface=Interface(**data["interface"]),
+            server=Server(**data["server"]),
+            result=Result(**data["result"])
+        )
+
+class Bandwidth(BaseModel):
+    bandwidth: float
+    bytes: int
+    elapsed: int
+    latency: "Latency"
+
+    @property
+    def mbps(self) -> float:
+        return self.bandwidth / 1_000_000
+
+class Latency(BaseModel):
+    iqm: float
+    low: float
+    high: float
+    jitter: float
+
+class Interface(BaseModel):
+    internalIp: str
+    name: str
+    macAddr: str
+    isVpn: bool
+    externalIp: str
+
+class Ping(BaseModel):
+    jitter: float
+    latency: float
+    low: float
+    high: float
+
+class Server(BaseModel):
+    id: int
+    name: str
+    location: str
+    country: str
+    host: str
+    port: int
+    ip: str
+
+class Result(BaseModel):
+    id: str
+    url: str
+    persisted: bool
+
+    @property
+    def image(self) -> str:
+        return self.url + ".png"

speedtest/speedtest.py

@@ -0,0 +1,71 @@
+#   _____                         _
+#  / ____|                       (_)
+# | (___   ___  __ _ _____      ___ _ __ ___  _ __ ___   ___ _ __
+#  \___ \ / _ \/ _` / __\ \ /\ / / | '_ ` _ \| '_ ` _ \ / _ \ '__|
+#  ____) |  __/ (_| \__ \\ V  V /| | | | | | | | | | | |  __/ |
+# |_____/ \___|\__,_|___/ \_/\_/ |_|_| |_| |_|_| |_| |_|\___|_|
+
+import asyncio
+import json
+import subprocess
+
+import discord
+from redbot.core import commands
+from redbot.core.bot import Red
+from redbot.core.utils import chat_formatting as cf
+
+from .models import Speedtest as sp
+
+
+class Speedtest(commands.Cog):
+    """A collection of random utilities."""
+
+    __author__ = ["SeaswimmerTheFsh"]
+    __version__ = "1.0.0"
+
+    def __init__(self, bot: Red):
+        self.bot = bot
+
+    def format_help_for_context(self, ctx: commands.Context) -> str:
+        pre_processed = super().format_help_for_context(ctx) or ""
+        n = "\n" if "\n\n" not in pre_processed else ""
+        text = [
+            f"{pre_processed}{n}",
+            f"Cog Version: **{self.__version__}**",
+            f"Author: {cf.humanize_list(self.__author__)}"
+        ]
+        return "\n".join(text)
+
+    async def run_speedtest(self) -> str | sp:
+        try:
+            process = await asyncio.create_subprocess_exec(
+                "speedtest", "-f", "json", "--accept-license",
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE
+            )
+        except FileNotFoundError:
+            return "Speedtest CLI is not installed."
+        stdout, stderr = await process.communicate()
+        if process.returncode != 0:
+            return stderr.decode("utf-8")
+        return sp.from_json(json.loads(stdout.decode("utf-8")))
+
+    @commands.command()
+    @commands.is_owner()
+    async def speedtest(self, ctx: commands.Context) -> None:
+        """Run a speedtest."""
+        msg = await ctx.maybe_send_embed("Running speedtest...")
+        async with ctx.typing():
+            speedtest = await self.run_speedtest()
+            if await ctx.embed_requested():
+                if not isinstance(speedtest, sp):
+                    await msg.edit(embed=discord.Embed(description=f"An error occurred! {speedtest}", color=discord.Colour.red()))
+                    return
+                embed = discord.Embed(title="Speedtest Results", url=speedtest.result.url, color=await ctx.embed_color())
+                embed.set_image(url=speedtest.result.image)
+                await msg.edit(embed=embed)
+            else:
+                if not isinstance(speedtest, sp):
+                    await msg.edit(content=f"An error occurred! \n`{speedtest}`")
+                    return
+                await msg.edit(content=f"**[Result]({speedtest.result.url})**")