Fix Stuff

Author: junepark678

.gitignore

@@ -12,4 +12,6 @@ __pycache__
 
 pdm.lock
 type_info.json
-.pdm-python
+.pdm-python
+
+.mypy_cache

pyproject.toml

@@ -10,6 +10,7 @@ requires-python = ">=3.12"
 dependencies = [
     "discord.py>=2.3.2",
     "asyncpg>=0.29.0",
+    "openai>=1.37.0",
 ]
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -31,3 +32,5 @@ dev = [
 
 [tool.mypy]
 disallow_incomplete_defs = true
+
+[tool.pdm]

src/SideBot/__init__.py

@@ -10,6 +10,8 @@
 from discord.ext import commands
 from discord.ext.commands import AutoShardedBot, Bot, when_mentioned_or
 
+from SideBot.db.tags import Tag
+
 from .utils import ButtonLink, DiscordUser
 
 
@@ -54,6 +56,8 @@ async def on_ready(self) -> None:
             )
             self.connection: asyncpg.Connection = await self.setup_connection()
 
+            await Tag.write_schema(self.connection)
+
             await self.connection.set_type_codec(
                 "discorduser",
                 encoder=DiscordUser.to_tuple,

src/SideBot/cogs/admin.py

@@ -1,6 +1,7 @@
 """Admin cog with commands for moderation."""
 
 import asyncio
+import logging
 from datetime import timedelta
 
 import discord
@@ -69,6 +70,12 @@ def get_channel(self, i: int) -> SpamChannel | None:
 class Admin(BaseCog):
     """Admin cog with commands for moderation."""
 
+    @classmethod
+    async def setup(cls, bot: Bot) -> None:
+        """Initialize the cog and add it to the bot."""
+        logging.getLogger(__name__).info("Initialized %s", cls.__name__)
+        await bot.add_cog(cls(bot))
+
     def __init__(self, bot: Bot, channels_max: int = 4) -> None:
         """Initialize the cog with the bot and the maximum channels to check."""
         self.spammers: list[SpamUser] = []

src/SideBot/cogs/basecog.py

@@ -12,9 +12,3 @@ def __init__(self, bot: Bot) -> None:
         """Initialize the base cog with the bot."""
         self.bot = bot
         self.logger = logging.getLogger(__name__)
-
-    @classmethod
-    async def setup(cls, bot: Bot) -> None:
-        """Initialize the cog and add it to the bot."""
-        logging.getLogger(__name__).info("Initialized %s", cls.__name__)
-        await bot.add_cog(cls(bot))

src/SideBot/cogs/developer.py

@@ -1,5 +1,6 @@
 """The developer cog for loading/reloading/unloading cogs and syncing app commands."""
 
+import logging
 from typing import Literal
 
 import discord
@@ -25,6 +26,12 @@
 class Developer(BaseCog):
     """Developer cog with developer only commands."""
 
+    @classmethod
+    async def setup(cls, bot: Bot) -> None:
+        """Initialize the cog and add it to the bot."""
+        logging.getLogger(__name__).info("Initialized %s", cls.__name__)
+        await bot.add_cog(cls(bot))
+
     def __init__(self, bot: Bot) -> None:
         """Initialize the developer cog."""
         super().__init__(bot)

src/SideBot/cogs/mod.py

@@ -1,6 +1,91 @@
-# ruff: noqa
+import logging
 
-# from .basecog import BaseCog
+import openai
+from discord import Embed, Message
+from discord.ext.commands import Bot, Cog
 
-# class MessageLogger(BaseCog):
-#     def __init__():
+from .basecog import BaseCog
+
+
+class CheckMessage(BaseCog):
+    """CheckMessage cog with commands for moderation."""
+
+    def __init__(self, bot: Bot) -> None:
+        """Initialize the checkmessage cog."""
+        super().__init__(bot)
+        self.openai = openai.AsyncOpenAI(base_url="http://localhost:8080", api_key="none")
+        self.logger.info("Connected to OpenAI API")
+
+    @Cog.listener()
+    async def on_message(self, message: Message) -> None:
+        """Check the message for spam."""
+        if message.channel.id == 1200508244909621289:
+            return
+        else:
+            logging.info(message.channel.id)
+        if message.author.bot:
+            return
+        if message.guild and message.guild.id != 949183273383395328:
+            return
+        if len(message.content) <= 1:
+            return
+        self.logger.info("Checking message %s", message.content)
+        history_to_give = ""
+        async for messages in message.channel.history(limit=3):
+            if messages.id == message.id:
+                continue
+            history_to_give += f"{messages.author!s}: Start-Of-Message\n{messages.content}\nEnd-Of-Message\n\n"
+        response = await self.openai.chat.completions.create(
+            model="idk",
+            messages=[
+                {
+                    "role": "system",
+                    "content": 'You are a moderation bot checking if messages defame gender identities. Please respond with only a "YES", "MAYBE", or "NO" with a short reasoning',
+                },
+                {
+                    "role": "user",
+                    "content": "context:",
+                },
+                {
+                    "role": "user",
+                    "content": f"{history_to_give}",
+                },
+                {
+                    "role": "user",
+                    "content": "message:",
+                },
+                {
+                    "role": "user",
+                    "content": f"{message.author!s}: Start-Of-Message\n{message.content}\nEnd-Of-Message\n\n",
+                },
+            ],
+            n=1,
+            max_tokens=10,
+        )
+        self.logger.info("Response: %s", response.choices[0].message)
+        if "YES" in response.choices[0].message.content:
+            self.logger.info("Message breaks rules")
+            await self.bot.get_channel(1200508244909621289).send(
+                embed=Embed(
+                    title="Message Breaks Rules",
+                    description=f"Jump To Message: [Here]({message.jump_url}), Reasoning: {response.choices[0].message.content}",
+                ),
+            )
+        elif "MAYBE" in response.choices[0].message.content:
+            self.logger.info("Message possibly breaks rules")
+            await self.bot.get_channel(1200508244909621289).send(
+                embed=Embed(
+                    title="Message Possibly Breaks Rules",
+                    description=f"Jump To Message: [Here]({message.jump_url}), Reasoning: {response.choices[0].message.content}",
+                ),
+                silent=True,
+            )
+
+    @classmethod
+    async def setup(cls, bot: Bot) -> None:
+        """Initialize the cog and add it to the bot."""
+        logging.getLogger(__name__).info("Initialized %s", cls.__name__)
+        await bot.add_cog(cls(bot))
+
+
+setup = CheckMessage.setup

src/SideBot/cogs/tags.py

@@ -1,6 +1,7 @@
 """prelimitary tags cog, will be updated later."""
 
 import datetime
+import logging
 import re
 import traceback
 import typing
@@ -9,13 +10,13 @@
 from discord import app_commands
 from discord.app_commands import command as acommand
 from discord.app_commands import guild_only
+from discord.ext.commands import Bot
 
 from SideBot import SideBot
+from SideBot.cogs.basecog import BaseCog
 from SideBot.db.tags import Tag as DBTag
 from SideBot.utils import ButtonLink, DiscordUser
 
-from .basecog import BaseCog
-
 
 class UpdateTagsModal(discord.ui.Modal, title="Update a Tag"):
     """Modal for updating tags."""
@@ -183,6 +184,12 @@ async def on_error(
 class Tags(BaseCog):
     """Tags cog with commands for tags."""
 
+    @classmethod
+    async def setup(cls, bot: Bot) -> None:
+        """Initialize the cog and add it to the bot."""
+        logging.getLogger(__name__).info("Initialized %s", cls.__name__)
+        await bot.add_cog(cls(bot))
+
     def prepare_tag_view(self, button_links: list[ButtonLink]) -> discord.ui.View:
         """Prepare the tag view."""
         view = discord.ui.View()

src/SideBot/cogs/utility.py

@@ -1,16 +1,25 @@
 """The utility cog with various utility commands, listeners, etc."""
 
+import logging
 import random as randomorg
 
 import discord
 from discord import Interaction
 from discord.app_commands import command
 from discord.ext.commands import Bot, Cog
 
+from SideBot.cogs.basecog import BaseCog
 
-class Utility(Cog):
+
+class Utility(BaseCog):
     """The utility cog with various utility commands, listeners, etc."""
 
+    @classmethod
+    async def setup(cls, bot: Bot) -> None:
+        """Initialize the cog and add it to the bot."""
+        logging.getLogger(__name__).info("Initialized %s", cls.__name__)
+        await bot.add_cog(cls(bot))
+
     def __init__(
         self,
         bot: Bot,
@@ -21,7 +30,7 @@ def __init__(
         self.bot = bot
         self.rare_threshold = rare_threshold
         self.ultra_rare_threshold = ultra_rare_threshold
-        super().__init__()
+        super().__init__(bot)
 
     @command(name="status", description="Get how the bot is currently feeling")
     async def status(self, inter: Interaction) -> None:

src/SideBot/db/tags.py

@@ -1,5 +1,6 @@
 """Tags database module."""
 
+import contextlib
 import datetime
 from collections.abc import AsyncGenerator
 from typing import Any
@@ -12,7 +13,7 @@
 class _Tags:
     """Internal DB class for tags."""
 
-    async def write_schema(self) -> None:
+    async def write_schema(self: asyncpg.Connection) -> None:
         for x in [
             """
             CREATE TYPE public.discorduser AS (
@@ -41,9 +42,10 @@ async def write_schema(self) -> None:
             """,
             "CREATE INDEX IF NOT EXISTS tags_guild_id_idx ON tags (guild_id, name)",
         ]:
-            await self.conn.execute(
-                x,
-            )
+            with contextlib.suppress(asyncpg.exceptions.DuplicateObjectError):
+                await self.execute(
+                    x,
+                )
 
     def __init__(self, conn: asyncpg.Connection) -> None:
         """Tag database operations."""
@@ -171,12 +173,11 @@ def __init__(
         self.id = ident
         self.tags = _Tags(conn)
 
-    async def finish(
-        self,
-    ) -> "Tag":
+    async def write_schema(
+        self: asyncpg.Connection,
+    ) -> None:
         """Tag class."""
-        await self.tags.write_schema()
-        return self
+        await _Tags.write_schema(self)
 
     @classmethod
     async def get(