try

Author: kortregt

draft_vote.py

@@ -2,14 +2,18 @@
 import time
 import os
 from typing import Optional, List
-from datetime import datetime
+from datetime import datetime, timedelta
+import logging
 
 import discord
 from discord.ext import commands
 from discord import ButtonStyle
 
 from draft_database import DraftDatabase
 
+# Set up logger
+logger = logging.getLogger(__name__)
+
 
 def log_vote(message: str) -> None:
     """Log vote events to a file."""
@@ -21,9 +25,28 @@ def log_vote(message: str) -> None:
         file.write(f"[{timestamp}] {message}\n")
 
 
-class VoteView(discord.ui.View):
-    """A view containing the voting buttons and result handling."""
+class ReviewModal(discord.Modal):
+    def __init__(self, is_approval: bool) -> None:
+        title = "Draft Review" if is_approval else "Draft Rejection"
+        super().__init__(title=title)
+
+        self.input = discord.TextInput(
+            label="Categories" if is_approval else "Rejection Reason",
+            placeholder=("Enter categories separated by commas" if is_approval
+                         else "Enter reason for rejection"),
+            style=discord.TextStyle.paragraph,
+            required=True,
+            row=0
+        )
+        self.add_item(self.input)
+        self.result = None
 
+    async def callback(self, interaction: discord.Interaction):
+        self.result = self.input.value
+        await interaction.response.defer()
+
+
+class VoteView(discord.ui.View):
     def __init__(self,
                  author: str,
                  draft_name: str,
@@ -33,15 +56,33 @@ def __init__(self,
         self.author = author
         self.draft_name = draft_name
         self.required_votes = required_votes
-        self.approve_votes: List[int] = []  # Store user IDs
+        self.approve_votes: List[int] = []
         self.reject_votes: List[int] = []
-        self.result: Optional[bool] = None  # True for approve, False for reject
+        self.result: Optional[bool] = None
+        self.end_time = int((datetime.now() + timedelta(seconds=timeout)).timestamp())
+        self.message = None
 
-    @discord.ui.button(label="Approve (0)", style=ButtonStyle.green, emoji="✅")
+    def _create_status_embed(self) -> discord.Embed:
+        """Create an embed showing the current voting status."""
+        embed = discord.Embed(
+            title=f"Vote: {self.draft_name}",
+            description=(
+                f"Draft by {self.author}\n\n"
+                f"Required votes: {self.required_votes}\n"
+                f"Ends: <t:{self.end_time}:R>\n\n"
+                f"Current status:\n"
+                f"✅ Approve: {len(self.approve_votes)}\n"
+                f"❌ Reject: {len(self.reject_votes)}"
+            ),
+            color=discord.Color.blue()
+        )
+        return embed
+
+    @discord.ui.button(label="Approve (0)", style=discord.ButtonStyle.green, emoji="✅")
     async def approve(self, button: discord.ui.Button, interaction: discord.Interaction):
         await self._handle_vote(interaction, True)
 
-    @discord.ui.button(label="Reject (0)", style=ButtonStyle.red, emoji="❌")
+    @discord.ui.button(label="Reject (0)", style=discord.ButtonStyle.red, emoji="❌")
     async def reject(self, button: discord.ui.Button, interaction: discord.Interaction):
         await self._handle_vote(interaction, False)
 
@@ -77,46 +118,18 @@ async def _handle_vote(self, interaction: discord.Interaction, is_approve: bool)
         embed = self._create_status_embed()
         await interaction.response.edit_message(embed=embed, view=self)
 
-    def _create_status_embed(self) -> discord.Embed:
-        """Create an embed showing the current voting status."""
-        embed = discord.Embed(
-            title=f"Vote: {self.draft_name}",
-            description=f"Draft by {self.author}\n\n"
-                        f"Required votes: {self.required_votes}\n"
-                        f"Current status:\n"
-                        f"✅ Approve: {len(self.approve_votes)}\n"
-                        f"❌ Reject: {len(self.reject_votes)}",
-            color=discord.Color.blue()
-        )
-        return embed
-
-
-class ReviewModal(discord.ui.Modal):
-    """Modal for entering review comments."""
-
-    def __init__(self, is_approval: bool) -> None:
-        title = "Draft Review" if is_approval else "Draft Rejection"
-        super().__init__(title=title)
-
-        self.input = discord.ui.TextInput(
-            label="Categories" if is_approval else "Rejection Reason",
-            placeholder=("Enter categories separated by commas" if is_approval
-                         else "Enter reason for rejection"),
-            style=discord.TextStyle.paragraph,
-            required=True
-        )
-        self.add_item(self.input)
-        self.result = None
-
-    async def callback(self, interaction: discord.Interaction):
-        self.result = self.input.value
-        await interaction.response.defer()
+    async def on_timeout(self) -> None:
+        """Handle view timeout"""
+        for item in self.children:
+            item.disabled = True
+        if self.message:
+            await self.message.edit(view=self)
 
 
 class DraftVote(commands.Cog):
     def __init__(self, bot: commands.Bot):
         self.bot = bot
-        db_path = os.getenv('DATABASE_PATH', 'drafts.db')
+        db_path = os.getenv('DRAFT_DB_PATH', 'drafts.db')
         self.db = DraftDatabase(db_path)
 
     @discord.slash_command(
@@ -147,12 +160,13 @@ async def vote(
             Duration of vote in hours (default: 24)
         """
         await ctx.defer()
+
         try:
             # Verify draft exists
             draft_title = f"User:{author}/Drafts/{draft_name}"
             draft = self.db.get_draft(draft_title)
             if not draft:
-                await ctx.respond(
+                await ctx.followup.send(
                     f"Error: Draft '{draft_name}' by {author} not found.",
                     ephemeral=True
                 )
@@ -168,44 +182,49 @@ async def vote(
 
             embed = view._create_status_embed()
             message = await ctx.followup.send(embed=embed, view=view)
+            view.message = message
 
             log_vote(f"Vote started for {draft_name} by {author}")
 
-            # Wait for voting to complete
             try:
                 await view.wait()
+
+                if view.result is None:  # Timeout
+                    await ctx.followup.send("Vote has timed out.")
+                    return
+
+                # Handle vote result
+                modal = ReviewModal(is_approval=view.result)
+                await ctx.interaction.response.send_modal(modal)
+                await modal.wait()
+
+                if view.result:  # Approved
+                    await self.bot.get_cog('DraftBot').approve(author, draft_name, modal.result)
+                    result_embed = discord.Embed(
+                        title="Draft Approved",
+                        description=f"{draft_name} by {author} has been approved.",
+                        color=discord.Color.green()
+                    )
+                else:  # Rejected
+                    await self.bot.get_cog('DraftBot').reject(author, draft_name, modal.result)
+                    result_embed = discord.Embed(
+                        title="Draft Rejected",
+                        description=f"{draft_name} by {author} has been rejected.",
+                        color=discord.Color.red()
+                    )
+
+                await ctx.followup.send(embed=result_embed)
+                log_vote(f"Vote completed for {draft_name} by {author}: {'Approved' if view.result else 'Rejected'}")
+
             except asyncio.TimeoutError:
                 log_vote(f"Vote timed out for {draft_name} by {author}")
                 await message.edit(content="Vote has timed out.", view=None)
                 return
 
-            # Handle vote result
-            modal = ReviewModal(is_approval=view.result)
-            await ctx.interaction.response.send_modal(modal)
-            await modal.wait()
-
-            if view.result:  # Approved
-                await self.bot.get_cog('DraftBot').approve(author, draft_name, modal.result)
-                result_embed = discord.Embed(
-                    title="Draft Approved",
-                    description=f"{draft_name} by {author} has been approved.",
-                    color=discord.Color.green()
-                )
-            else:  # Rejected
-                await self.bot.get_cog('DraftBot').reject(author, draft_name, modal.result)
-                result_embed = discord.Embed(
-                    title="Draft Rejected",
-                    description=f"{draft_name} by {author} has been rejected.",
-                    color=discord.Color.red()
-                )
-
-            await ctx.send(embed=result_embed)
-            log_vote(f"Vote completed for {draft_name} by {author}: {'Approved' if view.result else 'Rejected'}")
-
         except Exception as e:
-            await ctx.followup.send(f"An error occurred: {str(e)}", ephemeral=True)
             logger.error(f"Error in vote command: {str(e)}", exc_info=True)
+            await ctx.followup.send(f"An error occurred: {str(e)}", ephemeral=True)
+
 
-def setup(bot):
-    print("Setting up DraftVote cog")  # Debug print
-    bot.add_cog(DraftVote(bot))
+def setup(bot: commands.Bot):
+    bot.add_cog(DraftVote(bot))