fix: mark as solved and accept solution

Author: mystique09

src/cogs/forum/auto_tagging.py

@@ -14,7 +14,8 @@
 )
 from discord.app_commands import ContextMenu, command, describe
 from discord.enums import AppCommandType
-from discord.ext.commands import Bot, Cog, GroupCog, command as prefixed_command
+from discord.ext.commands import Bot, Cog, GroupCog
+from discord.ext.commands import command as prefixed_command
 from discord.ext.commands.context import Context
 from discord.types.embed import Embed
 from discord.ui.select import Select
@@ -373,6 +374,9 @@ async def edit(self, interaction: Interaction, config_id: int):
         tags = await self.db.get_tags(config_id)
         existing_tags: list[Role] | list[Member] = []
 
+        # Get current configuration values
+        current_enable_accept_solutions = config.get("enable_accept_solutions", False)
+
         mark_as_solved_config = await self.db.get_mark_as_solved_config(config_id)
         current_mark_as_solved = (
             mark_as_solved_config["enable_mark_as_solved"]
@@ -392,6 +396,7 @@ async def edit(self, interaction: Interaction, config_id: int):
             tag_message=tag_message,
             custom_msg=custom_message,
             existing_tags=existing_tags,
+            enable_accept_solutions=current_enable_accept_solutions,
             enable_mark_as_solved=current_mark_as_solved,
         )
 
@@ -417,6 +422,7 @@ async def edit(self, interaction: Interaction, config_id: int):
                 entities=tags,
                 entity_tag_message=tag_message,
                 reply=reply,
+                enable_accept_solutions=modal.state.enable_accept_solutions,
                 enable_mark_as_solved=modal.state.enable_mark_as_solved,
             )
 

src/data/forum/post_assist.py

@@ -218,6 +218,7 @@ async def update_configuration(
         entities: list[tuple[int, str]],
         entity_tag_message: str,
         reply: str,
+        enable_accept_solutions: bool | None = None,
         enable_mark_as_solved: bool | None = None,
     ):
         """Updates a configuration to the database.
@@ -226,6 +227,7 @@ async def update_configuration(
         :param entities: The entities to add
         :param entity_tag_message: The tag message
         :param reply: The reply message
+        :param enable_accept_solutions: Enable accept solutions app command
         :param enable_mark_as_solved: Whether to enable mark as solved button
         """
 
@@ -237,29 +239,19 @@ async def update_configuration(
             if not config:
                 return
 
-            # Update the main configuration
-            if enable_mark_as_solved is not None:
-                await conn.execute(
-                    """
-                    UPDATE pph_post_assist_config SET
-                        forum_id = $1,
-                        enable_mark_as_solved = $3
-                    WHERE id = $2;
-                """,
-                    forum_id,
-                    id,
-                    enable_mark_as_solved,
-                )
-            else:
-                await conn.execute(
-                    """
-                    UPDATE pph_post_assist_config SET
-                        forum_id = $1
-                    WHERE id = $2;
+            await conn.execute(
+                """
+                UPDATE pph_post_assist_config SET
+                    forum_id = $1,
+                    enable_accept_solutions = COALESCE($3, enable_accept_solutions),
+                    enable_mark_as_solved = COALESCE($4, enable_mark_as_solved)
+                WHERE id = $2;
                 """,
-                    forum_id,
-                    id,
-                )
+                forum_id,
+                id,
+                enable_accept_solutions,
+                enable_mark_as_solved,
+            )
 
             await conn.execute(
                 """

src/ui/views/post_assist.py

@@ -28,7 +28,7 @@ def __init__(
         enable_accept_solutions: bool = False,
         enable_mark_as_solved: bool = False,
         finished: bool = False,
-        failed: bool = False
+        failed: bool = False,
     ):
         self.forum: int = forum
         self.tag_list: list[tuple[int, str]] = []
@@ -47,7 +47,7 @@ def __init__(
         forum: int = None,
         tag_message: str = None,
         custom_msg: str = None,
-        db: PostAssistDB = None
+        db: PostAssistDB = None,
     ):
         super().__init__(timeout=480)
         self.db = db
@@ -189,17 +189,32 @@ async def enable(self, interaction: Interaction, button: Button):
         )
 
         enable_mark_as_solved_button = PostAssistEnableMarkAsSolvedButton(self.state)
-        await interaction.followup.send("Enable Mark as Solved feature?", view=enable_mark_as_solved_button, ephemeral=True)
+        await interaction.followup.send(
+            "Enable Mark as Solved feature?",
+            view=enable_mark_as_solved_button,
+            ephemeral=True,
+        )
         await enable_mark_as_solved_button.wait()
         self.stop()
 
     @button(label="No")
     async def disable(self, interaction: Interaction, button: Button):
         self.state.enable_accept_solutions = False
         self.state.finished = True
-        await interaction.response.send_message("Accept solutions disabled.", ephemeral=True)
+        await interaction.response.send_message(
+            "Accept solutions disabled.", ephemeral=True
+        )
+
+        enable_mark_as_solved_button = PostAssistEnableMarkAsSolvedButton(self.state)
+        await interaction.followup.send(
+            "Enable Mark as Solved feature?",
+            view=enable_mark_as_solved_button,
+            ephemeral=True,
+        )
+        await enable_mark_as_solved_button.wait()
         self.stop()
 
+
 class PostAssistEnableMarkAsSolvedButton(View):
     def __init__(self, options: PostAssistState):
         super().__init__(timeout=480)
@@ -212,17 +227,22 @@ async def enable_mark_as_solved(self, interaction: Interaction, button: Button):
         self.state.enable_mark_as_solved = True
         self.state.finished = True
 
-        await interaction.followup.send("Mark as solved will be enabled.", ephemeral=True)
+        await interaction.followup.send(
+            "Mark as solved will be enabled.", ephemeral=True
+        )
 
         self.stop()
 
     @button(label="No")
     async def disable_mark_as_solved(self, interaction: Interaction, button: Button):
         self.state.enable_mark_as_solved = False
         self.state.finished = True
-        await interaction.response.send_message("Mark as solved disabled.", ephemeral=True)
+        await interaction.response.send_message(
+            "Mark as solved disabled.", ephemeral=True
+        )
         self.stop()
 
+
 class ConfigurationPagination(View):
     def __init__(self, data: list[dict], getter: Callable):
         self.data = data
@@ -258,29 +278,26 @@ async def next(self, interaction: Interaction, button: Button):
             view=self,
         )
 
+
 def get_forums(db: Settings, guild: Guild) -> View:
     """Gets all forums."""
 
     async def select_callback(interaction: Interaction):
         await db.set_setting("dev_help_forum", int(forum_selection.values[0]))
-        await interaction.response.edit_message(
-            content=f"Success...",
-            view=None
-        )
+        await interaction.response.edit_message(content=f"Success...", view=None)
         view.stop()
 
     view = View()
     forum_selection = Select(placeholder="Select Forum...")
     forum_selection.callback = select_callback
 
     for forum in guild.forums:
-        forum_selection.add_option(
-            label=forum.name, value=str(forum.id)
-        )
+        forum_selection.add_option(label=forum.name, value=str(forum.id))
 
     view.add_item(forum_selection)
     return view
 
+
 def format_data(data: dict, guild: Guild, getter: Callable):
     forum = guild.get_channel(data["forum_id"])
     tags = data["tags"]