✨ added sync and unsync commands, code reformat

Author: kkrypt0nn

bot.py

@@ -13,14 +13,12 @@
 import random
 import sqlite3
 import sys
-
 from contextlib import closing
 
 import discord
 from discord import Interaction
-from discord.ext import tasks, commands
-from discord.ext.commands import Bot
-from discord.ext.commands import Context
+from discord.ext import commands, tasks
+from discord.ext.commands import Bot, Context
 
 import exceptions
 
@@ -71,9 +69,10 @@
 
 If you want to use prefix commands, make sure to also enable the intent below in the Discord developer portal.
 """
-intents.message_content = True
+# intents.message_content = True
 
-bot = Bot(command_prefix=commands.when_mentioned_or(config["prefix"]), intents=intents, help_command=None)
+bot = Bot(command_prefix=commands.when_mentioned_or(
+    config["prefix"]), intents=intents, help_command=None)
 
 
 def init_db():
@@ -97,6 +96,7 @@ def connect_db():
 bot.config = config
 bot.db = connect_db()
 
+
 @bot.event
 async def on_ready() -> None:
     """
@@ -108,7 +108,6 @@ async def on_ready() -> None:
     print(f"Running on: {platform.system()} {platform.release()} ({os.name})")
     print("-------------------")
     status_task.start()
-    await bot.tree.sync(guild=bot.get_guild(bot.config["dev_guild_id"])) # This will load only the 'sync' and 'unsync' commands for the dev guild
 
 
 @tasks.loop(minutes=1.0)
@@ -145,7 +144,8 @@ async def on_command_completion(context: Context) -> None:
         print(
             f"Executed {executed_command} command in {context.guild.name} (ID: {context.guild.id}) by {context.author} (ID: {context.author.id})")
     else:
-        print(f"Executed {executed_command} command by {context.author} (ID: {context.author.id}) in DMs")
+        print(
+            f"Executed {executed_command} command by {context.author} (ID: {context.author.id}) in DMs")
 
 
 @bot.event
@@ -222,4 +222,4 @@ async def load_cogs() -> None:
 
 init_db()
 asyncio.run(load_cogs())
-bot.run(config["token"])
+bot.run(config["token"])

cogs/fun.py

@@ -13,7 +13,6 @@
 from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
-
 from helpers import checks
 
 
@@ -66,7 +65,8 @@ async def callback(self, interaction: discord.Interaction):
         bot_choice_index = choices[bot_choice]
 
         result_embed = discord.Embed(color=0x9C84EF)
-        result_embed.set_author(name=interaction.user.name, icon_url=interaction.user.avatar.url)
+        result_embed.set_author(
+            name=interaction.user.name, icon_url=interaction.user.avatar.url)
 
         if user_choice_index == bot_choice_index:
             result_embed.description = f"**That's a draw!**\nYou've chosen {user_choice} and I've chosen {bot_choice}."
@@ -104,7 +104,7 @@ def __init__(self, bot):
     async def randomfact(self, context: Context) -> None:
         """
         Get a random fact.
-        
+
         :param context: The hybrid command context.
         """
         # This will prevent your bot from stopping everything when doing a web request - see: https://discordpy.readthedocs.io/en/stable/faq.html#how-do-i-make-a-web-request
@@ -132,7 +132,7 @@ async def randomfact(self, context: Context) -> None:
     async def coinflip(self, context: Context) -> None:
         """
         Make a coin flip, but give your bet before.
-        
+
         :param context: The hybrid command context.
         """
         buttons = Choice()
@@ -164,7 +164,7 @@ async def coinflip(self, context: Context) -> None:
     async def rock_paper_scissors(self, context: Context) -> None:
         """
         Play the rock paper scissors game against the bot.
-        
+
         :param context: The hybrid command context.
         """
         view = RockPaperScissorsView()

cogs/moderation.py

@@ -10,9 +10,7 @@
 from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
-
-from helpers import checks
-from helpers import db_manager
+from helpers import checks, db_manager
 
 
 class Moderation(commands.Cog, name="moderation"):
@@ -112,7 +110,7 @@ async def nick(self, context: Context, user: discord.User, nickname: str = None)
     async def ban(self, context: Context, user: discord.User, reason: str = "Not specified") -> None:
         """
         Bans a user from the server.
-        
+
         :param context: The hybrid command context.
         :param user: The user that should be banned from the server.
         :param reason: The reason for the ban. Default is "Not specified".
@@ -176,7 +174,8 @@ async def warning_add(self, context: Context, user: discord.User, reason: str =
         :param reason: The reason for the warn. Default is "Not specified".
         """
         member = context.guild.get_member(user.id) or await context.guild.fetch_member(user.id)
-        total = db_manager.add_warn(user.id, context.guild.id, context.author.id, reason)
+        total = db_manager.add_warn(
+            user.id, context.guild.id, context.author.id, reason)
         embed = discord.Embed(
             title="User Warned!",
             description=f"**{member}** was warned by **{context.author}**!\nTotal warns for this user: {total}",
@@ -227,13 +226,13 @@ async def warning_add(self, context: Context, user: discord.User, warn_id: int)
     async def warning_list(self, context: Context, user: discord.User):
         """
         Shows the warnings of a user in the server.
-        
+
         :param context: The hybrid command context.
         :param user: The user you want to get the warnings of.
         """
         warnings_list = db_manager.get_warnings(user.id, context.guild.id)
         embed = discord.Embed(
-            title = f"Warnings of {user}",
+            title=f"Warnings of {user}",
             color=0x9C84EF
         )
         description = ""

cogs/owner.py

@@ -14,60 +14,97 @@
 from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
-
-from helpers import checks
-from helpers import db_manager
+from helpers import checks, db_manager
 
 if not os.path.isfile("config.json"):
     sys.exit("'config.json' not found! Please add it and try again.")
 else:
     with open("config.json") as file:
         config = json.load(file)
 
+
 class Owner(commands.Cog, name="owner"):
     def __init__(self, bot):
         self.bot = bot
-    
-    DEV_GUILD = discord.Object(id=config["dev_guild_id"])
 
-    @commands.hybrid_command(
+    @commands.command(
         name="sync",
         description="Synchonizes the slash commands.",
     )
+    @app_commands.describe(scope="The scope of the sync. Can be `global` or `guild`")
     @checks.is_owner()
-    @app_commands.guilds(DEV_GUILD)
-    async def sync(self, context: Context) -> None:
+    async def sync(self, context: Context, scope: str) -> None:
         """
         Synchonizes the slash commands.
 
-        :param context: The hybrid command context.
+        :param context: The command context.
+        :param scope: The scope of the sync. Can be `global` or `guild`.
         """
-        await self.bot.tree.sync()
-        embed = discord.Embed(
-            title="Slash Commands Sync",
-            description="Slash commands have been synchronized.",
-        )
-        await context.send(embed=embed)
 
-    @commands.hybrid_command(
+        if scope == "global":
+            await context.bot.tree.sync()
+            embed = discord.Embed(
+                title="Slash Commands Sync",
+                description="Slash commands have been globally synchronized.",
+                color=0x9C84EF
+            )
+            await context.send(embed=embed)
+        elif scope == "guild":
+            context.bot.tree.copy_global_to(guild=context.guild)
+            await context.bot.tree.sync(guild=context.guild)
+            embed = discord.Embed(
+                title="Slash Commands Sync",
+                description="Slash commands have been synchronized in this guild.",
+                color=0x9C84EF
+            )
+            await context.send(embed=embed)
+        else:
+            embed = discord.Embed(
+                title="Invalid Scope",
+                description="The scope must be `global` or `guild`.",
+                color=0xE02B2B
+            )
+            await context.send(embed=embed)
+
+    @commands.command(
         name="unsync",
         description="Unsynchonizes the slash commands.",
     )
+    @app_commands.describe(scope="The scope of the sync. Can be `global`, `current_guild` or `guild`")
     @checks.is_owner()
-    @app_commands.guilds(DEV_GUILD)
-    async def unsync(self, context: Context) -> None:
+    async def unsync(self, context: Context, scope: str) -> None:
         """
         Unsynchonizes the slash commands.
 
-        :param context: The hybrid command context.
+        :param context: The command context.
+        :param scope: The scope of the sync. Can be `global`, `current_guild` or `guild`.
         """
-        self.bot.tree.clear_commands(guild=None)
-        await self.bot.tree.sync()
-        embed = discord.Embed(
-            title="Slash Commands Unsync",
-            description="Slash commands have been unsynchronized.",
-        )
-        await context.send(embed=embed)
+
+        if scope == "global":
+            context.bot.tree.clear_commands(guild=None)
+            await context.bot.tree.sync()
+            embed = discord.Embed(
+                title="Slash Commands Unsync",
+                description="Slash commands have been globally unsynchronized.",
+                color=0x9C84EF
+            )
+            await context.send(embed=embed)
+        elif scope == "guild":
+            context.bot.tree.clear_commands(guild=context.guild)
+            await context.bot.tree.sync(guild=context.guild)
+            embed = discord.Embed(
+                title="Slash Commands Unsync",
+                description="Slash commands have been unsynchronized in this guild.",
+                color=0x9C84EF
+            )
+            await context.send(embed=embed)
+        else:
+            embed = discord.Embed(
+                title="Invalid Scope",
+                description="The scope must be `global` or `guild`.",
+                color=0xE02B2B
+            )
+            await context.send(embed=embed)
 
     @commands.hybrid_command(
         name="load",
@@ -151,7 +188,7 @@ async def reload(self, context: Context, cog: str) -> None:
             title="Reload",
             description=f"Successfully reloaded the `{cog}` cog."
         )
-        await context.send(embed=embed)    
+        await context.send(embed=embed)
 
     @commands.hybrid_command(
         name="shutdown",

cogs/template.py

@@ -8,7 +8,6 @@
 
 from discord.ext import commands
 from discord.ext.commands import Context
-
 from helpers import checks
 
 
@@ -17,8 +16,8 @@ class Template(commands.Cog, name="template"):
     def __init__(self, bot):
         self.bot = bot
 
-
     # Here you can just add your own commands, you'll always need to provide "self" as first parameter.
+
     @commands.hybrid_command(
         name="testcommand",
         description="This is a testing command that does nothing.",

config.json

@@ -3,7 +3,6 @@
   "token": "YOUR_BOT_TOKEN_HERE",
   "permissions": "YOUR_BOT_PERMISSIONS_HERE",
   "application_id": "YOUR_APPLICATION_ID_HERE",
-  "dev_guild_id": "YOUR_DEVELOPMENT_GUILD_ID_HERE",
   "owners": [
     123456789,
     987654321

helpers/checks.py

@@ -7,10 +7,9 @@
 """
 
 import json
-from typing import TypeVar, Callable
+from typing import Callable, TypeVar
 
 from discord.ext import commands
-
 from exceptions import *
 
 from helpers import db_manager