Interaction patches

.gitignore

@@ -1,4 +1,5 @@
-
-.env
 .env
 *.pyc
+latest.log
+config.json
+*.json

cogs/core.py

@@ -1,39 +1,137 @@
-# import os
-# import sys
-# import discord
-
-# from cool_utils import Terminal
-# from utils.shortcode import respond, author
-# from dotenv import load_dotenv, find_dotenv
-
-# from discord import app_commands
-# from discord.ext import commands
-
-# def env(variable: str):
-# 	load_dotenv(find_dotenv())
-# 	env = os.getenv(variable)
-# 	if env == None:
-# 		Terminal.error(f"Environmental variable \"{variable}\" not found.")
-# 		return None
-# 	else:
-# 		return env
-
-# def owner(author):
-# 	if int(author.id) == int(env("OWNER")):
-# 		return True
-# 	else:
-# 		return False
-
-# class Core(commands.Cog):
-# 	def __init__(self, bot):
-# 		self.bot = bot
-
-# 	@tree.command(guild=CORE_GUILD, description="Shuts down the bot.")
-# 	async def shutdown(self, inter: discord.Interaction):
-# 		if owner(author(inter)) == False:
-# 			return await respond(inter, f":no_entry_sign: You don't have permissions to use this command.", ephemeral=True)
-# 		await respond(inter, f":ballot_box_with_check: Bot Shutting Down...", ephemeral=True)
-# 		sys.exit()
-
-# def setup(bot):
-# 	bot.add_cog(Core(bot))
+from distutils import extension
+import sys
+import discord
+
+from discord import app_commands
+from discord.ext import commands
+
+from discord.app_commands import Choice
+
+from utils.globals import (
+	respond,
+	author,
+	owner,
+	output
+)
+
+UNLOADED_EXTENSIONS = []
+LOADED_EXTENSIONS = []
+
+class Core(commands.Cog):
+	def __init__(self, bot):
+		self.bot = bot
+		for extension in self.bot.UNLOADED_EXTENSIONS:
+			UNLOADED_EXTENSIONS.append(extension)
+
+		for extension in self.bot.LOADED_EXTENSIONS:
+			LOADED_EXTENSIONS.append(extension)
+
+	async def get_loaded_extensions(self, interaction, current: str):
+		if LOADED_EXTENSIONS == []:
+			return [Choice(name="No Extensions", value="No Extensions")]
+		return [
+			app_commands.Choice(name=extension, value=extension)
+			for extensions in LOADED_EXTENSIONS if current.lower() in extensions.lower()
+		]
+
+	async def get_unloaded_extensions(self, interaction, current: str):
+		if UNLOADED_EXTENSIONS == []:
+			return [Choice(name="No Extensions", value="No Extensions")]
+		return [
+			app_commands.Choice(name=extension, value=extension)
+			for extensions in UNLOADED_EXTENSIONS if current.lower() in extensions.lower()
+		]
+
+	@app_commands.command(
+		name = "reload",
+		description = "Reloads a cog."
+	)
+	@app_commands.describe(extension = "Cog extension that needs to be reloaded.")
+	@app_commands.autocomplete(extension = get_loaded_extensions)
+	async def reload(self, interaction, extension: str):
+		respond = interaction.response.send_message
+		author = interaction.user
+
+		await interaction.response.send_message(
+			"Processing command, please hold...",
+			ephemeral = True
+		)
+		if await self.bot.owner(interaction = interaction) == False:
+			return
+		try:
+			await self.bot.unload_extension(f"cogs.{extension}")
+			self.bot.LOADED_EXTENSIONS.remove(extension)
+			self.bot.UNLOADED_EXTENSIONS.append(extension)
+			await self.bot.load_extension(f"cogs.{extension}")
+			self.bot.UNLOADED_EXTENSIONS.remove(extension)
+			self.bot.LOADED_EXTENSIONS.append(extension)
+			output(f"Reloaded Cog \"{extension}\"")
+			await interaction.response.edit_message(content = f":ballot_box_with_check: **`cogs.{extension}` reloaded.**")
+		except Exception as error:
+			output(f"An error occurred while reloading \"{extension}\" cog.")
+			await interaction.response.edit_message(content = f":warning: An error occurred while reloading **`cogs.{extension}`**.\n\n```py\n{error}\n```")
+
+	@app_commands.command(
+		name = "load",
+		description="Loads a cog."
+	)
+	@app_commands.describe(extension = "Cog extension that needs to be loaded.")
+	@app_commands.autocomplete(extension = get_unloaded_extensions)
+	async def load(self, interaction, extension: str):
+		respond = interaction.response.send_message
+		author = interaction.user
+
+		await interaction.response.send_message(
+			"Processing command, please hold...",
+			ephemeral = True
+		)
+		if await self.bot.owner(interaction = interaction) == False:
+			return
+		try:
+			await self.bot.load_extension(f"cogs.{extension}")
+			self.bot.UNLOADED_EXTENSIONS.remove(extension)
+			self.bot.LOADED_EXTENSIONS.append(extension)
+			output(f"Loaded Cog \"{extension}\"")
+			await interaction.response.edit_message(content = f":ballot_box_with_check: **`cogs.{extension}` loaded.**")
+		except Exception as error:
+			output(f"An error occurred while loading \"{extension}\" cog.")
+			await interaction.response.edit_message(content = f":warning: An error occurred while loading **`cogs.{extension}`**.\n\n```py\n{error}\n```")
+
+	@app_commands.command(
+		name = "unload",
+		description = "Unloads a cog."
+	)
+	@app_commands.describe(extension = "Cog extension that needs to be unloaded.")
+	@app_commands.autocomplete(extension = get_loaded_extensions)
+	async def unload(self, interaction, extension: str):
+		respond = interaction.response.send_message
+		author = interaction.user
+
+		await interaction.response.send_message(
+			"Processing command, please hold...",
+			ephemeral = True
+		)
+		if await self.bot.owner(interaction = interaction) == False:
+			return
+		try:
+			await self.bot.load_extension(f"cogs.{extension}")
+			self.bot.UNLOADED_EXTENSIONS.append(extension)
+			self.bot.LOADED_EXTENSIONS.remove(extension)
+			output(f"Unoaded Cog \"{extension}\"")
+			await interaction.response.edit_message(content = f":ballot_box_with_check: **`cogs.{extension}` unloaded.**")
+		except Exception as error:
+			output(f"An error occurred while unloading \"{extension}\" cog.")
+			await interaction.response.edit_message(content = f":warning: An error occurred while unloading **`cogs.{extension}`**.\n\n```py\n{error}\n```")
+
+	@app_commands.command(
+		name = "shutdown",
+		description = "Shuts down the bot."
+	)
+	async def shutdown(self, interaction: discord.Interaction):
+		if await self.bot.owner(interaction) == False:
+			return await interaction.response.edit_message(content = f":no_entry_sign: You don't have permissions to use this command.")
+		await interaction.response.edit_message(content = f":ballot_box_with_check: Bot Shutting Down...")
+		sys.exit()
+
+async def setup(bot):
+	await bot.add_cog(Core(bot))

cogs/events.py

@@ -22,14 +22,14 @@ class Events(commands.Cog):
 	def __init__(self, bot):
 		self.bot = bot
 
-	@commands.Cog.listener()
-	async def on_member_join(self, member):
+	@commands.Cog.listener("on_member_join")
+	async def user_authorisation(self, member):
 		log = int(env("LOG"))
 		log = await self.bot.fetch_channel(log)
 		if cool_utils.JSON.get_data(f"{member.id}") == "guests":
 			try:
-				role = discord.utils.get(member.guild.roles, id=int(env("GUEST_ROLE")))
-				await member.add_roles(role, reason="User registered as guest.")
+				role = discord.utils.get(member.guild.roles, id = int(env("GUEST_ROLE")))
+				await member.add_roles(role, reason = "User registered as guest.")
 				action = "Authorised as guest"
 				code = "01AG"
 				output(f"Guest \"{member.name}\" joined.")
@@ -40,7 +40,7 @@ async def on_member_join(self, member):
 
 		elif cool_utils.JSON.get_data(f"{member.id}") == "privileged":
 			try:
-				role = discord.utils.get(member.guild.roles, id=int(env("PRIVILEGED_ROLE")))
+				role = discord.utils.get(member.guild.roles, id = int(env("PRIVILEGED_ROLE")))
 				await member.add_roles(role, reason="User registered as privileged")
 				action = "Authorised as privileged"
 				code = "01AP"
@@ -52,8 +52,8 @@ async def on_member_join(self, member):
 
 		elif cool_utils.JSON.get_data(f"{member.id}") == "developer":
 			try:
-				role = discord.utils.get(member.guild.roles, id=int(env("DEVELOPER_ROLE")))
-				await member.add_roles(role, reason="User registered as developer")
+				role = discord.utils.get(member.guild.roles, id = int(env("DEVELOPER_ROLE")))
+				await member.add_roles(role, reason = "User registered as developer")
 				action = "Authorised as developer"
 				code = "01AD"
 				output(f"Privileged User \"{member.name}\" joined.")
@@ -64,31 +64,31 @@ async def on_member_join(self, member):
 
 		else:
 			try:
-				embed = discord.Embed(description=f"You've joined **{member.guild.name}**, although you are not authorised as a guest or privileged. Please contact a administrator of Senarc if you think that this isn't what was meant to happen.", colour=0xFED42A)
-				embed.set_author(name="Unauthorised Entry", icon_url="https://i.ibb.co/3YKyhxJ/black-exclamation-mark-on-yellow-260nw-1902354208-modified.png")
-				embed.set_footer(text="Security Bot", icon_url=member.guild.me.display_avatar)
-				await member.send(embed=embed)
+				embed = discord.Embed(description = f"You've joined **{member.guild.name}**, although you are not authorised as a guest or privileged. Please contact a administrator of Senarc if you think that this isn't what was meant to happen.", colour = 0xFED42A)
+				embed.set_author(name = "Unauthorised Entry", icon_url = "https://i.ibb.co/3YKyhxJ/black-exclamation-mark-on-yellow-260nw-1902354208-modified.png")
+				embed.set_footer(text = "Security Bot", icon_url = member.guild.me.display_avatar)
+				await member.send(embed = embed)
 				code = "01KU"
 			except Exception:
 				code = "EMKU"
 			try:
-				await member.kick(reason=f"Unauthorised User.")
+				await member.kick(reason = f"Unauthorised User.")
 				action = "Kicked for being Unauthorised"
 			except Exception:
 				action = "Kicked for being Unauthorised"
 				code = "EUKU"
 
-		_embed = discord.Embed(colour=0x2F3136)
-		_embed.set_author(name="Security Bot Events")
-		_embed.add_field(name="Action:", value=f"`ON_MESSAGE_JOIN`", inline=False)
-		_embed.add_field(name="Action taken:", value=action, inline=False)
-		_embed.add_field(name="Action Code:", value=f"`{code}`", inline=False)
-		_embed.add_field(name="User:", value=f"{member.name}#{member.discriminator}(`{member.id}`)", inline=False)
-		_embed.set_footer(text="Security Bot", icon_url=member.guild.me.display_avatar)
-		await log.send(embed=_embed)
+		_embed = discord.Embed(colour = 0x2F3136)
+		_embed.set_author(name = "Security Bot Events")
+		_embed.add_field(name = "Action:", value = f"`ON_MESSAGE_JOIN`", inline = False)
+		_embed.add_field(name = "Action taken:", value = action, inline = False)
+		_embed.add_field(name = "Action Code:", value = f"`{code}`", inline = False)
+		_embed.add_field(name = "User:", value = f"{member.name}#{member.discriminator}(`{member.id}`)", inline = False)
+		_embed.set_footer(text = "Security Bot", icon_url = member.guild.me.display_avatar)
+		await log.send(embed = _embed)
 
-	@commands.Cog.listener()
-	async def on_member_remove(self, member):
+	@commands.Cog.listener("on_member_remove")
+	async def member_leave_log(self, member):
 		output(f"User \"{member.name}\" left.")
 		log = int(env("LOG"))
 		log = await self.bot.fetch_channel(log)
@@ -98,68 +98,68 @@ async def on_member_remove(self, member):
 			code = "UB"
 		else:
 			code = "UL"
-		_embed = discord.Embed(colour=0x2F3136)
-		_embed.set_author(name="Security Bot Events")
-		_embed.add_field(name="Action:", value=f"`ON_MEMBER_REMOVE`", inline=False)
-		_embed.add_field(name="Action Code:", value=code, inline=False)
-		_embed.add_field(name="User:", value=f"{member.name}#{member.discriminator}(`{member.id}`)", inline=False)
-		_embed.set_footer(text="Security Bot", icon_url=member.guild.me.display_avatar)
-		await log.send(embed=_embed)
+		_embed = discord.Embed(colour = 0x2F3136)
+		_embed.set_author(name = "Security Bot Events")
+		_embed.add_field(name = "Action:", value = f"`ON_MEMBER_REMOVE`", inline = False)
+		_embed.add_field(name = "Action Code:", value = code, inline = False)
+		_embed.add_field(name = "User:", value = f"{member.name}#{member.discriminator}(`{member.id}`)", inline = False)
+		_embed.set_footer(text = "Security Bot", icon_url = member.guild.me.display_avatar)
+		await log.send(embed = _embed)
 
-	@commands.Cog.listener()
-	async def on_message_delete(self, message):
+	@commands.Cog.listener("on_message_delete")
+	async def message_delete_log(self, message):
 		if message.content == "":
 			return
 		output(f"{message.author.name}'s Message got deleted.")
 		log = int(env("LOG"))
 		log = await self.bot.fetch_channel(log)
-		_embed = discord.Embed(colour=0x2F3136)
-		_embed.set_author(name="Security Bot Events")
-		_embed.add_field(name="Action:", value=f"`ON_MESSAGE_DELETE`", inline=False)
-		_embed.add_field(name="Action Content:", value=f"```\n{message.content.replace('`', '')}\n```", inline=False)
-		_embed.add_field(name="User:", value=f"{message.author.name}#{message.author.discriminator}(`{message.author.id}`)", inline=False)
-		_embed.set_footer(text="Security Bot", icon_url=message.guild.me.display_avatar)
-		await log.send(embed=_embed)
+		_embed = discord.Embed(colour = 0x2F3136)
+		_embed.set_author(name = "Security Bot Events")
+		_embed.add_field(name = "Action:", value = f"`ON_MESSAGE_DELETE`", inline = False)
+		_embed.add_field(name = "Action Content:", value = f"```\n{message.content.replace('`', '')}\n```", inline = False)
+		_embed.add_field(name = "User:", value = f"{message.author.name}#{message.author.discriminator}(`{message.author.id}`)", inline = False)
+		_embed.set_footer(text = "Security Bot", icon_url = message.guild.me.display_avatar)
+		await log.send(embed = _embed)
 
-	@commands.Cog.listener()
-	async def on_message_edit(self, original_message, edited_message):
+	@commands.Cog.listener("on_message_edit")
+	async def message_edit_log(self, original_message, edited_message):
 		if original_message == "" or edited_message == "" or original_message.author.bot:
 			return
 		output(f"{original_message.author.name} Edited their message.")
 		log = int(env("LOG"))
 		log = await self.bot.fetch_channel(log)
-		_embed = discord.Embed(colour=0x2F3136)
-		_embed.set_author(name="Security Bot Events")
-		_embed.add_field(name="Action:", value=f"`ON_MESSAGE_EDIT`", inline=False)
-		_embed.add_field(name="Original Content:", value=f"```\n{original_message.content.replace('`', '')}\n```", inline=False)
-		_embed.add_field(name="Edited Content:", value=f"```\n{edited_message.content.replace('`', '')}\n```", inline=False)
-		_embed.add_field(name="User:", value=f"{original_message.author.name}#{original_message.author.discriminator}(`{original_message.author.id}`)", inline=False)
-		_embed.set_footer(text="Security Bot", icon_url=self.bot.user.display_avatar)
-		await log.send(embed=_embed)
+		_embed = discord.Embed(colour = 0x2F3136)
+		_embed.set_author(name = "Security Bot Events")
+		_embed.add_field(name = "Action:", value = f"`ON_MESSAGE_EDIT`", inline = False)
+		_embed.add_field(name = "Original Content:", value = f"```\n{original_message.content.replace('`', '')}\n```", inline = False)
+		_embed.add_field(name = "Edited Content:", value = f"```\n{edited_message.content.replace('`', '')}\n```", inline = False)
+		_embed.add_field(name = "User:", value = f"{original_message.author.name}#{original_message.author.discriminator}(`{original_message.author.id}`)", inline = False)
+		_embed.set_footer(text = "Security Bot", icon_url = self.bot.user.display_avatar)
+		await log.send(embed = _embed)
 
-	@commands.Cog.listener()
-	async def on_invite_create(self, invite):
+	@commands.Cog.listener("on_invite_create")
+	async def invite_creation_log(self, invite):
 		output(f"Auto-deleted a invite that was created by \"{invite.inviter.name}\".")
 		log = int(env("LOG"))
 		if cool_utils.JSON.get_data(f'{invite.inviter.id}') == 'notified':
 			null = None
 		else:
-			embed = discord.Embed(description="Your Invite has been auto-deleted, you are not allowed to create invites since this is a private server.\n\nIf you want to invite someone to the server you should use https://api.senarc.org/authorise/lab this will help us identify if a user is authorised to join the server.\n\nIf you think this is a mistake, please contact a administrator.", colour=0xFED42A)
-			embed.set_author(name="No Invites Allowed", icon_url="https://i.ibb.co/3YKyhxJ/black-exclamation-mark-on-yellow-260nw-1902354208-modified.png")
-			embed.set_footer(text="Security Bot", icon_url=self.bot.user.display_avatar)
-			await invite.inviter.send(embed=embed)
+			embed = discord.Embed(description = "Your Invite has been auto-deleted, you are not allowed to create invites since this is a private server.\n\nIf you want to invite someone to the server you should use https://api.senarc.org/authorise/lab this will help us identify if a user is authorised to join the server.\n\nIf you think this is a mistake, please contact a administrator.", colour = 0xFED42A)
+			embed.set_author(name = "No Invites Allowed", icon_url = "https://i.ibb.co/3YKyhxJ/black-exclamation-mark-on-yellow-260nw-1902354208-modified.png")
+			embed.set_footer(text = "Security Bot", icon_url = self.bot.user.display_avatar)
+			await invite.inviter.send(embed = embed)
 			cool_utils.register_value(f'{invite.inviter.id}', 'notified')
 		log = await self.bot.fetch_channel(log)
-		_embed = discord.Embed(colour=0x2F3136)
-		_embed.set_author(name="Security Bot Events")
-		_embed.add_field(name="Action:", value=f"`ON_INVITE_CREATE`", inline=False)
-		_embed.add_field(name="Action Taken:", value=f"`INVITE_DELETE`", inline=False)
-		_embed.add_field(name="Invite Code:", value=f"`{invite.code}`", inline=False)
-		_embed.add_field(name="Invite Channel:", value=f"<#{invite.channel.id}>", inline=False)
-		_embed.add_field(name="User:", value=f"{invite.inviter.name}#{invite.inviter.discriminator}(`{invite.inviter.id}`)", inline=False)
-		_embed.set_footer(text="Security Bot", icon_url=self.bot.user.display_avatar)
-		await invite.delete(reason="AUTO-DELETE-PROTECTION-RULE")
-		await log.send(embed=_embed)
+		_embed = discord.Embed(colour = 0x2F3136)
+		_embed.set_author(name = "Security Bot Events")
+		_embed.add_field(name = "Action:", value = f"`ON_INVITE_CREATE`", inline = False)
+		_embed.add_field(name = "Action Taken:", value = f"`INVITE_DELETE`", inline = False)
+		_embed.add_field(name = "Invite Code:", value = f"`{invite.code}`", inline = False)
+		_embed.add_field(name = "Invite Channel:", value = f"<#{invite.channel.id}>", inline = False)
+		_embed.add_field(name = "User:", value = f"{invite.inviter.name}#{invite.inviter.discriminator}(`{invite.inviter.id}`)", inline = False)
+		_embed.set_footer(text = "Security Bot", icon_url = self.bot.user.display_avatar)
+		await invite.delete(reason = "AUTO-DELETE-PROTECTION-RULE")
+		await log.send(embed = _embed)
 
-def setup(bot):
-	bot.add_cog(Events(bot))
+async def setup(bot):
+	await bot.add_cog(Events(bot))