Constant for mod-only permissions, closing permission gaps in all cogs

rocketbot/cogs/configcog.py

@@ -10,6 +10,8 @@ from discord.ext.commands import Bot
 from config import CONFIG
 from rocketbot.storage import ConfigKey, Storage
 from rocketbot.cogs.basecog import BaseCog
+from rocketbot.utils import MOD_PERMISSIONS
+
 
 class ConfigCog(BaseCog, name='Configuration'):
 	"""
@@ -28,7 +30,7 @@ class ConfigCog(BaseCog, name='Configuration'):
 		name='config',
 		description='Manages general bot configuration',
 		guild_only=True,
-		default_permissions=Permissions(Permissions.manage_messages.flag)
+		default_permissions=MOD_PERMISSIONS,
 	)
 
 	@config.command()

rocketbot/cogs/generalcog.py

@@ -67,8 +67,8 @@ class GeneralCog(BaseCog, name='General'):
 		},
 	)
 	@guild_only()
-	@default_permissions(manage_messages=True)
-	async def testwarn(self, interaction: Interaction):
+	@default_permissions(ban_members=True)
+	async def test_warn(self, interaction: Interaction):
 		"""Command handler"""
 		if Storage.get_config_value(interaction.guild, ConfigKey.WARNING_CHANNEL_ID) is None:
 			await interaction.response.send_message(
@@ -108,7 +108,7 @@ class GeneralCog(BaseCog, name='General'):
 		},
 	)
 	@guild_only()
-	@default_permissions(manage_messages=True)
+	@default_permissions(administrator=True)
 	async def shutdown(self, interaction: Interaction):
 		"""Command handler"""
 		await interaction.response.send_message('👋', ephemeral=True)
@@ -126,7 +126,7 @@ class GeneralCog(BaseCog, name='General'):
 	)
 	@guild_only()
 	@default_permissions(manage_messages=True)
-	async def deletemessages(self, interaction: Interaction, user: User, age: Transform[timedelta, TimeDeltaTransformer]) -> None:
+	async def delete_messages(self, interaction: Interaction, user: User, age: Transform[timedelta, TimeDeltaTransformer]) -> None:
 		"""Command handler"""
 		member_id = user.id
 		cutoff: datetime = datetime.now(timezone.utc) - age

rocketbot/cogs/joinagecog.py

@@ -12,7 +12,7 @@ from rocketbot.bot import Rocketbot
 from rocketbot.cogs.basecog import BaseCog, BotMessage, BotMessageReaction, CogSetting
 from rocketbot.collections import AgeBoundList
 from rocketbot.storage import Storage
-from rocketbot.utils import TimeDeltaTransformer
+from rocketbot.utils import TimeDeltaTransformer, MOD_PERMISSIONS
 
 
 class JoinAgeQueryContext:
@@ -54,6 +54,8 @@ class JoinAgeCog(BaseCog, name='Join Age'):
 	joinage = Group(
 		name='joinage',
 		description='Queries for users who joined in the past span of time',
+		guild_only=True,
+		default_permissions=MOD_PERMISSIONS,
 		extras={
 			'long_description': 'Searches for users who joined the server recently. ' + \
 				'Can use time spans like 30s, 5m, 1h, 7d, etc.',

rocketbot/cogs/patterncog.py

@@ -8,7 +8,7 @@ from typing import Optional
 
 from discord import Guild, Member, Message, utils as discordutils, Permissions, Interaction
 from discord.app_commands import Choice, Group, autocomplete, rename
-from discord.ext import commands
+from discord.ext.commands import Cog
 
 from config import CONFIG
 from rocketbot.bot import Rocketbot
@@ -17,7 +17,8 @@ from rocketbot.cogsetting import CogSetting
 from rocketbot.pattern import PatternCompiler, PatternDeprecationError, \
 	PatternError, PatternStatement
 from rocketbot.storage import Storage
-from rocketbot.utils import dump_stacktrace
+from rocketbot.utils import dump_stacktrace, MOD_PERMISSIONS
+
 
 class PatternContext:
 	"""
@@ -148,7 +149,7 @@ class PatternCog(BaseCog, name='Pattern Matching'):
 			Storage.set_state_value(guild, 'PatternCog.last_matched', last_matched)
 		last_matched[name] = time
 
-	@commands.Cog.listener()
+	@Cog.listener()
 	async def on_message(self, message: Message) -> None:
 		"""Event listener"""
 		if message.author is None or \
@@ -261,7 +262,7 @@ class PatternCog(BaseCog, name='Pattern Matching'):
 		name='pattern',
 		description='Manages message pattern matching.',
 		guild_only=True,
-		default_permissions=Permissions(Permissions.manage_messages.flag),
+		default_permissions=MOD_PERMISSIONS,
 	)
 
 	@pattern.command()

rocketbot/cogs/usernamecog.py

@@ -10,6 +10,8 @@ from discord.ext.commands import Cog
 from config import CONFIG
 from rocketbot.cogs.basecog import BaseCog, BotMessage, BotMessageReaction, CogSetting
 from rocketbot.storage import Storage
+from rocketbot.utils import MOD_PERMISSIONS
+
 
 class UsernamePatternContext:
 	"""
@@ -83,7 +85,7 @@ class UsernamePatternCog(BaseCog, name='Username Pattern'):
 		name='username',
 		description='Manages username pattern detection.',
 		guild_only=True,
-		default_permissions=Permissions(Permissions.manage_messages.flag),
+		default_permissions=MOD_PERMISSIONS,
 	)
 
 	@username.command(

rocketbot/utils.py

@@ -8,7 +8,7 @@ from datetime import datetime, timedelta
 from typing import Any, Optional, Type, Union
 
 import discord
-from discord import Guild
+from discord import Guild, Permissions
 from discord.ext.commands import Cog
 
 def dump_stacktrace(e: BaseException) -> None:
@@ -171,6 +171,8 @@ def str_from_quoted_str(val: str) -> str:
 		raise ValueError(f'Not a quoted string: {val}')
 	return val[1:-1]
 
+MOD_PERMISSIONS: Permissions = Permissions(Permissions.manage_messages.flag)
+
 from discord import Interaction
 from discord.app_commands import Transformer
 from discord.ext.commands import BadArgument