diff --git a/Cogs/Configuration/Configuration.py b/Cogs/Configuration/Configuration.py index f1280b15..02cb27ee 100644 --- a/Cogs/Configuration/Configuration.py +++ b/Cogs/Configuration/Configuration.py @@ -842,7 +842,7 @@ async def callback(self, interaction: discord.Interaction): embed = discord.Embed(title=f"<:command1:1199456319363633192> Custom Commands ({amount}/25)", description="", color=discord.Color.dark_embed()) embed.set_thumbnail(url=interaction.guild.icon) embed.set_author(name=interaction.guild.name, icon_url=interaction.guild.icon) - embed.add_field(name=f"<:settings:1207368347931516928> Custom Commands Configuration", value=f"{replytop}**Enabled:** {modulemsg}\n{replybottom}**Logging Channel:** {loggingmsg}") + embed.add_field(name="<:settings:1207368347931516928> Custom Commands Configuration", value=f"{replytop}**Enabled:** {modulemsg}\n{replybottom}**Logging Channel:** {loggingmsg}") for result in commands: permissions = result.get('permissionroles', 'None') if permissions == 'None': diff --git a/Cogs/Configuration/Views/CustomCommandsView.py b/Cogs/Configuration/Views/CustomCommandsView.py index 38f27e5a..1813fba1 100644 --- a/Cogs/Configuration/Views/CustomCommandsView.py +++ b/Cogs/Configuration/Views/CustomCommandsView.py @@ -80,7 +80,7 @@ async def on_submit(self, interaction: discord.Interaction): if amount >= 25: embed = discord.Embed() embed.title = f"{redx} {amount}/25" - embed.description=f"You have reached the maximum amount of custom commands." + embed.description="You have reached the maximum amount of custom commands." embed.color = discord.Color.brand_red() await interaction.response.edit_message(embed=embed, view=None) @@ -91,7 +91,7 @@ async def on_submit(self, interaction: discord.Interaction): embed = discord.Embed() embed.title = f"{redx} That already exists!" embed.color = discord.Color.brand_red() - embed.description=f"Please try again." + embed.description="Please try again." await interaction.response.edit_message(embed=embed, view=None) return name = self.name.value @@ -121,7 +121,7 @@ async def on_submit(self, interaction: discord.Interaction): embed = interaction.message.embeds[0] if result is None: embed.title = f"{redx} I could not find that." - embed.description=f"I could not find the command you were trying to edit please try again." + embed.description="I could not find the command you were trying to edit please try again." embed.color = discord.Color.brand_red() embed.clear_fields() await interaction.response.edit_message(embed=embed, view=None) @@ -879,7 +879,7 @@ async def refreshembed(interaction): embed = discord.Embed(title=f"<:command1:1199456319363633192> Custom Commands ({amount}/25)", description="", color=discord.Color.dark_embed()) embed.set_thumbnail(url=interaction.guild.icon) embed.set_author(name=interaction.guild.name, icon_url=interaction.guild.icon) - embed.add_field(name=f"<:settings:1207368347931516928> Custom Commands Configuration", value=f"{replytop}**Enabled:** {modulemsg}\n{replybottom}**Logging Channel:** {loggingmsg}") + embed.add_field(name="<:settings:1207368347931516928> Custom Commands Configuration", value=f"{replytop}**Enabled:** {modulemsg}\n{replybottom}**Logging Channel:** {loggingmsg}") for result in commands: permissions = result.get('permissionroles', 'None') if permissions == 'None': diff --git a/Cogs/Configuration/Views/Customationview.py b/Cogs/Configuration/Views/Customationview.py index b4df320c..09bb1949 100644 --- a/Cogs/Configuration/Views/Customationview.py +++ b/Cogs/Configuration/Views/Customationview.py @@ -70,7 +70,7 @@ async def callback(self, interaction: discord.Interaction): color=discord.Colour.brand_red()) return await interaction.response.send_message(embed=embed, ephemeral=True) if color == "Promotions": - embed = discord.Embed(title=f"Staff Promotion", color=0x2b2d31, description="* **User:** {staff.mention}\n* **Updated Rank:** {newrank}\n* **Reason:** {reason}") + embed = discord.Embed(title="Staff Promotion", color=0x2b2d31, description="* **User:** {staff.mention}\n* **Updated Rank:** {newrank}\n* **Reason:** {reason}") embed.set_author(name="Signed, {author.name}", icon_url=interaction.user.display_avatar) embed.set_thumbnail(url=interaction.user.display_avatar) view = Infraction(interaction.user, color) @@ -81,7 +81,7 @@ async def callback(self, interaction: discord.Interaction): embed = discord.Embed(title="Staff Consequences & Discipline", description="* **Staff Member:** {staff.mention}\n* **Action:** {action}\n* **Reason:** {reason}", color=discord.Color.dark_embed()) embed.set_thumbnail(url=interaction.user.display_avatar) embed.set_author(name="Signed, {author.name}", icon_url=interaction.user.display_avatar) - embed.set_footer(text=f"Infraction ID | Test") + embed.set_footer(text="Infraction ID | Test") view = Infraction(interaction.user, color) await interaction.response.edit_message(embed=embed, view=view) embed = discord.Embed(title="Embed Variables", description="**Infractions**\n**Author Name:** {author.name}\n**Staff Name:** {staff}\n**Notes:** {notes}\n**Action:** {action}\n**Reason:** {reason}\n\n**Promotions**\n**Author Name:** {author.name}\n**Staff Name:** {staff}\n**New Rank:** {newrank}\n**Expiration:** {expiration}", color=discord.Color.dark_embed()) diff --git a/Cogs/Configuration/Views/applicationsview.py b/Cogs/Configuration/Views/applicationsview.py index 85be58fe..e2ff8b82 100644 --- a/Cogs/Configuration/Views/applicationsview.py +++ b/Cogs/Configuration/Views/applicationsview.py @@ -314,7 +314,7 @@ async def on_submit(self, interaction: discord.Interaction): return await application.insert_one({'guild_id': interaction.guild.id, 'name': self.name.value, 'saved': False}) view = SectionButtons(author=self.author, name=self.name.value) - embed = discord.Embed(title=f"Application Builder", description=f"No added sections...", color=discord.Colour.dark_embed()) + embed = discord.Embed(title="Application Builder", description="No added sections...", color=discord.Colour.dark_embed()) embed.set_thumbnail(url=interaction.guild.icon) embed.set_author( name=interaction.user.name, @@ -357,7 +357,7 @@ async def on_submit(self, interaction: discord.Interaction): await interaction.response.send_message(f"{no} I couldn't find the application specified.", ephemeral=True) return view = SectionButtons(author=self.author, name=self.name.value) - embed = discord.Embed(title=f"Application Builder", description="", color=discord.Colour.dark_embed()) + embed = discord.Embed(title="Application Builder", description="", color=discord.Colour.dark_embed()) embed.set_thumbnail(url=interaction.guild.icon) embed.set_author( name=interaction.user.name, @@ -395,7 +395,7 @@ async def on_submit(self, interaction: discord.Interaction): view.section5.disabled = False view.save.disabled = False else: - embed.description = f"No sections found for this application." + embed.description = "No sections found for this application." @@ -447,7 +447,7 @@ async def section5(self, interaction: discord.Interaction, button: discord.ui.Bu return await interaction.response.send_message(embed=embed, ephemeral=True) await interaction.response.send_modal(Section5(author=self.author, name=self.name)) - @discord.ui.button(style=discord.ButtonStyle.gray, label="Required Roles", emoji=f"<:Role:1162074735803387944>") + @discord.ui.button(style=discord.ButtonStyle.gray, label="Required Roles", emoji="<:Role:1162074735803387944>") async def role(self, interaction: discord.Interaction, button:discord.ui.Button): if interaction.user.id != self.author.id: embed = discord.Embed(description=f"**{interaction.user.global_name},** this is not your view", @@ -457,7 +457,7 @@ async def role(self, interaction: discord.Interaction, button:discord.ui.Button) view.add_item(RequiredRoles(self.author, self.name)) await interaction.response.send_message(view=view, ephemeral=True) - @discord.ui.button(style=discord.ButtonStyle.gray, label="Accepted Roles", emoji=f"<:Role:1162074735803387944>") + @discord.ui.button(style=discord.ButtonStyle.gray, label="Accepted Roles", emoji="<:Role:1162074735803387944>") async def acceptedroles(self, interaction: discord.Interaction, button:discord.ui.Button): if interaction.user.id != self.author.id: embed = discord.Embed(description=f"**{interaction.user.global_name},** this is not your view", @@ -477,7 +477,7 @@ async def save(self, interaction: discord.Interaction, button:discord.ui.Button) await application.update_one({'guild_id': interaction.guild.id, 'name': self.name}, {'$set': {'saved': True}}) embed = discord.Embed(color=discord.Color.brand_green()) embed.title =f"{greencheck} Succesfully Saved" - embed.description = f"Application Successfully saved!" + embed.description = "Application Successfully saved!" await interaction.response.edit_message( embed=embed, view=None diff --git a/Cogs/Configuration/Views/staffpanel.py b/Cogs/Configuration/Views/staffpanel.py index a9067919..882db031 100644 --- a/Cogs/Configuration/Views/staffpanel.py +++ b/Cogs/Configuration/Views/staffpanel.py @@ -350,7 +350,7 @@ async def Finish(self, interaction: discord.Interaction, button: discord.ui.Butt Customisation.update_one({"name": "Staff Panel", "guild_id": interaction.guild.id}, {"$set": embed_data}, upsert=True) embed = discord.Embed() embed.title = f"{greencheck} Succesfully Updated" - embed.description = f"Start by using /staffpanel" + embed.description = "Start by using /staffpanel" embed.color = discord.Colour.brand_green() await interaction.response.edit_message(content=None, embed=embed, view=None) @@ -472,7 +472,7 @@ async def Finish(self, interaction: discord.Interaction, button: discord.ui.Butt await Customisation.update_one({"name": "Staff Panel", "guild_id": interaction.guild.id}, {"$set": embed_data}, upsert=True) embed = discord.Embed() embed.title = f"{greencheck} Succesfully Updated" - embed.description = f"Start by using /staff panel" + embed.description = "Start by using /staff panel" embed.color = discord.Colour.brand_green() await interaction.response.edit_message(content=None, embed=embed, view=None) diff --git a/Cogs/Configuration/Views/welcomeview.py b/Cogs/Configuration/Views/welcomeview.py index 6cc56801..9a5cff4e 100644 --- a/Cogs/Configuration/Views/welcomeview.py +++ b/Cogs/Configuration/Views/welcomeview.py @@ -541,7 +541,7 @@ async def Finish(self, interaction: discord.Interaction, button: discord.ui.Butt await welcome.update_one({"guild_id": interaction.guild.id}, {"$set": embed_data}, upsert=True) embed = discord.Embed() embed.title = f"{greencheck} Success!" - embed.description = f"Your welcome message has been updated!" + embed.description = "Your welcome message has been updated!" embed.color = discord.Colour.brand_green() await interaction.response.edit_message(content=None, embed=embed, view=None) @@ -678,7 +678,7 @@ async def Finish(self, interaction: discord.Interaction, button: discord.ui.Butt await welcome.update_one({"guild_id": interaction.guild.id}, {"$set": embed_data}, upsert=True) embed = discord.Embed() embed.title = f"{greencheck} Success!" - embed.description = f"Your welcome message has been updated!" + embed.description = "Your welcome message has been updated!" embed.color = discord.Colour.brand_green() await interaction.response.edit_message(content=None, embed=embed, view=None) @@ -718,6 +718,6 @@ async def refreshembed(interaction): class Button(discord.ui.View): def __init__(self): super().__init__() - url = f'https://discord.gg/DhWdgfh3hN' + url = 'https://discord.gg/DhWdgfh3hN' self.add_item(discord.ui.Button(label='All Variables', url="https://docs.astrobirb.dev/astro-birb/configuration/variables", style=discord.ButtonStyle.blurple, emoji="📚")) diff --git a/Cogs/Events/AstroSupport/topgg.py b/Cogs/Events/AstroSupport/topgg.py index d45e105b..35788de6 100644 --- a/Cogs/Events/AstroSupport/topgg.py +++ b/Cogs/Events/AstroSupport/topgg.py @@ -21,7 +21,7 @@ async def update_stats(self): await self.client.topggpy.post_guild_count() print(f"[🔝] Posted server count ({self.client.topggpy.guild_count})") except Exception as e: - print(f"[⬇️] Failed to post server count") + print("[⬇️] Failed to post server count") diff --git a/Cogs/Events/AstroSupport/webhookguilds.py b/Cogs/Events/AstroSupport/webhookguilds.py index 93cbcec2..3bc89fcc 100644 --- a/Cogs/Events/AstroSupport/webhookguilds.py +++ b/Cogs/Events/AstroSupport/webhookguilds.py @@ -36,7 +36,7 @@ async def on_guild_join(self, guild: discord.Guild): class Support(discord.ui.View): def __init__(self): super().__init__() - url1 = f'https://discord.gg/DhWdgfh3hN' + url1 = 'https://discord.gg/DhWdgfh3hN' self.add_item(discord.ui.Button(label='Support Server', url=url1, style=discord.ButtonStyle.blurple, emoji="<:link:1206670134064717904>")) self.add_item(discord.ui.Button(label='Documentation', url="https://docs.astrobirb.dev/overview", style=discord.ButtonStyle.blurple, emoji="📚")) diff --git a/Cogs/Events/modmailevent.py b/Cogs/Events/modmailevent.py index 70e77f17..150fb252 100644 --- a/Cogs/Events/modmailevent.py +++ b/Cogs/Events/modmailevent.py @@ -43,7 +43,7 @@ async def on_message(self, message: discord.Message): if isinstance(message.channel, discord.DMChannel): user_id = message.author.id modmail_data = await modmail.find_one({'user_id': user_id}) - if message.content == f"!close": + if message.content == "!close": if not modmail_data: await message.author.send(f"{no} You are not in a modmail conversation.") return @@ -211,7 +211,7 @@ def check(response): if modmailpingresult: modmailroles = [f'<@&{roleid}>' for sublist in modmailpingresult['modmailping'] for roleid in sublist if selected_server.get_role(roleid) is not None] modmailroles = ", ".join(filter(None, modmailroles)) - info = discord.Embed(title=f"Member Information", description=f"* **User:** {message.author.mention}\n* **Joined:** \n* **Created:** ",timestamp=datetime.utcnow(), color=discord.Color.dark_embed()) + info = discord.Embed(title="Member Information", description=f"* **User:** {message.author.mention}\n* **Joined:** \n* **Created:** ",timestamp=datetime.utcnow(), color=discord.Color.dark_embed()) if user_roles: info.add_field(name=f"Roles [{rolecount}]", value=user_roles, inline=False) info.set_author(name=message.author, icon_url=message.author.display_avatar) @@ -239,7 +239,7 @@ def check(response): await msg.reply("<:Image:1195058849741295748> **Attachment(s)** sent by the user.", files=files) return else: - await channel.send(f"<:Image:1195058849741295748> **Attachment(s)** sent by the user.", files=files) + await channel.send("<:Image:1195058849741295748> **Attachment(s)** sent by the user.", files=files) return try: await channel.send(embed=embed) diff --git a/Cogs/Modules/adminpanel.py b/Cogs/Modules/adminpanel.py index 3471e099..240921c0 100644 --- a/Cogs/Modules/adminpanel.py +++ b/Cogs/Modules/adminpanel.py @@ -129,7 +129,7 @@ async def on_submit(self, interaction: discord.Interaction): if channel: embed = discord.Embed( - title=f"LOA Created", + title="LOA Created", description=f"* **User:** {self.user.mention}\n* **Start Date**: \n* **End Date:** \n* **Reason:** {self.reason}", color=discord.Color.dark_embed(), ) @@ -338,7 +338,7 @@ async def on_submit(self, interaction: discord.Interaction): else: embed = discord.Embed( - title=f"Staff Promotion", + title="Staff Promotion", color=0x2B2D31, description=f"* **User:** {self.user.mention}\n* **Updated Rank:** {role.mention}\n* **Reason:** {reason}", ) @@ -1188,7 +1188,7 @@ async def LOA(self, interaction: discord.Interaction, button: discord.ui.Button) embed = discord.Embed( title="Leave Of Absense", - description=f"\n".join(description), + description="\n".join(description), color=discord.Color.dark_embed(), ) embed.set_thumbnail(url=self.user.display_avatar) @@ -1203,7 +1203,7 @@ async def LOA(self, interaction: discord.Interaction, button: discord.ui.Button) reason = loaa["reason"] embed = discord.Embed( - title=f"Leave Of Absence", + title="Leave Of Absence", color=discord.Color.dark_embed(), description=f"{loa} **Active LOA**\n{arrow}**Start Date:** \n{arrow}**End Date:** \n{arrow}**Reason:** {reason}", ) diff --git a/Cogs/Modules/astro.py b/Cogs/Modules/astro.py index f12b2a45..7083f432 100644 --- a/Cogs/Modules/astro.py +++ b/Cogs/Modules/astro.py @@ -61,7 +61,7 @@ async def analytics(self, ctx: commands.Context): embed = discord.Embed(title="Command Analytics", description=description, color=discord.Color.dark_embed()) embed.set_thumbnail(url=ctx.guild.icon) embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon) - embed.set_footer(text=f"Analytics started on 14th December 2024", + embed.set_footer(text="Analytics started on 14th December 2024", icon_url="https://media.discordapp.net/ephemeral-attachments/1114281227579559998/1197680763341111377/1158064756104630294.png?ex=65bc2621&is=65a9b121&hm=9e278e5e96573663fb42396dd52e56ece56ba6af59e53f9720873ca484fabf19&=&format=webp&quality=lossless") await ctx.send(embed=embed) @@ -124,7 +124,7 @@ async def guildinfo(self, ctx: commands.Context, guildid: int): embed.add_field(name=f"{Settings} Basic Settings", value=f"**Admin Roles:** {adminrolemessage}\n**Staff Roles:** {staffrolemessage}") if modules_info: - embed.add_field(name=f"Modules", value=modules_info, inline=False) + embed.add_field(name="Modules", value=modules_info, inline=False) embed.set_author(name=guild.name, icon_url=guild.icon) await ctx.send(embed=embed) diff --git a/Cogs/Modules/customcommands.py b/Cogs/Modules/customcommands.py index 2c2ede72..8aa09b3d 100644 --- a/Cogs/Modules/customcommands.py +++ b/Cogs/Modules/customcommands.py @@ -187,7 +187,7 @@ async def run(self, ctx: commands.Context, command, channel: discord.TextChannel loggingchannel = self.client.get_channel(loggingdata["channel_id"]) if loggingchannel: embed = discord.Embed( - title=f"Custom Command Usage", + title="Custom Command Usage", description=f"Command **{command}** was used by {ctx.author.mention} in {ctx.channel.mention}", color=discord.Color.dark_embed(), ) @@ -234,7 +234,7 @@ async def run(self, ctx: commands.Context, command, channel: discord.TextChannel loggingchannel = self.client.get_channel(loggingdata["channel_id"]) if loggingchannel: embed = discord.Embed( - title=f"Custom Command Usage", + title="Custom Command Usage", description=f"Command **{command}** was used by {ctx.author.mention} in {ctx.channel.mention}", color=discord.Color.dark_embed(), ) diff --git a/Cogs/Modules/forumutils.py b/Cogs/Modules/forumutils.py index 9bed53bf..d09a1b21 100644 --- a/Cogs/Modules/forumutils.py +++ b/Cogs/Modules/forumutils.py @@ -230,11 +230,11 @@ async def on_submit(self, interaction: discord.Interaction): embed = discord.Embed() embed.title = f"{redx} That already exists." embed.color = discord.Color.brand_red() - embed.description=f"Please try again." + embed.description="Please try again." await interaction.response.edit_message(embed=embed, view=None) return name = self.name.value - embed = discord.Embed(title=f"<:tag:1162134250414415922> Forum Channel", description=f"> Okay, now select a **forum channel.**", color=discord.Color.dark_embed()) + embed = discord.Embed(title="<:tag:1162134250414415922> Forum Channel", description="> Okay, now select a **forum channel.**", color=discord.Color.dark_embed()) view = ForumView(self.author, name) await interaction.response.edit_message(embed=embed, view=view) @@ -389,7 +389,7 @@ async def manage(self, ctx: commands.Context): if role == "" or None: role = None - rolemention = f"None" + rolemention = "None" else: rolemention = f"<@&{role}>" diff --git a/Cogs/Modules/infractions.py b/Cogs/Modules/infractions.py index 167dfd70..3921fc84 100644 --- a/Cogs/Modules/infractions.py +++ b/Cogs/Modules/infractions.py @@ -630,7 +630,7 @@ async def edit(self, ctx: commands.Context, id: str, action, reason: str, notes: try: await msg.edit(embed=embed) except (discord.HTTPException, discord.NotFound): - error = f"<:Crisis:1223063318252748932> I couldn't edit the infraction embed." + error = "<:Crisis:1223063318252748932> I couldn't edit the infraction embed." else: pass else: @@ -652,7 +652,7 @@ async def edit(self, ctx: commands.Context, id: str, action, reason: str, notes: await msg.edit(embed=embed) print(f"Edited the infraction embed for ID: {id}") except (discord.HTTPException, discord.NotFound): - error = f"<:Crisis:1223063318252748932> I couldn't edit the infraction embed." + error = "<:Crisis:1223063318252748932> I couldn't edit the infraction embed." else: pass await collection.update_one(filter, {'$set': {'action': action, 'reason': reason, 'notes': notes}}) diff --git a/Cogs/Modules/loa.py b/Cogs/Modules/loa.py index 159ac4d8..36443dca 100644 --- a/Cogs/Modules/loa.py +++ b/Cogs/Modules/loa.py @@ -73,7 +73,7 @@ async def on_submit(self, interaction: discord.Interaction): channel = interaction.guild.get_channel(channel_id) if channel: - embed = discord.Embed(title=f"LOA Created", + embed = discord.Embed(title="LOA Created", description=f"* **User:** {self.user.mention}\n* **Start Date**: \n* **End Date:** \n* **Reason:** {self.reason}", color=discord.Color.dark_embed()) embed.set_author(icon_url=self.user.display_avatar, name=self.user.display_name) embed.set_thumbnail(url=self.user.display_avatar) @@ -176,7 +176,7 @@ async def check_loa_status(self): print(f"[⚠️] Failed to get channel {channel_id}. Continuing...") continue if channel: - embed = discord.Embed(title=f"LOA Ended", + embed = discord.Embed(title="LOA Ended", description=f"* **User:** {user.mention}\n* **Start Date**: \n* **End Date:** \n* **Reason:** {request['reason']}", color=discord.Color.dark_embed()) embed.set_author(icon_url=user.display_avatar, name=user.display_name) @@ -242,7 +242,7 @@ async def manage(self, ctx: commands.Context, user: discord.Member): f"{loa} **Previous LOA**\n{arrow} - • {reason}") embed = discord.Embed(title="Leave Of Absense", - description=f"\n".join(description), color=discord.Color.dark_embed()) + description="\n".join(description), color=discord.Color.dark_embed()) embed.set_thumbnail(url=user.display_avatar) embed.set_author(icon_url=user.display_avatar, name=user.display_name) view = LOACreate(user, ctx.guild, ctx.author) @@ -253,7 +253,7 @@ async def manage(self, ctx: commands.Context, user: discord.Member): reason = loas['reason'] embed = discord.Embed( - title=f"Leave Of Absence", + title="Leave Of Absence", color=discord.Color.dark_embed(), description=f"{loa} **Active LOA**\n{arrow}**Start Date:** \n{arrow}**End Date:** \n{arrow}**Reason:** {reason}" ) @@ -337,7 +337,7 @@ async def request(self, ctx: commands.Context, duration: app_commands.Range[str, start_time = datetime.now() end_time = start_time + timedelta(seconds=duration_seconds) - embed = discord.Embed(title=f"LOA Request - Pending", + embed = discord.Embed(title="LOA Request - Pending", description=f"* **User:** {ctx.author.mention}\n* **Start Date**: \n* **End Date:** \n* **Reason:** {reason}", color=discord.Color.dark_embed()) embed.set_author(icon_url=ctx.author.display_avatar, name=ctx.author.display_name) @@ -499,7 +499,7 @@ async def cancel(self, interaction: discord.Interaction, button: discord.ui.Butt pass @discord.ui.button(label="Past LOAs | 0", style=discord.ButtonStyle.grey, custom_id='persistent_view:loacount',row=0, - emoji=f"<:case:1214629776606887946>") + emoji="<:case:1214629776606887946>") async def loacount(self, interaction: discord.Interaction, button: discord.ui.Button): loa_data = await loa_collection.find_one({'messageid': interaction.message.id}) if loa_data: diff --git a/Cogs/Modules/modmail.py b/Cogs/Modules/modmail.py index f0cab632..7b59be7b 100644 --- a/Cogs/Modules/modmail.py +++ b/Cogs/Modules/modmail.py @@ -100,7 +100,7 @@ async def reply(self, ctx: commands.Context, *, content, media: discord.Attachme modmail_data = await modmail.find_one({'channel_id': channel_id}) mediamsg = "" if media: - mediamsg = f"**Attachment Below**" + mediamsg = "**Attachment Below**" if modmail_data: user_id = modmail_data.get('user_id') @@ -197,7 +197,7 @@ async def mreply(self, ctx: commands.Context, *, content): mediamsg = "" if ctx.message.attachments: media = ctx.message.attachments[0].url - mediamsg = f"**Attachment Below**" + mediamsg = "**Attachment Below**" if modmail_data: diff --git a/Cogs/Modules/partnerships.py b/Cogs/Modules/partnerships.py index b1c43e3a..8d255505 100644 --- a/Cogs/Modules/partnerships.py +++ b/Cogs/Modules/partnerships.py @@ -102,7 +102,7 @@ async def log(self, ctx: commands.Context, respresentive: discord.User, server: guild_id = "Unknown" if guild is None or guild.id is None else guild.id icon_url = "https://cdn.discordapp.com/attachments/1104358043598200882/1185555135544426618/error-404-page-found-vector-concept-icon-internet-website-down-simple-flat-design_570429-4168.png?ex=65900942&is=657d9442&hm=fc312fddae78ea4347315f4af2893893b684bb9b97686c2859272aa16c81a5b0&h=256&w=256" if guild is None or guild.icon is None else guild.icon invite = "Unknown" if guild is None or invited.url is None else invited.url - embed = discord.Embed(title=f"<:Partner:1162135285031772300> Partnership Logged", description=f"\n**Logged By:** {ctx.author.mention}\n**Owner:** {respresentive.mention}\n**Server:** {guild_name}\n**Server ID:** {guild_id}\n**Invite:** {invite}", color=discord.Color.dark_embed()) + embed = discord.Embed(title="<:Partner:1162135285031772300> Partnership Logged", description=f"\n**Logged By:** {ctx.author.mention}\n**Owner:** {respresentive.mention}\n**Server:** {guild_name}\n**Server ID:** {guild_id}\n**Invite:** {invite}", color=discord.Color.dark_embed()) embed.set_author(name=guild_name, icon_url=icon_url) embed.set_thumbnail(url=guild.icon.url) try: @@ -164,7 +164,7 @@ async def terminate(self, ctx: commands.Context, server, reason: app_commands.Ra icon_url = "https://cdn.discordapp.com/attachments/1104358043598200882/1185555135544426618/error-404-page-found-vector-concept-icon-internet-website-down-simple-flat-design_570429-4168.png?ex=65900942&is=657d9442&hm=fc312fddae78ea4347315f4af2893893b684bb9b97686c2859272aa16c81a5b0&h=256&w=256" if guild is None or guild.icon is None else guild.icon invite = "Unknown" if guild is None or invite.url is None else invite.url - embed = discord.Embed(title=f"<:Partner:1162135285031772300> Partnership Terminated", description=f"\n**Logged By:** {admin.mention}\n**Owner:** {owner.mention}\n**Server:** {guild_name}\n**Server ID:** {guild_id}\n**Invite:** {invite}\n**Reason:** {reason}", color=discord.Color.dark_embed()) + embed = discord.Embed(title="<:Partner:1162135285031772300> Partnership Terminated", description=f"\n**Logged By:** {admin.mention}\n**Owner:** {owner.mention}\n**Server:** {guild_name}\n**Server ID:** {guild_id}\n**Invite:** {invite}\n**Reason:** {reason}", color=discord.Color.dark_embed()) embed.set_author(name=guild_name, icon_url=icon_url) embed.set_thumbnail(url=icon_url) try: @@ -217,7 +217,7 @@ async def all(self, ctx: commands.Context): admin_mention = "Unknown" if admin is None or admin.mention is None else admin.mention owner_mention = "Unknown" if owner is None or owner.mention is None else owner.mention embed = discord.Embed( - title=f"<:Partner:1162135285031772300> Partnership Logged", + title="<:Partner:1162135285031772300> Partnership Logged", description=f"\n**Logged By:** {admin_mention}\n" f"**Owner:** {owner_mention}\n" f"**Server:** {guild_name}\n" diff --git a/Cogs/Modules/promotions.py b/Cogs/Modules/promotions.py index 55f0453b..48b6462f 100644 --- a/Cogs/Modules/promotions.py +++ b/Cogs/Modules/promotions.py @@ -210,7 +210,7 @@ async def promote(self, ctx: commands.Context, staff: discord.User, new: discord if custom['image']: embed.set_image(url=custom['image']) else: - embed = discord.Embed(title=f"Staff Promotion", color=0x2b2d31, description=f"* **User:** {staff.mention}\n* **Updated Rank:** {new.mention}\n* **Reason:** {reason}") + embed = discord.Embed(title="Staff Promotion", color=0x2b2d31, description=f"* **User:** {staff.mention}\n* **Updated Rank:** {new.mention}\n* **Reason:** {reason}") embed.set_thumbnail(url=staff.display_avatar) if optionresult: diff --git a/Cogs/Modules/reports.py b/Cogs/Modules/reports.py index ea988f01..bff7bea6 100644 --- a/Cogs/Modules/reports.py +++ b/Cogs/Modules/reports.py @@ -232,10 +232,10 @@ async def report(self, ctx: commands.Context, member: discord.User, *, reason: a embed.set_thumbnail(url=member.display_avatar.url) embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon) if message_link: - embed.add_field(name=f"Report Information", value=f"{replytop}**Reported By:** {ctx.author.mention}\n{replybottom}**Reason:** {reason}\n{replymiddle}**Message Link:** {message_link}\n{replybottom}**Reported At:** {reported_at_format}", inline=False) + embed.add_field(name="Report Information", value=f"{replytop}**Reported By:** {ctx.author.mention}\n{replybottom}**Reason:** {reason}\n{replymiddle}**Message Link:** {message_link}\n{replybottom}**Reported At:** {reported_at_format}", inline=False) embed.add_field(name="Proof", value=f"{proof_message}", inline=False) else: - embed.add_field(name=f"Report Information", value=f"{replytop}**Reported By:** {ctx.author.mention}\n{replymiddle}**Reason:** {reason}\n{replybottom}**Reported At:** {reported_at_format}", inline=False) + embed.add_field(name="Report Information", value=f"{replytop}**Reported By:** {ctx.author.mention}\n{replymiddle}**Reason:** {reason}\n{replybottom}**Reported At:** {reported_at_format}", inline=False) embed.add_field(name="Proof", value=f"{proof_message}", inline=False) @@ -366,7 +366,7 @@ async def Actions(self, interaction: discord.Interaction, button: discord.ui.But async def case(self, interaction: discord.Interaction, button: discord.ui.Button): pass - @discord.ui.button(label='Ignore', style=discord.ButtonStyle.red, custom_id='ignore:button', emoji=f"<:whitex:1190819175447408681>") + @discord.ui.button(label='Ignore', style=discord.ButtonStyle.red, custom_id='ignore:button', emoji="<:whitex:1190819175447408681>") async def Ignore(self, interaction: discord.Interaction, button: discord.ui.Button): if not await self.has_moderator_role(interaction): await interaction.response.send_message(f"{no} **{interaction.user.display_name}**, you don't have permission to use this panel.\n<:Arrow:1115743130461933599>**Required:** `Reports Moderator Role`", ephemeral=True) diff --git a/Cogs/Modules/staff.py b/Cogs/Modules/staff.py index e460fb35..422c5174 100644 --- a/Cogs/Modules/staff.py +++ b/Cogs/Modules/staff.py @@ -269,7 +269,7 @@ async def leaderboard(self, ctx: commands.Context): if rank % 10 == 0: embed = discord.Embed( - title=f"Staff Leaderboard", + title="Staff Leaderboard", description=leaderboard_description, color=discord.Color.dark_embed() ) @@ -283,7 +283,7 @@ async def leaderboard(self, ctx: commands.Context): if leaderboard_description: embed = discord.Embed( - title=f"Staff Leaderboard", + title="Staff Leaderboard", description=leaderboard_description, color=discord.Color.dark_embed() ) diff --git a/Cogs/Modules/suggestions.py b/Cogs/Modules/suggestions.py index a37b4012..72c24db9 100644 --- a/Cogs/Modules/suggestions.py +++ b/Cogs/Modules/suggestions.py @@ -53,7 +53,7 @@ async def suggest(self, ctx: commands.Context, suggestion: str): embed.set_thumbnail(url=ctx.author.display_avatar) embed.set_image(url="https://cdn.discordapp.com/attachments/1143363161609736192/1152281646414958672/invisible.png") embed.set_author(icon_url=ctx.guild.icon, name=ctx.guild.name) - embed.set_footer(text=f"0 Upvotes | 0 Downvotes") + embed.set_footer(text="0 Upvotes | 0 Downvotes") view = SuggestionView() channeldata = await suggestschannel.find_one({"guild_id": ctx.guild.id}) channeldata2 = await suggestschannel2.find_one({"guild_id": ctx.guild.id}) @@ -187,7 +187,7 @@ async def No(self, interaction: discord.Interaction, button): ) suggestion_data = await suggestions_collection.find_one({"message_id": message_id}) await self.update_embed(interaction, suggestion_data) - await interaction.followup.send(f"<:changed:1217610179810693130> Switched to downvote!", ephemeral=True) + await interaction.followup.send("<:changed:1217610179810693130> Switched to downvote!", ephemeral=True) else: await suggestions_collection.update_one( {"message_id": message_id}, @@ -397,7 +397,7 @@ async def on_submit(self, interaction: discord.Interaction): class PermissionsButtons(discord.ui.View): def __init__(self): super().__init__() - url1 = f'https://discord.gg/DhWdgfh3hN' + url1 = 'https://discord.gg/DhWdgfh3hN' self.add_item(discord.ui.Button(label='Support Server', url=url1, style=discord.ButtonStyle.blurple)) self.add_item(discord.ui.Button(label='Documentation', url="https://docs.astrobirb.dev/overview", style=discord.ButtonStyle.blurple)) diff --git a/Cogs/Modules/suspension.py b/Cogs/Modules/suspension.py index db5ce32a..c20a14c8 100644 --- a/Cogs/Modules/suspension.py +++ b/Cogs/Modules/suspension.py @@ -345,7 +345,7 @@ async def Yes(self, interaction: discord.Interaction, button: discord.ui.Button) color=discord.Colour.brand_red()) return await interaction.response.send_message(embed=embed, ephemeral=True) view = RoleTakeAwayView(self.user, self.author, self.reason, self.end_time, self.start_time) - await interaction.response.edit_message(content=f"<:Role:1162074735803387944> Select the **roles** that will be removed & then given back after the suspension is over.", embed=None, view=view, allowed_mentions=discord.AllowedMentions.none()) + await interaction.response.edit_message(content="<:Role:1162074735803387944> Select the **roles** that will be removed & then given back after the suspension is over.", embed=None, view=view, allowed_mentions=discord.AllowedMentions.none()) @discord.ui.button(label='No', style=discord.ButtonStyle.red) async def No(self, interaction: discord.Interaction, button: discord.ui.Button): @@ -437,7 +437,7 @@ async def SuspensionVoid(self, interaction: discord.Interaction, button: discord if roles_to_return and member: await interaction.response.defer() - await interaction.edit_original_response(content=f" Loading...", embed=None, view=None) + await interaction.edit_original_response(content=" Loading...", embed=None, view=None) try: await member.add_roles(*roles_to_return) await interaction.edit_original_response(content=f"{tick} Suspension has been voided. Roles have been restored.", view=None, embed=None) diff --git a/Cogs/Modules/tags.py b/Cogs/Modules/tags.py index 2d2a68ae..83ac3e60 100644 --- a/Cogs/Modules/tags.py +++ b/Cogs/Modules/tags.py @@ -211,7 +211,7 @@ async def send(self, ctx: commands.Context, name: app_commands.Range[str, 1, 50] channel = self.client.get_channel(tagsloggingdata["channel_id"]) if channel: embed = discord.Embed( - title=f"Tag Usage", + title="Tag Usage", description=f"Tag **{name}** was used by {ctx.author.mention} in {ctx.channel.mention}", color=discord.Color.dark_embed(), ) diff --git a/Cogs/Modules/utility.py b/Cogs/Modules/utility.py index 28ef692e..0707d93d 100644 --- a/Cogs/Modules/utility.py +++ b/Cogs/Modules/utility.py @@ -398,7 +398,7 @@ def __init__(self, client, author): @discord.ui.button( label="", style=discord.ButtonStyle.grey, - emoji=f"<:chevronleft:1220806425140531321>", + emoji="<:chevronleft:1220806425140531321>", disabled=True) async def left(self, interaction: discord.Interaction, button: discord.ui.Button): pass @@ -413,7 +413,7 @@ async def network(self, interaction: discord.Interaction, button: discord.ui.But @discord.ui.button( label="", style=discord.ButtonStyle.grey, - emoji=f"<:chevronright:1220806430010118175>" ) + emoji="<:chevronright:1220806430010118175>" ) async def Right(self, interaction: discord.Interaction, button: discord.ui.Button): if interaction.user.id != self.author.id: embed = discord.Embed(description=f"{redx} **{interaction.user.global_name},** this is not your panel!", @@ -456,7 +456,7 @@ async def check_database_connection(self): @discord.ui.button( label="", style=discord.ButtonStyle.grey, - emoji=f"<:chevronleft:1220806425140531321>", + emoji="<:chevronleft:1220806425140531321>", disabled=False) async def left(self, interaction: discord.Interaction, button: discord.ui.Button,): if interaction.user.id != self.author.id: @@ -477,14 +477,14 @@ async def left(self, interaction: discord.Interaction, button: discord.ui.Button @discord.ui.button( label="Shards", style=discord.ButtonStyle.blurple, - emoji=f"<:pingpong:1227283504501358715>") + emoji="<:pingpong:1227283504501358715>") async def shards(self, interaction: discord.Interaction, button: discord.ui.Button): await interaction.response.edit_message(content="") @discord.ui.button( label="", style=discord.ButtonStyle.grey, - emoji=f"<:chevronright:1220806430010118175>", disabled=True) + emoji="<:chevronright:1220806430010118175>", disabled=True) async def Right(self, interaction: discord.Interaction, button: discord.ui.Button): pass @@ -492,7 +492,7 @@ async def Right(self, interaction: discord.Interaction, button: discord.ui.Butto class invite(discord.ui.View): def __init__(self): super().__init__() - url = f'https://discord.com/api/oauth2/authorize?client_id=1113245569490616400&permissions=1632557853697&scope=bot%20applications.commands' + url = 'https://discord.com/api/oauth2/authorize?client_id=1113245569490616400&permissions=1632557853697&scope=bot%20applications.commands' self.add_item(discord.ui.Button(label='Invite', url=url, style=discord.ButtonStyle.blurple, emoji="<:link:1206670134064717904>")) @@ -500,7 +500,7 @@ def __init__(self): class Support(discord.ui.View): def __init__(self): super().__init__() - url = f'https://discord.gg/DhWdgfh3hN' + url = 'https://discord.gg/DhWdgfh3hN' self.add_item(discord.ui.Button(label='Join', url=url, style=discord.ButtonStyle.blurple, emoji="<:link:1206670134064717904>")) self.add_item(discord.ui.Button(label='Documentation', url="https://docs.astrobirb.dev", style=discord.ButtonStyle.blurple, emoji="📚")) diff --git a/main.py b/main.py index a8ad52f1..af28d2e2 100644 --- a/main.py +++ b/main.py @@ -45,7 +45,7 @@ def __init__(self): command_prefix=commands.when_mentioned_or(PREFIX), intents=intents, shard_count=1, chunk_guilds_at_startup=False ) elif environment == 'development': - print(f'Development Loaded') + print('Development Loaded') super().__init__( command_prefix=commands.when_mentioned_or(PREFIX), intents=intents, shard_count=2, chunk_guilds_at_startup=True) intents.message_content = True @@ -138,7 +138,7 @@ async def on_ready(self): print(prfx + " Bot is in " + str(len(self.guilds)) + " servers") try: await db.command("ping") - print(f"[✅] Successfully connected to MongoDB") + print("[✅] Successfully connected to MongoDB") except Exception as e: print(f"[❌] Failed to connect to MongoDB: {e}") diff --git a/permissions.py b/permissions.py index e103412d..a0c3d40a 100644 --- a/permissions.py +++ b/permissions.py @@ -88,7 +88,7 @@ async def has_admin_role(ctx): class PermissionsButtons(discord.ui.View): def __init__(self): super().__init__() - url1 = f'https://discord.gg/DhWdgfh3hN' + url1 = 'https://discord.gg/DhWdgfh3hN' self.add_item(discord.ui.Button(label='Support Server', url=url1, style=discord.ButtonStyle.blurple)) self.add_item(discord.ui.Button(label='Documentation', url="https://docs.astrobirb.dev/overview", style=discord.ButtonStyle.blurple))