diff --git a/jarvis/cogs/admin/roleping.py b/jarvis/cogs/admin/roleping.py index e1cb6d7..e1ead45 100644 --- a/jarvis/cogs/admin/roleping.py +++ b/jarvis/cogs/admin/roleping.py @@ -43,6 +43,10 @@ class RolepingCog(Scale): await ctx.send(f"Role `{role.name}` already in roleping.", ephemeral=True) return + if role.id == ctx.guild.id: + await ctx.send("Cannot add `@everyone` to roleping", ephemeral=True) + return + _ = await Roleping( role=role.id, guild=ctx.guild.id, diff --git a/jarvis/cogs/rolegiver.py b/jarvis/cogs/rolegiver.py index 07cdcfe..e159828 100644 --- a/jarvis/cogs/rolegiver.py +++ b/jarvis/cogs/rolegiver.py @@ -37,6 +37,10 @@ class RolegiverCog(Scale): @slash_option(name="role", description="Role to add", opt_type=OptionTypes.ROLE, required=True) @check(admin_or_permissions(Permissions.MANAGE_GUILD)) async def _rolegiver_add(self, ctx: InteractionContext, role: Role) -> None: + if role.id == ctx.guild.id: + await ctx.send("Cannot add `@everyone` to rolegiver", ephemeral=True) + return + setting = await Rolegiver.find_one(q(guild=ctx.guild.id)) if setting and role.id in setting.roles: await ctx.send("Role already in rolegiver", ephemeral=True) diff --git a/jarvis/cogs/settings.py b/jarvis/cogs/settings.py index 0ac0af5..d609111 100644 --- a/jarvis/cogs/settings.py +++ b/jarvis/cogs/settings.py @@ -100,6 +100,9 @@ class SettingsCog(Scale): ) @check(admin_or_permissions(Permissions.MANAGE_GUILD)) async def _set_verified(self, ctx: InteractionContext, role: Role) -> None: + if role.id == ctx.guild.id: + await ctx.send("Cannot set verified to `@everyone`", ephemeral=True) + return await ctx.defer() await self.update_settings("verified", role.id, ctx.guild.id) await ctx.send(f"Settings applied. New verified role is `{role.name}`") @@ -110,6 +113,9 @@ class SettingsCog(Scale): ) @check(admin_or_permissions(Permissions.MANAGE_GUILD)) async def _set_unverified(self, ctx: InteractionContext, role: Role) -> None: + if role.id == ctx.guild.id: + await ctx.send("Cannot set unverified to `@everyone`", ephemeral=True) + return await ctx.defer() await self.update_settings("unverified", role.id, ctx.guild.id) await ctx.send(f"Settings applied. New unverified role is `{role.name}`") diff --git a/jarvis/cogs/util.py b/jarvis/cogs/util.py index dd07f19..0976a54 100644 --- a/jarvis/cogs/util.py +++ b/jarvis/cogs/util.py @@ -146,7 +146,7 @@ class UtilCog(Scale): async def _roleinfo(self, ctx: InteractionContext, role: Role) -> None: fields = [ EmbedField(name="ID", value=str(role.id), inline=True), - EmbedField(name="Name", value=role.name, inline=True), + EmbedField(name="Name", value=role.mention, inline=True), EmbedField(name="Color", value=str(role.color.hex), inline=True), EmbedField(name="Mention", value=f"`{role.mention}`", inline=True), EmbedField(name="Hoisted", value="Yes" if role.hoist else "No", inline=True),