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

Compare commits

base: cswimr:b6b144bb21feb20a6bb3950fbcae629b0a442129
Branches Tags
cswimr:main
cswimr:moderation-sqlalchemy
cswimr:moderation-prisma
cswimr:sugoncredit_sql
cswimr:musicdownloader_async
..
compare: cswimr:0529842b62fdc272870724968883e65b7cedb67c
Branches Tags
cswimr:main
cswimr:moderation-sqlalchemy
cswimr:moderation-prisma
cswimr:sugoncredit_sql
cswimr:musicdownloader_async

2 commits
b6b144bb21 ... 0529842b62

Author SHA1 Message Date
SeaswimmerTheFsh
0529842b62
fix(forums): fixed missing channel attribute
Some checks reported warnings
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
Details
2023-09-07 19:30:12 -04:00
SeaswimmerTheFsh
c87261b17e
fix(forums): changed no button emoji as it can't be seen against a red button background 2023-09-07 19:27:18 -04:00
1 changed files with 6 additions and 5 deletions
Show stats Expand all files Collapse all files

11
forums/forums.py
View file

@ -46,8 +46,9 @@ class Forums(commands.Cog):
@ui.button(label="Yes", style=discord.ButtonStyle.success, emoji="✅") @ui.button(label="Yes", style=discord.ButtonStyle.success, emoji="✅")
async def resolved_button_yes(self, button: ui.Button, interaction: discord.Interaction): async def resolved_button_yes(self, button: ui.Button, interaction: discord.Interaction):
match = any(role_id in interaction.user.roles for role_id in await self.config.guild(interaction.channel.guild).request_roles()) match = any(role_id in interaction.user.roles for role_id in await self.config.guild(self.ctx.guild).request_roles())
if match or interaction.user.id == interaction.channel.owner.id: if match or interaction.user.id == interaction.channel.owner.id:
channel = self.ctx.channel
await interaction.response.defer() await interaction.response.defer()
if self.reason: if self.reason:
response_reason = f"Thread closed by {interaction.user.mention} with reason: {self.reason}" response_reason = f"Thread closed by {interaction.user.mention} with reason: {self.reason}"
@ -55,15 +56,15 @@ class Forums(commands.Cog):
else: else:
response_reason = f"Thread closed by {interaction.user.mention}" response_reason = f"Thread closed by {interaction.user.mention}"
reason = f"Thread closed by {interaction.user.name} ({interaction.user.id})" reason = f"Thread closed by {interaction.user.name} ({interaction.user.id})"
await interaction.channel.edit(locked=True, archived=True, applied_tags=interaction.channel.applied_tags + await self.config.guild(interaction.channel.guild).forum_tag(), reason=reason) await channel.edit(locked=True, archived=True, applied_tags=channel.applied_tags + await self.config.guild(channel.guild).forum_tag(), reason=reason)
await self.msg.edit(content=response_reason, view=None) await self.msg.edit(content=response_reason, view=None)
await self.ctx.message.add_reaction("✅") await self.ctx.message.add_reaction("✅")
else: else:
await interaction.response.send_message(content="You cannot close this thread!", ephemeral=True) await interaction.response.send_message(content="You cannot close this thread!", ephemeral=True)
@ui.button(label="No", style=discord.ButtonStyle.danger, emoji="❌") @ui.button(label="No", style=discord.ButtonStyle.danger, emoji="✖️")
async def resolved_button_no(self, button: ui.Button, interaction: discord.Interaction): async def resolved_button_no(self, button: ui.Button, interaction: discord.Interaction):
match = any(role_id in interaction.user.roles for role_id in await self.config.guild(interaction.channel.guild).request_roles()) match = any(role_id in interaction.user.roles for role_id in await self.config.guild(self.ctx.guild).request_roles())
if match or interaction.user.id == interaction.channel.owner.id: if match or interaction.user.id == interaction.channel.owner.id:
await interaction.response.defer() await interaction.response.defer()
await self.msg.delete() await self.msg.delete()
@ -71,7 +72,7 @@ class Forums(commands.Cog):
else: else:
await interaction.response.send_message(content="You cannot close this thread!", ephemeral=True) await interaction.response.send_message(content="You cannot close this thread!", ephemeral=True)
@commands.group(name='forumconfig', invoke_without_command=True, aliases=['forumsset']) @commands.group(name='forumsconfig', invoke_without_command=True, aliases=['forumconfig'])
@commands.guild_only() @commands.guild_only()
@commands.admin() @commands.admin()
async def forumsconfig(self, ctx: commands.Context): async def forumsconfig(self, ctx: commands.Context):