add generic checks for every command

Bobbyperson · Bobbyperson · commit 0ab11f354187 · 2025-06-11T16:04:29.000-04:00
diff --git a/cogs/database.py b/cogs/database.py
@@ -207,6 +207,7 @@ async def on_message(self, message: discord.Message):
     @commands.hybrid_command()
     @commands.cooldown(1, 5, commands.BucketType.user)
     @commands.max_concurrency(1, commands.BucketType.user)
+    @mf.generic_checks()
     async def rmessage(self, ctx):
         """Send a random message."""
         async with self.client.session as session:
@@ -249,6 +250,7 @@ async def rmessage(self, ctx):
 
     @commands.hybrid_command()
     @commands.cooldown(1, 10, commands.BucketType.user)
+    @mf.generic_checks()
     async def conversation(self, ctx, number: int = 5):
         """Generate a whole conversation between random users."""
         if number > 10:
diff --git a/cogs/economy.py b/cogs/economy.py
diff --git a/cogs/example.py b/cogs/example.py
@@ -50,6 +50,7 @@ async def bot(self, ctx):
         await ctx.send(",human")
 
     @commands.command(hidden=True)
+    @mf.generic_checks(max_check=False)
     async def checkcommit(self, ctx):
         try:
             remote_url = (
diff --git a/cogs/fire.py b/cogs/fire.py
@@ -8,6 +8,7 @@
 from sqlalchemy import delete, select, update
 
 import models
+from utils.miscfuncs import generic_checks
 
 bank = "./data/database.sqlite"
 
@@ -153,6 +154,7 @@ async def on_ready(self):
         print("Fire ready")
 
     @commands.hybrid_command()
+    @generic_checks(max_check=False)
     async def howtofire(self, ctx):
         await ctx.send(
             "Create a channel named #fireboard, give me permission to talk there, and then I will automatically post messages with 5 :fire: reactions. Also, once a week I'll list the most fired messages."
@@ -308,6 +310,7 @@ async def on_raw_reaction_remove(self, payload):
                     )
 
     @commands.command(hidden=True)
+    @generic_checks(max_check=False)
     async def unix(self, ctx):
         await ctx.send("The current unix time is `" + (str(int(t.time()))) + "`")
 
@@ -398,6 +401,7 @@ async def getmessages(unix):
             await setfuckingdata(old)
 
     @commands.hybrid_command()
+    @generic_checks(max_check=False)
     async def highestfire(self, ctx, channel: discord.TextChannel = None):
         if not channel:
             async with self.client.session as session:
@@ -443,6 +447,7 @@ async def highestfire(self, ctx, channel: discord.TextChannel = None):
             )
 
     @commands.hybrid_command()
+    @generic_checks(max_check=False)
     async def highestunfire(self, ctx, channel: discord.TextChannel = None):
         if not channel:
             async with self.client.session as session:
@@ -488,6 +493,7 @@ async def highestunfire(self, ctx, channel: discord.TextChannel = None):
             )
 
     @commands.hybrid_command()
+    @generic_checks(max_check=False)
     async def fireleaderboard(self, ctx, fire: str | None = None):
         # get users, count fire for each, display on leaderboard
         if not fire:
diff --git a/cogs/fun.py b/cogs/fun.py
@@ -44,6 +44,7 @@ async def on_message(self, message):
     # commands
 
     @commands.hybrid_command()
+    @mf.generic_checks(max_check=False)
     async def ip(self, ctx, user: discord.Member = None):
         ip1 = random.randint(1, 255)
         ip2 = random.randint(0, 255)
@@ -58,6 +59,7 @@ async def ip(self, ctx, user: discord.Member = None):
             await ctx.send(f"{ip1}.{ip2}.{ip3}.{ip4}")
 
     @commands.command(aliases=["8ball", "ask"], hidden=True)
+    @mf.generic_checks(max_check=False)
     async def _8ball(self, ctx, *, question):
         if not question:
             return await ctx.send("Please ask a question.")
@@ -106,6 +108,7 @@ async def dm(self, ctx, user: discord.Member, *, message: str):
 
     @commands.command()
     @commands.cooldown(1, 5, commands.BucketType.user)
+    @mf.generic_checks(max_check=False)
     async def createpoll(self, ctx, amount: int = 0):
         """Make a poll"""
         if amount > 10 or amount < 1:
diff --git a/cogs/image.py b/cogs/image.py
@@ -3,6 +3,8 @@
 import aiohttp
 from discord.ext import commands
 
+from utils.miscfuncs import generic_checks
+
 
 class Image(commands.Cog):
     """Commands that send images."""
@@ -14,6 +16,7 @@ def __init__(self, client):
     @commands.has_permissions(attach_files=True)
     @commands.cooldown(1, 1, commands.BucketType.default)
     @commands.max_concurrency(1, commands.BucketType.user, wait=True)
+    @generic_checks(max_check=False)
     async def sans(self, ctx):
         """The best command."""
         if rd.randint(1, 100) == 1:
diff --git a/cogs/moderation.py b/cogs/moderation.py
@@ -66,6 +66,7 @@ async def on_guild_join(self, guild):
 
     @commands.hybrid_command()
     @commands.has_permissions(moderate_members=True)
+    @mf.generic_checks(max_check=False)
     async def timeout(self, ctx, member: discord.Member, length: int = 5):
         """Timeout someone."""
         max_time = 2419200
@@ -81,6 +82,7 @@ async def timeout(self, ctx, member: discord.Member, length: int = 5):
     # commands
     @commands.hybrid_command()
     @commands.has_permissions(manage_messages=True)
+    @mf.generic_checks(max_check=False)
     async def clear(self, ctx, amount=5 + 1):
         """Clean messages."""
         await ctx.channel.purge(limit=amount)
@@ -117,6 +119,7 @@ async def messageban(self, ctx, member: discord.Member):
         await ctx.send("Done!")
 
     @commands.hybrid_command()
+    @mf.generic_checks(max_check=False)
     async def blacklistme(self, ctx, length: int = 0):
         if length < 0:
             await ctx.send(
@@ -167,13 +170,15 @@ async def blacklist(self, ctx, member: discord.Member, length: int = 0):
 
     @commands.hybrid_command()
     @commands.has_permissions(ban_members=True)
+    @mf.generic_checks(max_check=False)
     async def ban(self, ctx, member: discord.Member, *, reason=None):
         """Ban someone."""
         await member.ban(reason=reason)
         await ctx.send("User has been banned")
 
     @commands.hybrid_command()
     @commands.has_permissions(kick_members=True)
+    @mf.generic_checks(max_check=False)
     async def kick(self, ctx, member: discord.Member, *, reason=None):
         """Kick someone."""
         await member.kick(reason=reason)
diff --git a/cogs/osu.py b/cogs/osu.py
@@ -188,6 +188,7 @@ async def getrank(self, ctx, id):
 
     @commands.hybrid_command()
     @commands.cooldown(1, 5, commands.BucketType.user)
+    @mf.generic_checks()
     async def invest(self, ctx, osu_id: int = 0, amount: str | None = None):
         """Invest in an osu player."""
         if osu_id == 0:
@@ -243,6 +244,7 @@ async def invest(self, ctx, osu_id: int = 0, amount: str | None = None):
 
     @commands.hybrid_command()
     @commands.cooldown(1, 5, commands.BucketType.user)
+    @mf.generic_checks()
     async def sell(self, ctx, id):
         """Sell your investment on an osu player."""
         async with self.client.session as session:
@@ -275,6 +277,7 @@ async def sell(self, ctx, id):
 
     @commands.hybrid_command(aliases=["investments", "checkinvestment"])
     @commands.cooldown(1, 5, commands.BucketType.user)
+    @mf.generic_checks(max_check=False)
     async def checkinvestments(self, ctx, user: discord.User = None):
         """Check your investments on osu players."""
         if not user:
diff --git a/cogs/stocks.py b/cogs/stocks.py
@@ -100,13 +100,10 @@ async def verify_stock_ticker(self, stock_ticker):
 
     @commands.hybrid_command(aliases=["buystocks"])
     @commands.cooldown(5, 60, commands.BucketType.user)
+    @mf.generic_checks()
     async def buystock(self, ctx, stock: str | None = None, amount: str | None = None):
         """Purchase stocks from the REAL LIFE stock market"""
         open_market = await self.is_market_open()
-        if await econ.checkmax(ctx.author):
-            return await ctx.send(
-                "You attempt to buy stocks but you can't. Maybe you should attempt to `,enterthecave`."
-            )
         if not stock:
             return await ctx.send("Please provide a stock ticker")
         if not open_market:
@@ -142,13 +139,10 @@ async def buystock(self, ctx, stock: str | None = None, amount: str | None = Non
 
     @commands.hybrid_command(aliases=["sellstocks"])
     @commands.cooldown(5, 60, commands.BucketType.user)
+    @mf.generic_checks()
     async def sellstock(self, ctx, stock: str | None = None, amount: str | None = None):
         """Sell stocks from the REAL LIFE stock market"""
         open_market = await self.is_market_open()
-        if await econ.checkmax(ctx.author):
-            return await ctx.send(
-                "You attempt to sell stocks but you can't. Maybe you should attempt to `,enterthecave`."
-            )
         if not stock:
             return await ctx.send("Please provide a stock ticker")
         if not open_market:
@@ -195,6 +189,7 @@ async def sellstock(self, ctx, stock: str | None = None, amount: str | None = No
 
     @commands.hybrid_command()
     @commands.cooldown(5, 60, commands.BucketType.user)
+    @mf.generic_checks()
     async def stockprice(self, ctx, stock: str | None = None):
         """Find the price of a REAL LIFE stock"""
         if not stock:
@@ -215,6 +210,7 @@ async def stockprice(self, ctx, stock: str | None = None):
 
     @commands.hybrid_command()
     @commands.cooldown(1, 60, commands.BucketType.user)
+    @mf.generic_checks(max_check=False)
     async def portfolio(self, ctx, user: discord.Member = None):
         """List all currently owned stocks"""
         if user is None:
diff --git a/cogs/theory.py b/cogs/theory.py
@@ -3,12 +3,15 @@
 import anyio
 from discord.ext import commands
 
+from utils.miscfuncs import generic_checks
+
 
 class theory(commands.Cog):
     def __init__(self, client):
         self.client = client
 
     @commands.command(hidden=True)
+    @generic_checks(max_check=False)
     async def theory(self, ctx, word=None):
         theories = ["Theory", "Theorem", "Method"]
         if not word:
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,6 @@ dependencies = [
     "pillow>=11.2.0",
     "discord.py[voice]>=2.5.2",
     "discord-pretty-help>=2.0.7",
-    "requests>=2.32.3",
     "ffmpy>=0.5.0",
     "pyquery>=2.0.1",
     "asyncio>=3.4.3",
@@ -26,6 +25,7 @@ dependencies = [
     "discord-ext-menus",
     "anyio>=4.9.0",
     "alembic>=1.16.1",
+    "aiohttp>=3.11.11",
 ]
 
 [dependency-groups]
diff --git a/utils/miscfuncs.py b/utils/miscfuncs.py
@@ -1,12 +1,16 @@
+import functools
 import random as rd
 import time
 
+import discord
+from discord.ext import commands
 from PIL import Image, ImageDraw
 from sqlalchemy import or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 import models
 from __main__ import Session
+from utils.econfuncs import checkmax
 
 if __name__ == "__main__":
     print(
@@ -44,6 +48,52 @@ async def wrapped(*args, **kwargs):
     return wrapped
 
 
+def generic_checks(
+    blacklist_check=True, max_check=True, ignored_check=True, dm_check=True
+):
+    def decorator(func):
+        @functools.wraps(func)
+        async def wrapped(*args, **kwargs):
+            ctx = None
+
+            for arg in args:
+                if isinstance(arg, commands.Context):
+                    ctx = arg
+                    blacklist = await is_blacklisted(arg.author.id)
+                    if dm_check and isinstance(arg.channel, discord.channel.DMChannel):
+                        await ctx.send("Command may not be used in a DM.")
+                        return False
+                    if ignored_check and await is_ignored(arg.channel.id):
+                        await arg.author.send(
+                            "The channel you sent that command in is ignored, try a bot channel instead."
+                        )
+                        return False
+                    if blacklist_check and blacklist[0]:
+                        await arg.send("You are blacklisted from Nocaro.")
+                        return False
+                    if max_check and await checkmax(arg.author):
+                        await arg.send(
+                            "Your body is too weak from the endless games. Maybe you should attempt to `,enterthecave`."
+                        )
+                        return False
+                    break
+
+            if ctx:
+                for arg in args:
+                    if isinstance(arg, discord.Member | discord.User):
+                        if blacklist_check and await is_blacklisted(arg.id):
+                            await ctx.send(
+                                "The person you invoked is blacklisted from Nocaro."
+                            )
+                            return False
+
+            return await func(*args, **kwargs)
+
+        return wrapped
+
+    return decorator
+
+
 def clean_username(name):  # fuck you ralkinson!!!!!!!!!
     return name.strip("`")
 
@@ -167,6 +217,17 @@ async def blacklist_user(session, user_id, timestamp):
         pass
 
 
+@session_decorator
+async def is_ignored(session, channel_id):
+    return (
+        await session.scalars(
+            select(models.database.Ignore).where(
+                models.database.Ignore.channelID == channel_id
+            )
+        )
+    ).one_or_none() is not None
+
+
 def human_time_to_seconds(*args) -> int:
     if not args or len(args) == 0:
         return 0
diff --git a/uv.lock b/uv.lock
