renkar/tipibot
1
0
Fork 0
forked from sass/tipibot
Code Pull Requests Activity

Fix conflict

Browse Source
This commit is contained in:
Rene Arumetsa
2026-06-03 18:38:40 +03:00
parent 3939c879c9
commit 25cf60d2e1
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bot.py
View File

@@ -594,12 +594,7 @@ class HelpSelect(discord.ui.Select):
@tree.command(name="help", description=S.CMD["help"])
async def cmd_help(interaction: discord.Interaction):
<<<<<<< HEAD
is_admin = is_bot_admin(interaction.user)
=======
member = interaction.user
is_admin = isinstance(member, discord.Member) and is_bot_admin(member)
>>>>>>> 42f7bae68124fa6a9824780ba17b46d00f3f2b36
await interaction.response.send_message(
embed=_help_embed("üldine"), view=HelpView(is_admin), ephemeral=True
)