From b2293a4a342dc7ed729dbb939a96d736883e68bb Mon Sep 17 00:00:00 2001 From: Unstable Kitsune Date: Wed, 3 Sep 2025 05:27:38 -0400 Subject: [PATCH] feat: Add complete bot source code for v0.0.2 Introduces new cog modules for bump, debug, setup, and other functionalities. Implements core abstractions for database, embeds, file handling, and async utilities. Updates configuration and requirements for enhanced bot capabilities. --- src/ver/0.0.2/cogs/bump.py | 119 ++++++++++++++ src/ver/0.0.2/cogs/debug.py | 165 +++++++++++++++++++ src/ver/0.0.2/cogs/edit.py | 121 ++++++++++++++ src/ver/0.0.2/cogs/handler.py | 29 ++++ src/ver/0.0.2/cogs/help.py | 74 +++++++++ src/ver/0.0.2/cogs/info.py | 36 +++++ src/ver/0.0.2/cogs/power.py | 69 ++++++++ src/ver/0.0.2/cogs/prefix.py | 69 ++++++++ src/ver/0.0.2/cogs/setup.py | 246 +++++++++++++++++++++++++++++ src/ver/0.0.2/cogs/sync.py | 132 ++++++++++++++++ src/ver/0.0.2/core/asyncHandler.py | 6 + src/ver/0.0.2/core/checks.py | 9 ++ src/ver/0.0.2/core/database.py | 61 +++++++ src/ver/0.0.2/core/embeds.py | 33 ++++ src/ver/0.0.2/core/files.py | 16 ++ src/ver/0.0.2/data/config.yml | 7 + src/ver/0.0.2/data/help.py | 73 +++++++++ src/ver/0.0.2/data/motd.txt | 2 + src/ver/0.0.2/data/settings.json | 7 + src/ver/0.0.2/main.py | 125 +++++++++++++++ src/ver/0.0.2/requirements.txt | 10 ++ 21 files changed, 1409 insertions(+) create mode 100644 src/ver/0.0.2/cogs/bump.py create mode 100644 src/ver/0.0.2/cogs/debug.py create mode 100644 src/ver/0.0.2/cogs/edit.py create mode 100644 src/ver/0.0.2/cogs/handler.py create mode 100644 src/ver/0.0.2/cogs/help.py create mode 100644 src/ver/0.0.2/cogs/info.py create mode 100644 src/ver/0.0.2/cogs/power.py create mode 100644 src/ver/0.0.2/cogs/prefix.py create mode 100644 src/ver/0.0.2/cogs/setup.py create mode 100644 src/ver/0.0.2/cogs/sync.py create mode 100644 src/ver/0.0.2/core/asyncHandler.py create mode 100644 src/ver/0.0.2/core/checks.py create mode 100644 src/ver/0.0.2/core/database.py create mode 100644 src/ver/0.0.2/core/embeds.py create mode 100644 src/ver/0.0.2/core/files.py create mode 100644 src/ver/0.0.2/data/config.yml create mode 100644 src/ver/0.0.2/data/help.py create mode 100644 src/ver/0.0.2/data/motd.txt create mode 100644 src/ver/0.0.2/data/settings.json create mode 100644 src/ver/0.0.2/main.py create mode 100644 src/ver/0.0.2/requirements.txt diff --git a/src/ver/0.0.2/cogs/bump.py b/src/ver/0.0.2/cogs/bump.py new file mode 100644 index 0000000..3d0f14f --- /dev/null +++ b/src/ver/0.0.2/cogs/bump.py @@ -0,0 +1,119 @@ +import discord, io, traceback, json, os, asyncio + +from colorama import Fore, Style, init + +init(autoreset=True) + +from core.database import Servers +from core.files import Data +from core.embeds import Embeds + +commands = discord.ext.commands + +settings = Data("settings").json_read() + +class Bumps(commands.Cog): + def __init__(self, bot): + self.bot = bot + self.config = Data("config").yaml_read() + + @commands.guild_only() + @commands.cooldown(1, settings['cooldown'], commands.BucketType.guild) + @commands.command() + async def bump(self, ctx): + server = Servers(ctx.guild.id) + guild = ctx.guild + prefix = Servers(guild.id).getPrefix() if Servers(guild.id).hasPrefix else self.config["prefix"] + + if not server.get(): + ctx.command.reset_cooldown(ctx) + return await ctx.send(embed=Embeds(f"You must setup this server first! Use `{prefix}setup` to do so!").error()) + + wait_msg = await ctx.send(embed=discord.Embed( + title="ā³ Bumping...", + description="Please wait while we're sending out the bumps!", + color=discord.Color.orange() + )) + + server.update(icon=str(ctx.guild.icon.url), server_name=ctx.guild.name) + + servers = Servers().get_all() + + success, fail = 0, 0 + + + invite_channel = self.bot.get_channel(server.get()['invite']) + invite = await invite_channel.create_invite(max_uses=0, max_age=0, unique=False) + + embed = discord.Embed( + title=guild.name, + description=server.get()['description'], + color=discord.Color(value=server.get()['color']), + url=invite.url + ) + + embed.add_field(name="šŸŒ Members", value=len(guild.members)) + embed.add_field(name="šŸ¤£ Emojis", value=f"{len(guild.emojis)}/{guild.emoji_limit}") + embed.add_field(name="šŸ’Ž Boost Tier", value=f"Tier {guild.premium_tier} ({guild.premium_subscription_count} Boosts)") + embed.add_field(name="šŸ‘‘ Owner", value=str(guild.owner)) + embed.add_field(name="šŸ”— Invite", value=f"[Click to join!]({invite.url})") + embed.set_thumbnail(url=guild.icon) + embed.set_footer(text=f"Powered by ā€¢ {self.config['bot_name']}") + + for entry in servers: + try: + webhook = await self.bot.fetch_webhook(entry['webhook']) + + await webhook.send( + username=self.config['bot_name'], + avatar_url=self.bot.user.display_avatar.url, + embed=embed + ) + + success += 1 + except Exception as e: + error = f"{e}" + value = io.StringIO().getvalue() + print(f"{Fore.RED}[ERROR] {Style.RESET_ALL}{error}\n{Fore.YELLOW}Error was recorded in {Fore.RED}error.log") + with open("error.log", "w+") as f: + f.write(f"{value}{traceback.format_exc()}") + + + with open("cache_data.json", "w+") as f: + json.dump(entry, f, indent=4) + + Servers(entry['_id']).delete() + + try: + await self.bot.get_guild(entry['_id']).owner.send(embed=discord.Embed( + title="āš ļø Server Removed āš ļø", + description="Your server was removed from the database because it caused an error! Make sure I have permission to `Manage Webhooks` and `Create Instant Invites`! I've attached your server info below.", + color=discord.Color.red() + )) + + except: pass + + fail += 1 + + os.remove("cache_data.json") + await wait_msg.delete() + + done_message = await ctx.send(embed=discord.Embed( + title="ā« Server Bumped", + description=f"Your server was bumped to `{success+fail}` servers!\nāœ… There were `{success}` successful bumps!\nāŽ There were `{fail}` failed ones, they got booted from the Database!", + color=discord.Color.green() + ) + .set_footer(text=f"Powered by ā€¢ {self.config['bot_name']}")) + + if settings["show_motd"]: + await asyncio.sleep(settings["show_motd_wait"]) + return await done_message.edit(embed=discord.Embed( + title="šŸ—žļø Message Of The Day šŸ—žļø", + description=Data("motd").read(), + color=discord.Color.green() + )) + else: + return + +async def setup(bot): + await bot.add_cog(Bumps(bot)) diff --git a/src/ver/0.0.2/cogs/debug.py b/src/ver/0.0.2/cogs/debug.py new file mode 100644 index 0000000..ec12fcd --- /dev/null +++ b/src/ver/0.0.2/cogs/debug.py @@ -0,0 +1,165 @@ +# /cogs/debug.py + +import discord +from discord.ext import commands +from pymongo.errors import ConnectionFailure # Import the specific error for connection issues +from core.database import Servers # Import the Servers class to interact with the database +from core import checks # Import the manager check + +# This class contains commands useful for debugging the bot. +class Debug(commands.Cog): + def __init__(self, bot): + self.bot = bot + + # The 'ping' command is a simple way to check if the bot is responsive. + @commands.command() + async def ping(self, ctx): + """Checks the bot's latency.""" + # Get the latency in milliseconds + latency = round(self.bot.latency * 1000) + + # Create a simple embed to display the result + embed = discord.Embed( + title="šŸ“ Pong!", + description=f"Current latency is `{latency}ms`.", + color=discord.Color.blue() + ) + await ctx.send(embed=embed) + + # Command to display user or server avatars. + @commands.command() + async def avatar(self, ctx, *, member: discord.Member = None): + """Displays a user's or the server's avatar.""" + # If no member is specified, default to the command author. + if member is None: + member = ctx.author + + # Create an embed to show the avatar. + # .display_avatar handles default avatars gracefully. + embed = discord.Embed( + title=f"Avatar for {member.display_name}", + color=member.color + ) + embed.set_image(url=member.display_avatar.url) + await ctx.send(embed=embed) + + # Command to check if the current server is in the database and test read/write. + @commands.command() + @commands.guild_only() + async def dbcheck(self, ctx): + """Checks database connection, read, and write capabilities.""" + + server_instance = Servers(ctx.guild.id) + description_lines = [] + overall_color = discord.Color.green() + + # 1. Read Test + try: + server_data = server_instance.get() + if server_data: + description_lines.append("āœ… **Read Test:** Server found in the database.") + else: + description_lines.append("āš ļø **Read Test:** Server not found in the database (needs setup).") + except ConnectionFailure as e: + description_lines.append(f"āŒ **Read Test Failed:** Could not connect to the database.\n`{e}`") + overall_color = discord.Color.red() + except Exception as e: + description_lines.append(f"āŒ **Read Test Failed:** An unexpected error occurred.\n`{e}`") + overall_color = discord.Color.red() + + # 2. Write Test (only if read didn't fail due to connection) + if overall_color == discord.Color.green(): + try: + # Perform a test update. This adds a temporary field. + server_instance.update(debug_test=True) + description_lines.append("āœ… **Write Test:** Successfully wrote a test value to the database.") + except ConnectionFailure as e: + description_lines.append(f"āŒ **Write Test Failed:** Could not connect to the database.\n`{e}`") + overall_color = discord.Color.red() + except Exception as e: + description_lines.append(f"āŒ **Write Test Failed:** An unexpected error occurred.\n`{e}`") + overall_color = discord.Color.red() + + embed = discord.Embed( + title="Database Connection Health Check", + description="\n".join(description_lines), + color=overall_color + ) + + await ctx.send(embed=embed) + + # Command to list all servers stored in the database. + @checks.manager() # Only allow bot managers to use this command. + @commands.command() + async def dbinfo(self, ctx): + """(Managers Only) Lists all servers stored in the database.""" + all_servers = Servers().get_all() # Use the get_all method from your database class + + if not all_servers: + return await ctx.send("The database is currently empty.") + + description = "" + for server in all_servers: + # Get the server name and ID from the database entry. + server_name = server.get('server_name', 'Unknown Name') + server_id = server.get('_id', 'Unknown ID') + description += f"**{server_name}**\nID: `{server_id}`\n---\n" + + embed = discord.Embed( + title="Database Server List", + description=description, + color=discord.Color.purple() + ) + await ctx.send(embed=embed) + + # --- NEW COMMAND ADDED HERE --- + @checks.manager() # Ensures only bot managers can use this command. + @commands.command() + async def dbwrite(self, ctx, server_id: int, field: str, *, value: str): + """(Managers Only) Manually writes a value to a specific field in the database. + + Usage: !dbwrite + Example: !dbwrite 1234567890 tags gaming, fun, community + """ + + server_instance = Servers(server_id) + + # First, check if a document for this server even exists. + if not server_instance.get(): + embed = discord.Embed( + title="āŒ Write Failed", + description=f"No server with the ID `{server_id}` was found in the database.", + color=discord.Color.red() + ) + return await ctx.send(embed=embed) + + try: + # Create a dictionary with the field and value to update. + # The ** operator unpacks the dictionary into keyword arguments for the update method. + update_data = {field.lower(): value} + server_instance.update(**update_data) + + # Send a confirmation message. + embed = discord.Embed( + title="āœ… Database Write Successful", + description=f"Successfully updated the server document for ID `{server_id}`.", + color=discord.Color.green() + ) + embed.add_field(name="Field Updated", value=f"`{field.lower()}`", inline=True) + embed.add_field(name="New Value", value=f"```{value}```", inline=False) + await ctx.send(embed=embed) + + except Exception as e: + # Handle any potential errors during the database operation. + embed = discord.Embed( + title="āŒ Write Failed", + description=f"An unexpected error occurred while writing to the database.\n`{e}`", + color=discord.Color.red() + ) + await ctx.send(embed=embed) + + +# The setup function that discord.py calls to load the cog. +async def setup(bot): + # This adds the cog to the bot. + await bot.add_cog(Debug(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/cogs/edit.py b/src/ver/0.0.2/cogs/edit.py new file mode 100644 index 0000000..9996b91 --- /dev/null +++ b/src/ver/0.0.2/cogs/edit.py @@ -0,0 +1,121 @@ +# /cogs/edit.py + +import discord +from discord.ext import commands +from core.database import Servers +from core.embeds import Embeds +from core.files import Data + +class Edit(commands.Cog): + def __init__(self, bot): + self.bot = bot + self.config = Data("config").yaml_read() + self.settings = Data("settings").json_read() + + @commands.group(invoke_without_command=True, aliases=['modify']) + @commands.guild_only() + @commands.has_permissions(manage_guild=True) + async def edit(self, ctx: commands.Context): + """Parent command for editing server settings. Shows help if no subcommand is used.""" + await ctx.send_help(ctx.command) + + @edit.before_invoke + async def check_server_setup(self, ctx: commands.Context): + """A check that runs before any subcommand to ensure the server is set up.""" + server = Servers(ctx.guild.id) + if not server.get(): + raise commands.CheckFailure("This server has not been set up yet!") + + def _get_server_link(self, guild: discord.Guild) -> str: + """Helper function to create the server list link using the server name.""" + if self.settings.get('enable_serverlist'): + server_name_url = guild.name.replace(' ', '-') + serverlist_url = self.settings.get('serverlist_url', '') + return f"\n\n[Check it out on the server list!]({serverlist_url}server/{server_name_url})" + return "" + + @edit.command(name="desc", aliases=["description"]) + async def edit_description(self, ctx: commands.Context, *, description: str): + """Edits the server's description.""" + if not (10 <= len(description) <= 2048): + return await ctx.send(embed=Embeds("Your description must be between 10 and 2048 characters long.").error()) + + Servers(ctx.guild.id).update(description=description) + description_text = "The server description has been updated successfully!" + self._get_server_link(ctx.guild) + await ctx.send(embed=Embeds(description_text).success()) + + @edit.command(name="color", aliases=["colour"]) + async def edit_color(self, ctx: commands.Context, *, hex_color: str): + """Edits the server's embed color.""" + try: + color_value = int(hex_color.replace("#", ""), 16) + Servers(ctx.guild.id).update(color=color_value) + description_text = f"The server embed color has been set to `{hex_color}`!" + self._get_server_link(ctx.guild) + await ctx.send(embed=Embeds(description_text).success()) + except ValueError: + await ctx.send(embed=Embeds("That is not a valid hex color! Please use a format like `#ff0000`.").error()) + + @edit.command(name="welcome", aliases=["invite"]) + async def edit_welcome(self, ctx: commands.Context, channel: discord.TextChannel): + """Edits the server's welcome/invite channel.""" + if not channel.permissions_for(ctx.me).create_instant_invite: + return await ctx.send(embed=Embeds("I cannot create invites for that channel!").error()) + + new_invite = await channel.create_invite(max_uses=0, reason="Updated server listing invite") + Servers(ctx.guild.id).update(invite_code=new_invite.code) + + description_text = f"The welcome/invite channel has been set to {channel.mention}!" + self._get_server_link(ctx.guild) + await ctx.send(embed=Embeds(description_text).success()) + + @edit.command(name="bumpchannel", aliases=["bumps"]) + async def edit_bump_channel(self, ctx: commands.Context, channel: discord.TextChannel): + """Edits the channel where bumps are sent by creating a new webhook.""" + server = Servers(ctx.guild.id) + + if not channel.permissions_for(ctx.me).manage_webhooks: + return await ctx.send(embed=Embeds(f"I don't have **Manage Webhooks** permission in {channel.mention}!").error()) + + try: + server_data = server.get() + old_webhook_id = server_data.get('webhook') + if old_webhook_id: + old_webhook = await self.bot.fetch_webhook(old_webhook_id) + await old_webhook.delete(reason="Changed bump channel via command.") + except discord.NotFound: + pass + except Exception as e: + await ctx.send(embed=Embeds(f"Could not delete the old webhook, but will proceed. Error: `{e}`").error()) + + new_webhook = await channel.create_webhook(name=self.config.get('bot_name', 'Bump Bot')) + + server.update(webhook=new_webhook.id) + description_text = f"The bump channel has been successfully set to {channel.mention}!" + self._get_server_link(ctx.guild) + await ctx.send(embed=Embeds(description_text).success()) + + @edit.command(name="tags") + async def edit_tags(self, ctx: commands.Context, *, tags: str): + """Edits the server's tags.""" + if len(tags) > 200: + return await ctx.send(embed=Embeds("Your tag list is too long! (Max 200 characters)").error()) + + Servers(ctx.guild.id).update(tags=tags) + description_text = "The server tags have been updated successfully!" + self._get_server_link(ctx.guild) + await ctx.send(embed=Embeds(description_text).success()) + + @edit.command(name="vanity") + async def edit_vanity(self, ctx: commands.Context, *, code: str): + """Edits the server's vanity URL code. Use 'none' to remove.""" + server = Servers(ctx.guild.id) + + if code.lower() in ['none', 'remove', 'delete']: + server.collection.update_one({"_id": ctx.guild.id}, {"$unset": {"vanity_code": ""}}) + description_text = "The server's vanity URL has been removed." + self._get_server_link(ctx.guild) + await ctx.send(embed=Embeds(description_text).success()) + else: + server.update(vanity_code=code) + description_text = f"The server's vanity URL has been set to `discord.gg/{code}`!" + self._get_server_link(ctx.guild) + await ctx.send(embed=Embeds(description_text).success()) + + +async def setup(bot): + await bot.add_cog(Edit(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/cogs/handler.py b/src/ver/0.0.2/cogs/handler.py new file mode 100644 index 0000000..e09e119 --- /dev/null +++ b/src/ver/0.0.2/cogs/handler.py @@ -0,0 +1,29 @@ +import discord + +from humanfriendly import format_timespan as ftime +from humanfriendly import round_number +from core import embeds + +commands = discord.ext.commands + +class ErrorHandler(commands.Cog): + def __init__(self, bot): + self.bot = bot + + @commands.Cog.listener() + async def on_command_error(self, ctx, error): + if isinstance(error, commands.MissingRequiredArgument): + return await ctx.send(embed=embeds.Embeds(f"Missing `{error.param}` as a required argument.").error()) + elif isinstance(error, commands.CommandNotFound): + return + elif isinstance(error, commands.CheckFailure): + return await ctx.send(embed=embeds.Embeds("You are not allowed to do this.").error()) + elif isinstance(error, commands.CommandOnCooldown): + seconds = error.retry_after + return await ctx.send(embed=embeds.Embeds(f"**You are on cooldown!** You can use this command again in **{ftime(seconds)}**.").error()) + else: + await ctx.send(embed=embeds.Embeds("There was an error executing this command.").error(Error=error)) + raise error + +async def setup(bot): + await bot.add_cog(ErrorHandler(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/cogs/help.py b/src/ver/0.0.2/cogs/help.py new file mode 100644 index 0000000..cf78ad0 --- /dev/null +++ b/src/ver/0.0.2/cogs/help.py @@ -0,0 +1,74 @@ +# /cogs/help.py + +import discord +from discord.ext import commands + +class Help(commands.Cog): + def __init__(self, bot): + self.bot = bot + + @commands.command(name="cmds", aliases=["cmd", "commands", "help"]) + async def cmds(self, ctx: commands.Context): + """Displays a list of all available commands.""" + + # Get the prefix dynamically for the current server + prefix = ctx.prefix + + # Create the initial embed + embed = discord.Embed( + title="šŸ¤– Bot Commands", + description=f"Here is a list of commands you can use. The prefix for this server is `{prefix}`.", + color=discord.Color.blurple() + ) + + # Add a field for each command + embed.add_field( + name=f"{prefix}setup", + value="Starts the interactive setup process to list your server.", + inline=False + ) + embed.add_field( + name=f"{prefix}bump", + value="Bumps your server, sending its listing to the bump channel.", + inline=False + ) + embed.add_field( + name=f"{prefix}edit ", + value="Edits a specific part of your server's setup.\n**Subcommands:** `desc`, `welcome`, `bumpchannel`, `color`, `tags`, `slug`", + inline=False + ) + embed.add_field( + name=f"{prefix}setprefix ", + value="Changes the bot's prefix for this server. Resets to default if no prefix is given.", + inline=False + ) + embed.add_field( + name=f"{prefix}sync", + value="Syncs server info (name, icon) with Discord and displays a full status report.", + inline=False + ) + embed.add_field( + name=f"{prefix}delete", + value="Removes your server from the database and listing.", + inline=False + ) + embed.add_field( + name="Utility Commands", + value=f"`{prefix}ping` - Checks the bot's latency.\n`{prefix}avatar` - Shows a user's avatar.", + inline=False + ) + embed.add_field( + name="Manager Commands", + value=f"`{prefix}restart` - Restarts the bot.\n`{prefix}shutdown` - Shuts down the bot.", + inline=False + ) + + + embed.set_footer(text=f"Requested by {ctx.author.display_name}", icon_url=ctx.author.display_avatar.url) + embed.timestamp = discord.utils.utcnow() + + await ctx.send(embed=embed) + + +async def setup(bot): + await bot.add_cog(Help(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/cogs/info.py b/src/ver/0.0.2/cogs/info.py new file mode 100644 index 0000000..0ba6f9e --- /dev/null +++ b/src/ver/0.0.2/cogs/info.py @@ -0,0 +1,36 @@ +import discord + +from core.database import Servers +from core.files import Data +from core.embeds import Embeds + +commands = discord.ext.commands + +class Info(commands.Cog): + def __init__(self, bot): + self.bot = bot + self.config = Data("config").yaml_read() + + @commands.guild_only() + @commands.command(aliases=['about']) + async def info(self, ctx): + return await ctx.send(embed=discord.Embed( + title=f"{self.config['bot_name']} | Information", + color=discord.Color.blurple() + ) + .add_field(name="Version", value=self.config['version']) + .add_field(name="Library", value=f"Discord.py v{discord.__version__}") + .add_field(name="Latency", value=f"{round(self.bot.latency*1000)}ms") + .add_field(name="Servers", value=len(self.bot.guilds)) + .add_field(name="Active Servers", value=len([i for i in Servers().get_all()])) + .add_field(name="Support Server", value=str("[Unstable Reality](https://discord.kitsunic.org/server/unstableReality)")) + .add_field(name="Server List", value=str("[Server List](https://servers.kitsunic.org)")) + .set_footer(text="Made by ā€¢ " + ', '.join([str((await self.bot.fetch_user(i))) for i in self.config['managers']]))) + + @commands.guild_only() + @commands.command(aliases=["add"]) + async def invite(self, ctx): + await ctx.send(embed=discord.Embed(title="Invte me to your server!", description=f"[Click here to invite me!](https://discord.com/api/oauth2/authorize?client_id={self.bot.user.id}&permissions=537152577&scope=bot)", color=discord.Color.green())) + +async def setup(bot): + await bot.add_cog(Info(bot)) diff --git a/src/ver/0.0.2/cogs/power.py b/src/ver/0.0.2/cogs/power.py new file mode 100644 index 0000000..7e835c7 --- /dev/null +++ b/src/ver/0.0.2/cogs/power.py @@ -0,0 +1,69 @@ +# /cogs/shutdown.py + +import discord +import json +import subprocess +from discord.ext import commands +from core import checks + +class Power(commands.Cog): + def __init__(self, bot): + self.bot = bot + + @checks.manager() + @commands.group(invoke_without_command=True, aliases=['reboot']) + async def restart(self, ctx: commands.Context): + """(Managers Only) Restarts the bot or the web server.""" + await ctx.invoke(self.bot.get_command('restart bot')) + + @restart.command(name="bot", aliases=['discord']) + async def restart_bot(self, ctx: commands.Context): + """(Managers Only) Restarts the Discord bot.""" + try: + with open("restart_info.json", "w") as f: + json.dump({"channel_id": ctx.channel.id}, f) + + await ctx.send("šŸ”„ Restarting the Discord bot...") + await self.bot.close() + except Exception as e: + await ctx.send(f"An error occurred during bot restart: `{e}`") + + @restart.command(name="serverlist", aliases=['server', 'slist']) + async def restart_serverlist(self, ctx: commands.Context): + """(Managers Only) Restarts the Flask web server via PM2.""" + await ctx.send("Attempting to restart the web server...") + + try: + command = ["pm2", "restart", "klist"] + # We still run the command and capture output for logging + result = subprocess.run(command, capture_output=True, text=True, check=True) + + # --- CHANGED: Send a simple confirmation message --- + await ctx.send("āœ… Web server restarted successfully.") + # Print the detailed output to the bot's console for debugging + print(f"PM2 restart output for 'klist':\n{result.stdout}") + + except subprocess.CalledProcessError as e: + # --- CHANGED: Send a simple failure message --- + await ctx.send("āŒ Failed to restart the web server. Check the bot's console logs for details.") + # Print the detailed error to the bot's console for debugging + print(f"Failed to restart PM2 process 'klist'. Stderr:\n{e.stderr}") + + except FileNotFoundError: + await ctx.send("Error: The `pm2` command was not found on the system.") + except Exception as e: + await ctx.send(f"An unexpected error occurred: `{e}`") + + @checks.manager() + @commands.command(aliases=['off']) + async def shutdown(self, ctx: commands.Context): + """(Managers Only) Shuts down the Discord bot completely.""" + try: + await ctx.send("šŸ›‘ Shutting down the Discord bot...") + await self.bot.close() + except Exception as e: + await ctx.send(f"An error occurred during shutdown: `{e}`") + + +async def setup(bot): + await bot.add_cog(Power(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/cogs/prefix.py b/src/ver/0.0.2/cogs/prefix.py new file mode 100644 index 0000000..2432961 --- /dev/null +++ b/src/ver/0.0.2/cogs/prefix.py @@ -0,0 +1,69 @@ +# cogs/prefix.py (Updated to match the new database.py) + +import discord +from discord.ext import commands +from core.database import Servers +from core.files import Data +from core import embeds + +# --- Caching --- +prefix_cache = {} +default_prefix = Data('config').yaml_read().get('prefix', '!') + +def getPrefix(bot, message): + """Determines the prefix for a command.""" + if not message.guild: + return commands.when_mentioned_or(default_prefix)(bot, message) + + if message.guild.id in prefix_cache: + custom_prefix = prefix_cache[message.guild.id] + return commands.when_mentioned_or(custom_prefix or default_prefix)(bot, message) + + server = Servers(message.guild.id) + # Use the new snake_case method name + custom_prefix = server.get_prefix() + + # Cache the result (even if it's None) to prevent future DB calls + prefix_cache[message.guild.id] = custom_prefix + + return commands.when_mentioned_or(custom_prefix or default_prefix)(bot, message) + +class SetPrefix(commands.Cog): + def __init__(self, bot): + self.bot = bot + self.default_prefix = default_prefix + + @commands.guild_only() + @commands.has_permissions(manage_guild=True) + @commands.command() + async def setprefix(self, ctx: commands.Context, *, prefix: str = None): + """Sets a custom prefix for this server or resets it to the default.""" + server = Servers(ctx.guild.id) + + if prefix is None or prefix == self.default_prefix: + try: + # Use the new snake_case method name + server.delete_prefix() + prefix_cache[ctx.guild.id] = None # Update cache + return await ctx.send(embed=embeds.Embeds(f"The prefix has been reset to the default: `{self.default_prefix}`").success()) + except Exception as e: + return await ctx.send(embed=embeds.Embeds(f"An error occurred while resetting the prefix: `{e}`").error()) + + if len(prefix) > 10: + return await ctx.send(embed=embeds.Embeds("The prefix cannot be longer than 10 characters.").error()) + + try: + # Use the new snake_case method name + server.set_prefix(prefix) + prefix_cache[ctx.guild.id] = prefix # Update cache + return await ctx.send(embed=embeds.Embeds(f"The server prefix has been set to: `{prefix}`").success()) + except Exception as e: + return await ctx.send(embed=embeds.Embeds(f"An error occurred while setting the prefix: `{e}`").error()) + + @commands.Cog.listener() + async def on_cog_unload(self): + prefix_cache.clear() + print("Prefix cache cleared due to cog unload.") + +async def setup(bot): + await bot.add_cog(SetPrefix(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/cogs/setup.py b/src/ver/0.0.2/cogs/setup.py new file mode 100644 index 0000000..1d978cf --- /dev/null +++ b/src/ver/0.0.2/cogs/setup.py @@ -0,0 +1,246 @@ +import discord, asyncio +from discord.ext import commands +from core.database import Servers +from core.embeds import Embeds +from core.files import Data + +class BumpSetup(commands.Cog): + def __init__(self, bot): + self.bot = bot + self.config = Data("config").yaml_read() + self.settings = Data("settings").json_read() + global setting_up + setting_up = [] + + @commands.Cog.listener('on_guild_remove') + async def remove_guild(self, guild): + Servers(guild.id).delete() + + @commands.guild_only() + @commands.has_permissions(manage_guild=True) + @commands.check(lambda ctx: ctx.guild not in setting_up) + @commands.command() + async def setup(self, ctx): + server = Servers(ctx.guild.id) + custom_prefix = server.get_prefix() + prefix = custom_prefix if custom_prefix else self.config["prefix"] + + if server.get(): + return await ctx.send(embed=Embeds(f"This server was already setup! Use `{prefix}delete` to initialize another setup!").error()) + + embed = discord.Embed( + title="šŸ”„ Setting Up...", + color=discord.Color.green() + ) + embed.set_author(name=str(ctx.author), icon_url=ctx.author.display_avatar.url) + + embed.description = "Enter your **Server's Description**! Remember that it must be between **10** and **2048** characters long!" + await ctx.send(embed=embed) + try: + description = (await self.bot.wait_for( + 'message', + timeout=120, + check=lambda message: message.author.id == ctx.author.id and len(message.content) and message.channel.id == ctx.channel.id + )).content + if len(description) > 2048: + return await ctx.send(embed=Embeds("Setup canceled, your description is too long!").error()) + elif len(description) < 10: + return await ctx.send(embed=Embeds("Setup canceled, your description is too short!").error()) + except asyncio.TimeoutError: + return await ctx.send(embed=Embeds("Setup canceled, timeout!").error()) + + embed.description = "Enter your **Server's Tags**, separated by commas (e.g., `gaming, fun, community`)." + await ctx.send(embed=embed) + try: + tags_input = (await self.bot.wait_for( + 'message', + timeout=120, + check=lambda message: message.author.id == ctx.author.id and len(message.content) and message.channel.id == ctx.channel.id + )).content + if len(tags_input) > 200: + return await ctx.send(embed=Embeds("Setup canceled, your tag list is too long! (Max 200 characters)").error()) + except asyncio.TimeoutError: + return await ctx.send(embed=Embeds("Setup canceled, timeout!").error()) + + # --- NEW VANITY URL STEP --- + embed.description = "Enter your server's **vanity URL code** (the part after `discord.gg/`).\nType `none` if you don't have one." + await ctx.send(embed=embed) + try: + vanity_code = (await self.bot.wait_for('message', timeout=120, check=lambda m: m.author == ctx.author and m.channel == ctx.channel)).content + if vanity_code.lower() in ['none', 'skip', 'no']: + vanity_code = None + except asyncio.TimeoutError: + return await ctx.send(embed=Embeds("Setup canceled, timeout!").error()) + # --- END OF NEW STEP --- + + embed.description = "Enter the channel to fetch invites from. Make sure the bot has permission to **Create Instant Invite** for it!" + await ctx.send(embed=embed) + try: + invite_channel = await commands.TextChannelConverter().convert(ctx, (await self.bot.wait_for( + 'message', + timeout=120, + check=lambda message: message.author.id == ctx.author.id and len(message.content) and message.channel.id == ctx.channel.id + )).content) + + if not invite_channel.permissions_for(ctx.me).create_instant_invite: + return await ctx.send(embed=Embeds("Setup canceled, I cannot **Create Instant Invites** for that channel!").error()) + + new_invite = await invite_channel.create_invite(max_uses=0, reason="Server listing invite") + + except asyncio.TimeoutError: + return await ctx.send(embed=Embeds("Setup canceled, timeout!").error()) + except commands.ChannelNotFound: + return await ctx.send(embed=Embeds("Setup canceled, channel not found!").error()) + + embed.description = "Enter the channel to send bumps at. Make sure the bot has permission to **Manage Webhooks** for it!" + await ctx.send(embed=embed) + try: + listing = await commands.TextChannelConverter().convert(ctx, (await self.bot.wait_for( + 'message', + timeout=120, + check=lambda message: message.author.id == ctx.author.id and len(message.content) and message.channel.id == ctx.channel.id + )).content) + + if not listing.permissions_for(ctx.me).manage_webhooks: + return await ctx.send(embed=Embeds("Setup canceled, I cannot **Manage Webhooks** for that channel!").error()) + + except asyncio.TimeoutError: + return await ctx.send(embed=Embeds("Setup canceled, timeout!").error()) + except commands.ChannelNotFound: + return await ctx.send(embed=Embeds("Setup canceled, channel not found!").error()) + + embed.description = "Enter a `HEX` color for your bump embed!" + await ctx.send(embed=embed) + try: + color = int((await self.bot.wait_for( + 'message', + timeout=120, + check=lambda message: message.author.id == ctx.author.id and len(message.content) and message.channel.id == ctx.channel.id + )).content.replace("#", ""), 16) + + except asyncio.TimeoutError: + return await ctx.send(embed=Embeds("Setup canceled, timeout!").error()) + except ValueError: + return await ctx.send(embed=Embeds("Setup canceled, invalid color!").error()) + + webhook = await listing.create_webhook(name=self.config.get('bot_name', 'Bump Bot')) + + server.add( + webhook=webhook.id, + invite_code=new_invite.code, + vanity_code=vanity_code, + color=color, + description=description, + icon_url=str(ctx.guild.icon.url if ctx.guild.icon else None), + server_name=ctx.guild.name, + tags=tags_input + ) + + description_text = "The server was added to the Database and can now be bumped! Good luck on your server's growth! You can always use the delete command to remove it." + + if self.settings.get('enable_serverlist'): + server_name_url = ctx.guild.name.replace(' ', '-') + serverlist_url = self.settings.get('serverlist_url', '') + description_text += f"\n\nYour server was also added to our Server List! [Check it out!]({serverlist_url}server/{server_name_url})" + + return await ctx.send(embed=discord.Embed( + title="šŸ‘Œ Setup Complete", + description=description_text, + color=discord.Color.green() + )) + + @commands.guild_only() + @commands.has_permissions(manage_guild=True) + @commands.check(lambda ctx: ctx.guild not in setting_up) + @commands.command() + async def delete(self, ctx): + server = Servers(ctx.guild.id) + if not server.get(): + return await ctx.send(embed=Embeds("The server does not have any data in the Database!").error()) + + confirmation_message = await ctx.send(embed=discord.Embed( + title="āš ļø Confirmation Required āš ļø", + description=f"**{ctx.author}**, you're about to delete your server from the database! This will remove all data. **Are you sure?**", + color=discord.Color.orange() + )) + + emojis = ["āœ…", "āŽ"] + + for emoji in emojis: await confirmation_message.add_reaction(emoji) + + try: + reaction, user = await self.bot.wait_for( + 'reaction_add', + timeout=120, + check=lambda r, u: r.emoji in emojis and r.message.id == confirmation_message.id and u.id == ctx.author.id + ) + except asyncio.TimeoutError: + await ctx.send(embed=Embeds("Server deletion canceled due to timeout!").error()) + return await confirmation_message.delete() + + if reaction.emoji == emojis[1]: + return await ctx.send(embed=Embeds("Server deletion canceled.").error()) + + cache_data = server.get() + server.delete() + + setting_up.remove(ctx.guild) + + del_message = await ctx.send(embed=discord.Embed( + title="šŸ—‘ļø Server Deleted", + description="The server was deleted from the database! You also can react below within one minute to restore it.", + color=discord.Color.green() + )) + + await del_message.add_reaction("ā™»ļø") + + try: + await self.bot.wait_for( + 'reaction_add', + timeout=60, + check=lambda r,u: r.emoji == "ā™»ļø" and r.message.id == del_message.id and u.id == ctx.author.id + ) + except asyncio.TimeoutError: + try: + if 'webhook' in cache_data: + wh = await self.bot.fetch_webhook(cache_data['webhook']) + await wh.delete() + except: + pass + return await del_message.remove_reaction("ā™»ļø", self.bot.user) + + if Servers(ctx.guild.id).get(): + try: + if 'webhook' in cache_data: + wh = await self.bot.fetch_webhook(cache_data['webhook']) + await wh.delete() + except: + pass + return await ctx.send(embed=discord.Embed( + title="āŽ Restore Failed", + description="The server seems to have been setup from the beginning, therefore restore is not possible.", + color=discord.Color.red() + )) + + Servers(ctx.guild.id).add(**cache_data) + + return await ctx.send(embed=discord.Embed( + title="ā™»ļø Server Restored", + description="Your server was restored, all data are safe and sound.", + color=discord.Color.green() + )) + + @setup.before_invoke + @delete.before_invoke + async def add_to_setting_up(self, ctx): + setting_up.append(ctx.guild) + + @setup.after_invoke + @delete.after_invoke + async def remove_from_setting_up(self, ctx): + try: + setting_up.remove(ctx.guild) + except: pass + +async def setup(bot): + await bot.add_cog(BumpSetup(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/cogs/sync.py b/src/ver/0.0.2/cogs/sync.py new file mode 100644 index 0000000..cf9fb66 --- /dev/null +++ b/src/ver/0.0.2/cogs/sync.py @@ -0,0 +1,132 @@ +# /cogs/sync.py + +import discord +from discord.ext import commands +from core.database import Servers +from core.embeds import Embeds +from core.files import Data + +class Sync(commands.Cog): + def __init__(self, bot): + self.bot = bot + self.settings = Data("settings").json_read() + + @commands.command() + @commands.guild_only() + @commands.has_permissions(manage_guild=True) + async def sync(self, ctx): + """Syncs with Discord API, fetches official tags, and displays all saved settings.""" + server = Servers(ctx.guild.id) + server_data = server.get() + if not server_data: + return await ctx.send(embed=Embeds("This server has not been set up yet!").error()) + + # --- PART 1: SYNCING LOGIC --- + try: + full_guild = await self.bot.fetch_guild(ctx.guild.id) + except discord.Forbidden: + return await ctx.send(embed=Embeds("The bot doesn't have permission to fetch server details.").error()) + + updates = { + 'server_name': full_guild.name, + 'icon_url': str(full_guild.icon.url if full_guild.icon else None) + } + + # Fetch official Discord Discovery tags and save them to a separate field. + official_tags = getattr(full_guild, 'tags', []) + if official_tags: + updates['discovery_tags'] = ', '.join(official_tags) + else: + # If no official tags, remove the field from the DB to keep it clean. + server.collection.update_one({"_id": ctx.guild.id}, {"$unset": {"discovery_tags": ""}}) + + # (Your existing invite fixing logic can remain here if needed) + if 'invite' in server_data and 'invite_code' not in server_data: + try: + old_invite_channel_id = server_data['invite'] + channel = self.bot.get_channel(old_invite_channel_id) + if channel and channel.permissions_for(ctx.me).create_instant_invite: + new_invite = await channel.create_invite(max_uses=0, reason="Fixing server listing invite via sync") + updates['invite_code'] = new_invite.code + server.collection.update_one({"_id": ctx.guild.id}, {"$unset": {"invite": ""}}) + print(f"Fixed invite link for server {ctx.guild.name}") + except Exception as e: + print(f"Could not fix invite for {ctx.guild.name}: {e}") + + server.update(**updates) + # Refresh local data with the changes we just saved to the DB + server_data = server.get() + + # --- PART 2: DISPLAY ALL INFO --- + try: + embed_color = discord.Color(server_data.get('color', 0x2F3136)) + except (ValueError, TypeError): + embed_color = discord.Color.default() + + embed = discord.Embed( + title=f"āœ… Sync & Status Report for {ctx.guild.name}", + description="Server info has been synced with Discord. Here are your current saved settings:", + color=embed_color + ) + embed.set_thumbnail(url=full_guild.icon.url if full_guild.icon else None) + + description = server_data.get('description', 'Not set.') + embed.add_field(name="šŸ“ Description", value=f"```{description[:1000]}...```" if len(description) > 1000 else f"```{description}```", inline=False) + + custom_tags = server_data.get('tags', 'Not set.') + embed.add_field(name="šŸ·ļø Custom Tags", value=custom_tags, inline=False) + + discovery_tags = server_data.get('discovery_tags') + if discovery_tags: + embed.add_field(name="šŸŒ Official Discovery Tags", value=discovery_tags, inline=False) + + vanity_code = server_data.get('vanity_code') + if vanity_code: + embed.add_field(name="šŸ”— Vanity URL", value=f"`discord.gg/{vanity_code}`", inline=True) + + invite_code = server_data.get('invite_code') + if invite_code: + embed.add_field(name="āœ‰ļø Invite Code", value=f"`{invite_code}`", inline=True) + + webhook_id = server_data.get('webhook') + if webhook_id: + try: + webhook = await self.bot.fetch_webhook(webhook_id) + embed.add_field(name="šŸ“¢ Bump Channel", value=f"<#{webhook.channel_id}>", inline=True) + except discord.NotFound: + embed.add_field(name="šŸ“¢ Bump Channel", value="*Webhook missing*", inline=True) + + hex_color = hex(server_data.get('color', 0)).replace('0x', '#') + embed.add_field(name="šŸŽØ Embed Color", value=f"`{hex_color}`", inline=True) + + embed.set_footer(text=f"Server ID: {ctx.guild.id}") + await ctx.send(embed=embed) + + @commands.Cog.listener() + async def on_guild_update(self, before, after): + """Automatically syncs when the server name, icon, or tags change.""" + server = Servers(after.id) + if server.get(): + updates = {} + if before.name != after.name: + updates['server_name'] = after.name + + before_icon = str(before.icon.url if before.icon else None) + after_icon = str(after.icon.url if after.icon else None) + if before_icon != after_icon: + updates['icon_url'] = after_icon + + before_tags = getattr(before, 'tags', []) + after_tags = getattr(after, 'tags', []) + + if before_tags != after_tags: + # This updates the *official* tags, not custom ones + updates['discovery_tags'] = ', '.join(after_tags) if after_tags else 'No tags set' + + if updates: + server.update(**updates) + print(f"Automatically synced changes for server: {after.name}") + + +async def setup(bot): + await bot.add_cog(Sync(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/core/asyncHandler.py b/src/ver/0.0.2/core/asyncHandler.py new file mode 100644 index 0000000..105b4df --- /dev/null +++ b/src/ver/0.0.2/core/asyncHandler.py @@ -0,0 +1,6 @@ +import aiohttp + +async def get(url, json=True): + async with aiohttp.ClientSession() as session: + async with session.get(url) as response: + return (await response.json()) if json else (await response.text()) \ No newline at end of file diff --git a/src/ver/0.0.2/core/checks.py b/src/ver/0.0.2/core/checks.py new file mode 100644 index 0000000..1a1fb87 --- /dev/null +++ b/src/ver/0.0.2/core/checks.py @@ -0,0 +1,9 @@ +from .files import Data +from discord.ext import commands + +config = Data("config").yaml_read() + +def manager(): + def predicate(ctx): + return ctx.author.id in config["managers"] + return commands.check(predicate) \ No newline at end of file diff --git a/src/ver/0.0.2/core/database.py b/src/ver/0.0.2/core/database.py new file mode 100644 index 0000000..83c03f5 --- /dev/null +++ b/src/ver/0.0.2/core/database.py @@ -0,0 +1,61 @@ +# core/database.py + +from pymongo import MongoClient +from core.files import Data + +# Initialize the client once at the module level +client = MongoClient(Data('config').yaml_read()['mongo']) + +class Servers: + def __init__(self, server_id=None): + self.server_id = server_id + # All server-related data now lives in a single collection + self.collection = client["BytesBump"]["servers"] + + def get(self): + """Finds a single server document by its ID.""" + return self.collection.find_one({"_id": self.server_id}) + + def get_all(self): + """Returns a list of all documents in the servers collection.""" + return list(self.collection.find({})) + + def add(self, **params): + """Adds a new server document to the database.""" + params['_id'] = self.server_id + self.collection.insert_one(params) + + def update(self, **params): + """Updates fields in a server document.""" + self.collection.update_one( + {"_id": self.server_id}, + {"$set": params} + ) + + def delete(self): + """Removes a server document from the database.""" + if self.server_id: + self.collection.delete_one({'_id': self.server_id}) + + # --- REFACTORED PREFIX MANAGEMENT --- + + def get_prefix(self): + """Gets a custom prefix for a server from its document.""" + server_data = self.get() + # Return the prefix if it exists in the document, otherwise return None + if server_data: + return server_data.get('prefix') + return None + + def set_prefix(self, prefix: str): + """Sets or updates the prefix for a server.""" + # This will add the 'prefix' field to the document or update its value. + self.update(prefix=prefix) + + def delete_prefix(self): + """Removes the custom prefix from a server document.""" + # The $unset operator is the correct way to remove a field from a document. + self.collection.update_one( + {"_id": self.server_id}, + {"$unset": {"prefix": ""}} + ) \ No newline at end of file diff --git a/src/ver/0.0.2/core/embeds.py b/src/ver/0.0.2/core/embeds.py new file mode 100644 index 0000000..a0946cf --- /dev/null +++ b/src/ver/0.0.2/core/embeds.py @@ -0,0 +1,33 @@ +import random +from discord import Embed, Color + +class Embeds: + def __init__(self, message): + self.message = message + + def success(self, **kwargs): + embed = Embed( + description=self.message, + color=Color.green() + ) + for i in kwargs: + embed.add_field(name=i.replace("_", " "), value=kwargs[i]) + return embed + + def error(self, **kwargs): + embed = Embed( + description=self.message, + color=Color.red() + ) + for i in kwargs: + embed.add_field(name=i.replace("_", " "), value=kwargs[i]) + return embed + + def warn(self, **kwargs): + embed = Embed( + description=self.message, + color=Color.orange() + ) + for i in kwargs: + embed.add_field(name=i.replace("_", " "), value=kwargs[i]) + return embed \ No newline at end of file diff --git a/src/ver/0.0.2/core/files.py b/src/ver/0.0.2/core/files.py new file mode 100644 index 0000000..ff47363 --- /dev/null +++ b/src/ver/0.0.2/core/files.py @@ -0,0 +1,16 @@ +from yaml import load as yload, FullLoader +from json import load as jload +class Data: + def __init__(self, filename:str): + self.file = filename + + def yaml_read(self): + with open(f"data/{self.file}.yml", "r") as f: + return yload(f, Loader=FullLoader) + + def json_read(self): + with open(f"data/{self.file}.json", "r") as f: + return jload(f) + + def read(self): + return open(f"data/{self.file}.txt", "r").read() \ No newline at end of file diff --git a/src/ver/0.0.2/data/config.yml b/src/ver/0.0.2/data/config.yml new file mode 100644 index 0000000..7d5e274 --- /dev/null +++ b/src/ver/0.0.2/data/config.yml @@ -0,0 +1,7 @@ +managers: +- USERID +prefix: '!!' +token: "" +version: '0.2' +mongo: "mongodb://HOST:PORT/DATABASE" +bot_name: "kBump" diff --git a/src/ver/0.0.2/data/help.py b/src/ver/0.0.2/data/help.py new file mode 100644 index 0000000..f0418db --- /dev/null +++ b/src/ver/0.0.2/data/help.py @@ -0,0 +1,73 @@ +# /cogs/help.py + +import discord +from discord.ext import commands + +class Help(commands.Cog): + def __init__(self, bot): + self.bot = bot + + @commands.command(name="cmds", aliases=["cmd", "commands"]) + async def cmds(self, ctx: commands.Context): + """Displays a list of all available commands.""" + + # Get the prefix dynamically for the current server + prefix = ctx.prefix + + # Create the initial embed + embed = discord.Embed( + title="šŸ¤– Bot Commands", + description=f"Here is a list of commands you can use. The prefix for this server is `{prefix}`.", + color=discord.Color.blurple() + ) + + # Add a field for each command + embed.add_field( + name=f"{prefix}setup", + value="Starts the interactive setup process to list your server.", + inline=False + ) + embed.add_field( + name=f"{prefix}bump", + value="Bumps your server, sending its listing to the bump channel.", + inline=False + ) + embed.add_field( + name=f"{prefix}edit ", + value="Edits a specific part of your server's setup.\n**Subcommands:** `desc`, `welcome`, `bumpchannel`, `color`, `tags`", + inline=False + ) + embed.add_field( + name=f"{prefix}setprefix ", + value="Changes the bot's prefix for this server. Resets to default if no prefix is given.", + inline=False + ) + embed.add_field( + name=f"{prefix}sync", + value="Manually syncs your server's name, icon, and tags with the database.", + inline=False + ) + embed.add_field( + name=f"{prefix}info", + value="Displays information about your server's listing.", + inline=False + ) + embed.add_field( + name=f"{prefix}delete", + value="Removes your server from the database and listing.", + inline=False + ) + embed.add_field( + name="Utility Commands", + value=f"`{prefix}ping` - Checks the bot's latency.\n`{prefix}avatar` - Shows a user's avatar.", + inline=False + ) + + embed.set_footer(text=f"Requested by {ctx.author.display_name}", icon_url=ctx.author.display_avatar.url) + embed.timestamp = discord.utils.utcnow() + + await ctx.send(embed=embed) + + +async def setup(bot): + await bot.add_cog(Help(bot)) \ No newline at end of file diff --git a/src/ver/0.0.2/data/motd.txt b/src/ver/0.0.2/data/motd.txt new file mode 100644 index 0000000..298ea93 --- /dev/null +++ b/src/ver/0.0.2/data/motd.txt @@ -0,0 +1,2 @@ +This is a Message of the Day! +This will appear after the bump message IF "show_motd" is set to true in settings.json! \ No newline at end of file diff --git a/src/ver/0.0.2/data/settings.json b/src/ver/0.0.2/data/settings.json new file mode 100644 index 0000000..078b6d1 --- /dev/null +++ b/src/ver/0.0.2/data/settings.json @@ -0,0 +1,7 @@ +{ + "cooldown": 3600, + "show_motd": true, + "show_motd_wait": 10, + "enable_serverlist": true, + "serverlist_url": "https://servers.kitsunic.org/" +} diff --git a/src/ver/0.0.2/main.py b/src/ver/0.0.2/main.py new file mode 100644 index 0000000..cc1dce3 --- /dev/null +++ b/src/ver/0.0.2/main.py @@ -0,0 +1,125 @@ +# This is the refactored main bot file for discord.py v2.6.0 + +import discord +import os +import asyncio +import json +from discord.ext import commands +from pathlib import Path +from colorama import init, Style, Fore +from cogs.prefix import getPrefix +from core.files import Data +from core import checks + +# Initialize colorama +init(autoreset=True) + +# --- REFACTORED: More specific intents are better practice than .all() --- +intents = discord.Intents.default() +intents.members = True +intents.message_content = True + +class BumpBot(commands.Bot): + def __init__(self): + super().__init__( + command_prefix=getPrefix, + case_insensitive=True, + help_command=None, + intents=intents + ) + + async def setup_hook(self): + """This is called automatically before the bot connects.""" + print("--- Loading Cogs ---") + + # --- REFACTORED: Cleaner cog loading using pathlib --- + cogs_path = Path("cogs") + # The glob pattern "**/*.py" finds all .py files in "cogs" and any subdirectories + for file in cogs_path.glob("**/*.py"): + if file.stem == "__init__": + continue # Skip __init__.py files + + # Format the path into the dot-notation required by load_extension + # e.g., cogs/utils/tools.py -> cogs.utils.tools + cog_module = ".".join(file.parts).removesuffix(".py") + + try: + await self.load_extension(cog_module) + print(f"{Fore.GREEN}[SUCCESS] {Style.RESET_ALL}Successfully loaded {Fore.YELLOW}{cog_module}") + except Exception as e: + print(f"{Fore.RED}[ERROR] {Style.RESET_ALL}Failed to load {Fore.YELLOW}{cog_module} {Style.RESET_ALL}due to an exception: {Style.DIM}{e}") + + print("--- Finished Loading Cogs ---") + + async def on_ready(self): + """Called when the bot is ready and connected to Discord.""" + print(f"{Fore.CYAN}[READY] {Style.RESET_ALL}Bot initialized as {self.user}!") + try: + if os.path.exists("restart_info.json"): + with open("restart_info.json", "r") as f: + data = json.load(f) + channel_id = data.get("channel_id") + + if channel_id: + channel = self.get_channel(channel_id) + if channel: + await channel.send("āœ… **I'm back online!**") + + # Clean up the file so it doesn't run on the next startup + os.remove("restart_info.json") + except Exception as e: + print(f"{Fore.RED}[ERROR] {Style.RESET_ALL}Could not process restart_info.json: {e}") + + # --- Management Commands (with added type hints) --- + + @checks.manager() + @commands.command(name='eval', aliases=["e"]) + async def _eval(self, ctx: commands.Context, *, body: str): + """Evaluates python code. A standard dev command.""" + # This command is complex and powerful, no changes needed to its logic. + # Your implementation is solid. + # (Eval command logic remains the same as your original) + pass # Placeholder for your existing eval code + + @checks.manager() + @commands.command(hidden=True) + async def load(self, ctx: commands.Context, *, module: str): + """Loads a cog. Use dot-notation for subdirectories (e.g., utils.tools).""" + try: + await self.load_extension(f"cogs.{module}") + embed=discord.Embed(title=f"Loaded {module.capitalize()}", description=f"Successfully loaded `cogs.{module}`!", color=0x2cf818) + await ctx.send(embed=embed) + except commands.ExtensionError as e: + await ctx.send(f'{e.__class__.__name__}: {e}') + + @checks.manager() + @commands.command(hidden=True) + async def unload(self, ctx: commands.Context, *, module: str): + """Unloads a cog. Use dot-notation for subdirectories.""" + try: + await self.unload_extension(f"cogs.{module}") + embed=discord.Embed(title=f"Unloaded {module.capitalize()}", description=f"Successfully unloaded `cogs.{module}`!", color=0xeb1b2c) + await ctx.send(embed=embed) + except commands.ExtensionError as e: + await ctx.send(f'{e.__class__.__name__}: {e}') + + @checks.manager() + @commands.command(name="reload", hidden=True) + async def _reload(self, ctx: commands.Context, *, module: str): + """Reloads a cog. Use dot-notation for subdirectories.""" + try: + await self.reload_extension(f"cogs.{module}") + embed=discord.Embed(title=f"Reloaded {module.capitalize()}", description=f"Successfully reloaded `cogs.{module}`!", color=0x00d4ff) + await ctx.send(embed=embed) + except commands.ExtensionError as e: + await ctx.send(f'{e.__class__.__name__}: {e}') + +# --- NEW: Modern asynchronous startup --- +async def main(): + config = Data("config").yaml_read() + bot = BumpBot() + async with bot: + await bot.start(config["token"]) + +if __name__ == "__main__": + asyncio.run(main()) \ No newline at end of file diff --git a/src/ver/0.0.2/requirements.txt b/src/ver/0.0.2/requirements.txt new file mode 100644 index 0000000..d7082ab --- /dev/null +++ b/src/ver/0.0.2/requirements.txt @@ -0,0 +1,10 @@ +humanfriendly +Python.js +discord +discord.py +colorama +pymongo +dnspython +PyYAML +requests +flask \ No newline at end of file