cswimr/GalaxyCogs
cswimr/GalaxyCogs
1
1
Fork 0
Code Issues 2 Pull requests Projects Wiki Activity Actions

fix: fixed all instances of accessing configs using ids instead of guild objects

Browse source
This commit is contained in:
Seaswimmer 2023-08-08 00:51:19 -04:00
parent 79fb4ce9ec
commit 1d64001ae2
No known key found for this signature in database
GPG key ID: 5019678FD9CF50D8
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
shortmute/shortmute.py
View file

@ -99,7 +99,7 @@ class Shortmute(commands.Cog):
old_message = await old_interaction.edit_original_response(embed=edit_embed, view=None) old_message = await old_interaction.edit_original_response(embed=edit_embed, view=None)
await target.timeout(until=timedelta, reason=f"User shortmuted for {readable_duration} by {old_interaction.user.name} ({old_interaction.user.id}) for: {reason}") await target.timeout(until=timedelta, reason=f"User shortmuted for {readable_duration} by {old_interaction.user.name} ({old_interaction.user.id}) for: {reason}")
await interaction.response.send_message(content=f"{target.mention} shortmuted for {readable_duration} by {old_interaction.user.mention} for: `{reason}`") await interaction.response.send_message(content=f"{target.mention} shortmuted for {readable_duration} by {old_interaction.user.mention} for: `{reason}`")
if await self.config.guild(old_interaction.guild_id).dm() is True: if await self.config.guild(old_interaction.guild).dm() is True:
dm_embed = discord.Embed(title=f"You've been shortmuted in {old_interaction.guild.name}!", description=f"Moderator: {old_interaction.user.mention}\nTarget: {target.mention}\nDuration: `{readable_duration}`\nReason: `{reason}`", color=await self.bot.get_embed_color(None)) dm_embed = discord.Embed(title=f"You've been shortmuted in {old_interaction.guild.name}!", description=f"Moderator: {old_interaction.user.mention}\nTarget: {target.mention}\nDuration: `{readable_duration}`\nReason: `{reason}`", color=await self.bot.get_embed_color(None))
if evidence: if evidence:
dm_embed.set_image(evidence) dm_embed.set_image(evidence)
@ -107,7 +107,7 @@ class Shortmute(commands.Cog):
await target.send(embed=dm_embed) await target.send(embed=dm_embed)
except discord.HTTPException as error: except discord.HTTPException as error:
await old_message.edit(content="Could not message the target, user most likely has Direct Messages disabled.") await old_message.edit(content="Could not message the target, user most likely has Direct Messages disabled.")
logging_channels_list = await self.config.guild(old_interaction.guild.id).logging_channels() logging_channels_list = await self.config.guild(old_interaction.guild).logging_channels()
if logging_channels_list: if logging_channels_list:
logging_embed = discord.Embed(title="Shortmute", description=f"Moderator: {old_interaction.user.mention} ({old_interaction.user.id})\nTarget: {target.mention} ({target.id})\nDuration: `{readable_duration}`\nReason: `{reason}`", color=await self.bot.get_embed_color(None)) logging_embed = discord.Embed(title="Shortmute", description=f"Moderator: {old_interaction.user.mention} ({old_interaction.user.id})\nTarget: {target.mention} ({target.id})\nDuration: `{readable_duration}`\nReason: `{reason}`", color=await self.bot.get_embed_color(None))
if evidence: if evidence:
@ -132,14 +132,14 @@ class Shortmute(commands.Cog):
@commands.admin() @commands.admin()
async def shortmute_config_addchannel(self, ctx: commands.Context, channel: discord.TextChannel = None): async def shortmute_config_addchannel(self, ctx: commands.Context, channel: discord.TextChannel = None):
"""This command changes where the `/shortmute` slash command will log shortmutes. You can set multiple channels as well!""" """This command changes where the `/shortmute` slash command will log shortmutes. You can set multiple channels as well!"""
current_list = await self.config.guild(ctx.guild.id).logging_channels() current_list = await self.config.guild(ctx.guild).logging_channels()
if channel: if channel:
if channel.id in current_list: if channel.id in current_list:
await ctx.send("This channel is already in the logging channel list!") await ctx.send("This channel is already in the logging channel list!")
return return
else: else:
current_list.append(channel.id) current_list.append(channel.id)
await self.config.guild(ctx.guild.id).logging_channels.set(current_list) await self.config.guild(ctx.guild).logging_channels.set(current_list)
await ctx.send(f"{channel.mention} has been added to the logging channels list.") await ctx.send(f"{channel.mention} has been added to the logging channels list.")
else: else:
already_in_list = [] already_in_list = []
@ -157,10 +157,10 @@ class Shortmute(commands.Cog):
@commands.admin() @commands.admin()
async def shortmute_config_removechannel(self, ctx: commands.Context, channel: discord.TextChannel = None): async def shortmute_config_removechannel(self, ctx: commands.Context, channel: discord.TextChannel = None):
"""This command removes a channel from the `/shortmute`slash command's logging channels list.""" """This command removes a channel from the `/shortmute`slash command's logging channels list."""
current_list = await self.config.guild(ctx.guild.id).logging_channels() current_list = await self.config.guild(ctx.guild).logging_channels()
if channel.id in current_list: if channel.id in current_list:
current_list.remove(channel.id) current_list.remove(channel.id)
await self.config.guild(ctx.guild.id).logging_channels.set(current_list) await self.config.guild(ctx.guild).logging_channels.set(current_list)
await ctx.send(f"{channel.mention} has been removed from the logging channels list.") await ctx.send(f"{channel.mention} has been removed from the logging channels list.")
else: else:
await ctx.send("Please provide a valid channel that exists in the logging channels list.") await ctx.send("Please provide a valid channel that exists in the logging channels list.")
@ -170,14 +170,14 @@ class Shortmute(commands.Cog):
@commands.admin() @commands.admin()
async def shortmute_config_addrole(self, ctx: commands.Context, role: discord.Role = None): async def shortmute_config_addrole(self, ctx: commands.Context, role: discord.Role = None):
"""This command adds roles to the immune roles list for immunity from the the `/shortmute` slash command.""" """This command adds roles to the immune roles list for immunity from the the `/shortmute` slash command."""
current_list = await self.config.guild(ctx.guild.id).immune_roles() current_list = await self.config.guild(ctx.guild).immune_roles()
if role: if role:
if role.id in current_list: if role.id in current_list:
await ctx.send("This role is already in the immune roles list!") await ctx.send("This role is already in the immune roles list!")
return return
else: else:
current_list.append(role.id) current_list.append(role.id)
await self.config.guild(ctx.guild.id).immune_roles.set(current_list) await self.config.guild(ctx.guild).immune_roles.set(current_list)
await ctx.send(f"{role.mention} has been added to the logging channels list.", allowed_mentions = discord.AllowedMentions(roles=False)) await ctx.send(f"{role.mention} has been added to the logging channels list.", allowed_mentions = discord.AllowedMentions(roles=False))
else: else:
already_in_list = [] already_in_list = []
@ -195,10 +195,10 @@ class Shortmute(commands.Cog):
@commands.admin() @commands.admin()
async def shortmute_config_removerole(self, ctx: commands.Context, role: discord.Role = None): async def shortmute_config_removerole(self, ctx: commands.Context, role: discord.Role = None):
"""This command removes roles from the immune roles list to remove immunity from the the `/shortmute` slash command.""" """This command removes roles from the immune roles list to remove immunity from the the `/shortmute` slash command."""
current_list = await self.config.guild(ctx.guild.id).immune_roles() current_list = await self.config.guild(ctx.guild).immune_roles()
if role.id in current_list: if role.id in current_list:
current_list.remove(role.id) current_list.remove(role.id)
await self.config.guild(ctx.guild.id).immune_roles.set(current_list) await self.config.guild(ctx.guild).immune_roles.set(current_list)
await ctx.send(f"{role.mention} has been removed from the immune roles list.", allowed_mentions = discord.AllowedMentions(roles=False)) await ctx.send(f"{role.mention} has been removed from the immune roles list.", allowed_mentions = discord.AllowedMentions(roles=False))
else: else:
await ctx.send("Please provide a valid role that exists in the immune roles list.") await ctx.send("Please provide a valid role that exists in the immune roles list.")
@ -208,9 +208,9 @@ class Shortmute(commands.Cog):
@commands.admin() @commands.admin()
async def shortmute_config_dm(self, ctx: commands.Context, enabled: bool = None): async def shortmute_config_dm(self, ctx: commands.Context, enabled: bool = None):
"""This command changes if the `/shortmute` slash command Direct Messages its target.""" """This command changes if the `/shortmute` slash command Direct Messages its target."""
old_value = await self.config.guild(ctx.guild.id).dm() old_value = await self.config.guild(ctx.guild).dm()
if enabled: if enabled:
await self.config.guild(ctx.guild.id).dm.set(enabled) await self.config.guild(ctx.guild).dm.set(enabled)
await ctx.send(content=f"Shortmute Direct Message setting changed!\nOld value: `{old_value}`\nNew value: `{enabled}`") await ctx.send(content=f"Shortmute Direct Message setting changed!\nOld value: `{old_value}`\nNew value: `{enabled}`")
elif old_value is True: elif old_value is True:
await ctx.send(content="Shortmute Direct Messages are currently enabled!") await ctx.send(content="Shortmute Direct Messages are currently enabled!")