Merge branch 'main' into main

Author: vertyco

.gitignore

@@ -170,6 +170,7 @@ compress.py
 
 
 # Misc
+copilot-instructions.md
 backups/
 orchestrator/
 welcomer/
@@ -182,6 +183,7 @@ levelup/data/tests/
 levelup/data/stock/rs-assets/
 
 # WIP cogs
+arkadia/
 fishing/
 osmosis/
 botarena/
@@ -192,7 +194,8 @@ whosalt/
 design_docs/
 idlegather/
 locallm/
-llm/
 bedrocktools/
 kingdoms/
 dungeon/
+llms/
+v2/

README.md

@@ -36,6 +36,7 @@ Check out some of my projects below!
 | [IdeaBoard](ideaboard/README.md)       | <details><summary>Make suggestions and share ideas anonymously.</summary> Allow users to create suggestions for your server. With optional anonymity and customization.</details>                                                                                                                                                                                                                                                                                      |
 | [LevelUp](levelup/README.md)           | <details><summary>Streamlined Discord Leveling System.</summary> An intuitive full-featured leveling system with prestige features, customizable backgrounds, toggleable embed/image profiles, and extensive voice tracking options.</details>                                                                                                                                                                                                                         |                                                                                    |
 | [Meow](meow/README.md)                 | <details><summary>Meow</summary> Replaces the word "now" with "meow" in someone's latest message, if word doesnt exist in the most recent 2 messages, it sends a random cat unicode emoji. Yall have a good day meow.</details>                                                                                                                                                                                                                                        |
+| [Miner](meow/README.md)                 | <details><summary>Pickaxe in hand, fortune awaits!</summary> Mine rocks with your friends! This is a simple incremental-ish game where you mine rocks to earn resources that you use to upgrade your tools and thus, increase your mining efficiency.</details>                                                                                                                                                                                                                                        |
 | [NoBot](nobot/README.md)               | <details><summary>Filter certain messages from other bots.</summary> (ONLY checks messages from other bots), Add a bot to be filtered and a key phrase to check for. When that bot sends a message containing that phrase the message will be auto-deleted.</details>                                                                                                                                                                                                  |
 | [NoNuke](nonuke/README.md)             | <details><summary>A very straightforward Anti-Nuke cog.</summary> Set a cooldown and overload count(X events in X seconds), if any user with perms exceeds them, you can set an action to be taken and logged. Events include Kicks/Bans, Channel Creation/Edit/Deletion, Role Creation/Edit/Deletion. Events are not counted separately so any action taken in any order applies to the cooldown bucket.</details>                                                    |
 | [Pixl](pixl/README.md)                 | <details><summary>Guess pictures with friends and earn points.</summary> Start a game to have a mostly blank image pop up. Every few seconds a few blocks will show up and the goal is to guess what it is before the image is completed or time runs out. You are also competing with everyone else in the channel the game is running in!</details>                                                                                                                  |
@@ -45,6 +46,7 @@ Check out some of my projects below!
 | [Tickets](tickets/README.md)           | <details><summary>Customizable Multi-Panel support ticket system.</summary> 'Tickets' is an easy to use, fully customizable multi-panel ticketing system with a variety of options and features including modals, logging, transcripts, multi-button panels and more!</details>                                                                                                                                                                                        |
 | [UpgradeChat](upgradechat/README.md)   | <details><summary>API Integration for the Upgrade.Chat API.</summary> Allows you to add your api key and products to the bot and set a dollar to credit conversion ratio. When a user makes a purchase, they can claim it in your Discord to receive economy credits.</details>                                                                                                                                                                                        |
 | [VrtUtils](vrtutils/README.md)         | <details><summary>Random utility commands.</summary> Small collection of commands used for my personal bot.</details>                                                                                                                                                                                                                                                                                                                                                  |
+| [Whitelabel](whitelabel/README.md)         | <details><summary>Per-server bot profile customization with role-based access control.</summary> Allow server owners to customize the bot's avatar, banner, and bio on a per-server basis with optional role-based access control.</details>                                                                                                                                                                                                                                                                                                                                                  |
 | [XTools](xtools/README.md)             | <details><summary>Access your xbox profile and much more.</summary> Various tools for Xbox using Microsoft's XSAPI. View your Xbox profile, friends, screenshots and game clips using simple commands and interactive menus. (You will need to register a Microsoft Azure application to use this cog. Type "[p]apiset help" after install for more info)</details>                                                                                                    |
 
 

appeals/main.py

@@ -25,7 +25,7 @@ class Appeals(Commands, Listeners, commands.Cog, metaclass=CompositeMetaClass):
     """Straightforward ban appeal system for Discord servers."""
 
     __author__ = "[vertyco](https://github.com/vertyco/vrt-cogs)"
-    __version__ = "0.2.1"
+    __version__ = "0.2.5"
 
     def __init__(self, bot: Red):
         super().__init__()

appeals/views/dynamic_menu.py

@@ -57,7 +57,12 @@ def check_pages(self, pages: t.List[t.Union[discord.Embed, str]]):
                 return
             page_count = len(pages)
             for idx in range(len(pages)):
-                pages[idx].set_footer(text=f"Page {idx + 1}/{page_count}")
+                page = pages[idx]
+                assert isinstance(page, discord.Embed), "All pages must be Embeds."
+                footer = f"Page {idx + 1}/{page_count}"
+                if page.footer:
+                    footer = f"{page.footer.text}\n{footer}"
+                pages[idx].set_footer(text=footer)
         else:
             if not all(isinstance(page, str) for page in pages):
                 raise TypeError("All pages must be Embeds or strings.")

appeals/views/submission.py

@@ -153,6 +153,7 @@ async def submit_appeal(self, interaction: discord.Interaction, button: discord.
                 AppealGuild.alert_roles,
                 AppealGuild.alert_channel,
                 AppealGuild.discussion_threads,
+                AppealGuild.vote_emojis,
             )
             .where(AppealGuild.id == interaction.guild.id)
             .first()
@@ -193,6 +194,7 @@ async def submit_appeal(self, interaction: discord.Interaction, button: discord.
             user_id=interaction.user.id,
             answers=final_answers,
         )
+        await submission.save()
 
         embed = submission.embed(interaction.user)
 
@@ -214,7 +216,7 @@ async def submit_appeal(self, interaction: discord.Interaction, button: discord.
             )
             submission.discussion_thread = thread.id
 
-        await submission.save()
+        await submission.save([AppealSubmission.message_id, AppealSubmission.discussion_thread])
 
         if appealguild["vote_emojis"] and pending_channel.permissions_for(interaction.guild.me).add_reactions:
             start_adding_reactions(message, ["✅", "❌"])