[FEATURE] Mark as Solution

migrations/21_add_enable_accept_solutions.sql

@@ -0,0 +1,16 @@
+-- depends: 18_post_assist
+ALTER TABLE pph_post_assist_config
+ADD COLUMN IF NOT EXISTS enable_accept_solutions BOOLEAN DEFAULT FALSE;
+
+CREATE TABLE
+    IF NOT EXISTS pph_post_assist_config_accept_solutions (
+        id SERIAL PRIMARY KEY,
+        thread_id BIGINT NOT NULL,
+        post_assist_config_id SERIAL NOT NULL,
+        user_id BIGINT NOT NULL,
+        message_id BIGINT NOT NULL,
+        FOREIGN KEY (post_assist_config_id) REFERENCES pph_post_assist_config (id) ON DELETE CASCADE
+    );
+
+ALTER TABLE pph_post_assist_config_accept_solutions
+ADD COLUMN IF NOT EXISTS message_id BIGINT NOT NULL;

migrations/22_drop_accept_solutions_table.sql

@@ -0,0 +1,2 @@
+-- depends: 21_add_enable_accept_solutions
+DROP TABLE IF EXISTS pph_post_assist_config_accept_solutions;

migrations/add_enable_mark_as_solved.sql

@@ -0,0 +1,3 @@
+-- depends: 18_post_assist
+ALTER TABLE pph_post_assist_config
+ADD COLUMN IF NOT EXISTS enable_mark_as_solved BOOLEAN DEFAULT FALSE;

pyproject.toml

@@ -13,7 +13,6 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.10.14"
-discord-py = "^2.4.0"
 python-dotenv = "^1.0.1"
 pyyaml = "^6.0"
 flake8 = "^7.1.0"
@@ -29,6 +28,7 @@ python-levenshtein = "^0.25.1"
 setuptools = "^70.1.0"
 pydantic = "^2.8.0"
 python-dateutil = "^2.9.0"
+discord-py = "^2.5.2"
 
 [tool.poetry.scripts]
 progphil = "main:run"

pyrightconfig.json

@@ -0,0 +1,4 @@
+{
+  "venvPath": ".",
+  "venv": "C:/Users/benji/AppData/Local/pypoetry/Cache/virtualenvs/progphilbot-QxuRZnFx-py3.12"
+}

src/bot/main.py

@@ -85,7 +85,7 @@ async def load_cogs(self, module: str, cogs: list[str]) -> None:
         :param cogs: list of cogs to load, basically the files under the cogs/<category> that ends with .py
         """
         for cog in cogs:
-            if cog.startswith("__init__"):
+            if cog.startswith("__init__") or cog.startswith("test_"):
                 continue
             if cog.endswith(".py"):
                 await self.load_extension(f"src.cogs.{module}.{cog[:-3]}")

src/cogs/admin/test_announcements.py

@@ -0,0 +1,53 @@
+import unittest
+from unittest.async_case import IsolatedAsyncioTestCase
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from discord import Interaction
+from discord.app_commands import Choice
+
+from src.cogs.admin.announcements import Announcements
+from src.ui.modals.announcement import Announcement
+
+
+class TestAnnouncements(IsolatedAsyncioTestCase):
+    @patch("src.cogs.admin.announcements.Announcement.wait", new_callable=AsyncMock)
+    async def test_announce_command(self, mock_wait):
+        mock_bot = MagicMock()
+        mock_interaction = AsyncMock(specs=Interaction)
+        mock_interaction.response = AsyncMock()
+        mock_interaction.response.send_modal = AsyncMock()
+        mock_interaction.user = MagicMock()
+        mock_interaction.user.name = "test_user"
+
+        mock_channel = MagicMock()
+        mock_channel.name = "test_channel"
+        mock_channel.send = MagicMock()
+
+        mock_photo = MagicMock()
+        mock_photo.filename = "image.jpg"
+        # mock_photo.filename.value = "image.jpg"
+
+        cog = Announcements(mock_bot)
+        mock_logger = MagicMock()
+        mock_logger.info = MagicMock()
+        cog.logger = mock_logger
+
+        mock_mention = MagicMock()
+        mock_mention.mention = "<@1234567890>"
+        mock_mention.value = "1234567890"
+
+        mock_submission_type = MagicMock()
+        mock_submission_type.value = "regular"
+
+        await cog.announce.callback(cog,interaction=mock_interaction, submission_type=mock_submission_type, channel=mock_channel, photo=mock_photo, mention=mock_mention)
+
+        mock_interaction.response.send_modal.assert_awaited_once()
+
+        cog.logger.info.assert_called_once_with(f"A announcement was made by {mock_interaction.user} in {mock_channel.name}")
+        sent_modal = mock_interaction.response.send_modal.call_args[0][0]
+
+        self.assertIsInstance(sent_modal, Announcement)
+        mock_wait.assert_awaited_once()
+
+if __name__ == "__main__":
+    unittest.main()