Update petroll.py

petroll.py

@@ -16,6 +16,98 @@ first_luck_claimed = set()
 auto_roll_users = set()
 auto_sell_users = set()
 
+class PetRollView(discord.ui.View):
+    def __init__(self, rap_value, user_id):
+        super().__init__(timeout=None)
+        self.rap_value = rap_value
+        self.user_id = user_id
+        self.pet_sold = False
+        self.auto_sell = False
+
+        # Add buttons
+        self.add_item(discord.ui.Button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again"))
+        self.add_item(discord.ui.Button(style=discord.ButtonStyle.success, label=f"Sell Pet for ${self.rap_value}", custom_id="sell_pet"))
+        self.add_item(discord.ui.Button(style=discord.ButtonStyle.primary, label="Auto Pet Sell", custom_id="auto_pet_sell"))
+    
+    async def interaction_check(self, interaction: discord.Interaction) -> bool:
+        if interaction.user.id != self.user_id:
+            await interaction.response.send_message("You cannot interact with these buttons.", ephemeral=True)
+            return False
+        return True
+
+    @discord.ui.button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again")
+    async def roll_again_button(self, button: discord.ui.Button, interaction: discord.Interaction):
+        await interaction.response.defer()
+        result = await perform_roll(interaction)
+        if result:
+            await interaction.followup.send(embed=result[0], view=result[1])
+        else:
+            await interaction.followup.send("An error occurred.")
+
+    @discord.ui.button(style=discord.ButtonStyle.success, label="Sell Pet", custom_id="sell_pet")
+    async def sell_pet_button(self, button: discord.ui.Button, interaction: discord.Interaction):
+        if self.pet_sold:
+            await interaction.response.send_message("This pet has already been sold.", ephemeral=True)
+            return
+
+        sell_value = self.rap_value
+        user_cash[self.user_id] = user_cash.get(self.user_id, 0) + sell_value
+        self.pet_sold = True
+        await interaction.response.send_message(f"You sold the pet for ${sell_value}. Your new balance is ${user_cash[self.user_id]}.", ephemeral=True)
+        
+        # Remove the sell button to prevent duplicate sales
+        self.sell_pet_button.disabled = True
+        self.sell_pet_button.label = "Sold"
+        await interaction.message.edit(view=self)
+
+        # If auto-sell is enabled, ensure it's disabled since the pet is already sold
+        if self.auto_sell:
+            self.auto_sell = False
+            self.auto_pet_sell_button.label = "Auto Pet Sell"
+            await interaction.message.edit(view=self)
+
+    @discord.ui.button(style=discord.ButtonStyle.primary, label="Auto Pet Sell", custom_id="auto_pet_sell")
+    async def auto_pet_sell_button(self, button: discord.ui.Button, interaction: discord.Interaction):
+        if self.auto_sell:
+            self.auto_sell = False
+            auto_sell_users.discard(self.user_id)
+            button.label = "Auto Pet Sell"
+            await interaction.response.send_message("Auto pet sell stopped.", ephemeral=True)
+        else:
+            if self.pet_sold:
+                await interaction.response.send_message("This pet has already been sold.", ephemeral=True)
+                return
+            self.auto_sell = True
+            auto_sell_users.add(self.user_id)
+            button.label = "Stop Auto Pet Sell"
+            await interaction.response.send_message("Auto pet sell started. You cannot manually sell pets while auto-sell is enabled.", ephemeral=True)
+            asyncio.create_task(auto_sell_process(interaction, self))
+
+        await interaction.message.edit(view=self)
+
+async def auto_sell_process(interaction: discord.Interaction, view: PetRollView):
+    user_id = view.user_id
+    try:
+        while view.auto_sell and not view.pet_sold:
+            # Automatically sell the pet
+            sell_value = view.rap_value
+            user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
+            view.pet_sold = True
+            await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
+
+            # Disable the sell button
+            view.sell_pet_button.disabled = True
+            view.sell_pet_button.label = "Sold"
+            # Disable auto-sell as the pet is already sold
+            view.auto_sell = False
+            view.auto_pet_sell_button.label = "Auto Pet Sell"
+            await interaction.message.edit(view=view)
+            break
+
+            # If you want auto-sell to handle multiple pets rolled, you can extend this logic
+    except Exception as e:
+        print(f"Auto-sell process encountered an error: {e}")
+
 async def perform_roll(interaction: discord.Interaction):
     async def fetch_data(url):
         async with aiohttp.ClientSession() as session:
@@ -37,12 +129,12 @@ async def perform_roll(interaction: discord.Interaction):
 
     user_id = interaction.user.id
     luck_multiplier = luck_multipliers.get(user_id, 1)
-    
+
     sorted_pets = sorted(pets, key=lambda x: x['configData']['difficulty'])
-    
+
     max_index = len(sorted_pets) - 1
     index = int(max_index * (luck_multiplier - 1) / 9)
-    
+
     rolled_pet = random.choice(sorted_pets[:index+1])
 
     pet_rap = next((pet for pet in rap_data['data'] if pet['configData']['id'] == rolled_pet['configName']), None)
@@ -82,47 +174,12 @@ async def perform_roll(interaction: discord.Interaction):
     
     embed.set_footer(text=f"Click 'Roll Again' to roll again!{luck_text}")
 
-    # Create buttons
-    view = discord.ui.View(timeout=None)
-
-    # Roll Again Button
-    roll_again_button = discord.ui.Button(style=discord.ButtonStyle.primary, label="Roll Again", custom_id="roll_again")
-    
-    async def roll_again_callback(interaction: discord.Interaction):
-        await interaction.response.defer()
-        result = await perform_roll(interaction)
-        if result:
-            await interaction.followup.send(embed=result[0], view=result[1])
-        else:
-            await interaction.followup.send("An error occurred.")
-
-    roll_again_button.callback = roll_again_callback
-    view.add_item(roll_again_button)
-
-    # Sell Button
-    sell_button = discord.ui.Button(style=discord.ButtonStyle.success, label=f"Sell Pet for ${rap_value}", custom_id="sell_pet")
-    
-    async def sell_pet_callback(interaction: discord.Interaction):
-        if interaction.user.id != user_id:
-            await interaction.response.send_message("You cannot sell this pet.", ephemeral=True)
-            return
-
-        sell_value = rap_value
-        user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
-        await interaction.response.send_message(f"You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
-        
-        # Remove the sell button after selling to prevent duplicate sales
-        view.remove_item(sell_button)
-        await interaction.message.edit(view=view)
+    # Initialize the custom view
+    view = PetRollView(rap_value=rap_value, user_id=user_id)
 
-    sell_button.callback = sell_pet_callback
-
-    # Add sell button only if auto-sell is not enabled
-    if user_id not in auto_sell_users:
-        view.add_item(sell_button)
-
-    # First Luck Button
+    # Handle first luck claim
     if user_id not in first_luck_claimed:
+        # Add the first luck button
         first_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Claim 100% Luck Forever", custom_id="first_luck")
         
         async def first_luck_callback(interaction: discord.Interaction):
@@ -135,6 +192,7 @@ async def perform_roll(interaction: discord.Interaction):
             
             await interaction.response.send_message("You've claimed 100% luck forever!", ephemeral=True)
             
+            # Remove the first luck button
             view.remove_item(first_luck_button)
             await interaction.message.edit(view=view)
         
@@ -142,6 +200,7 @@ async def perform_roll(interaction: discord.Interaction):
         view.add_item(first_luck_button)
     
     elif random.random() < 0.6 or user_id not in luck_multipliers:
+        # Add the increase luck button
         luck_opportunities[user_id] = luck_opportunities.get(user_id, 0) + 1
         increase_luck_button = discord.ui.Button(style=discord.ButtonStyle.success, label="Increase Luck", custom_id=f"increase_luck_{luck_opportunities[user_id]}")
         
@@ -166,6 +225,7 @@ async def perform_roll(interaction: discord.Interaction):
             luck_percentage = (new_luck - 1) * 100
             await interaction.response.send_message(f"Your luck has been increased to {luck_percentage}% for 30 minutes!", ephemeral=True)
             
+            # Remove the increase luck button
             view.remove_item(increase_luck_button)
             await interaction.message.edit(view=view)
 
@@ -175,76 +235,6 @@ async def perform_roll(interaction: discord.Interaction):
         increase_luck_button.callback = increase_luck_callback
         view.add_item(increase_luck_button)
 
-    # Auto Roll Button
-    auto_roll_button = discord.ui.Button(
-        style=discord.ButtonStyle.primary if user_id not in auto_roll_users else discord.ButtonStyle.danger,
-        label="Auto Roll" if user_id not in auto_roll_users else "Stop Auto Roll",
-        custom_id="auto_roll"
-    )
-
-    async def auto_roll_callback(interaction: discord.Interaction):
-        if interaction.user.id != user_id:
-            await interaction.response.send_message("You cannot use this button.", ephemeral=True)
-            return
-
-        if user_id in auto_roll_users:
-            auto_roll_users.remove(user_id)
-            auto_roll_button.style = discord.ButtonStyle.primary
-            auto_roll_button.label = "Auto Roll"
-            await interaction.response.send_message("Auto roll stopped.", ephemeral=True)
-        else:
-            auto_roll_users.add(user_id)
-            auto_roll_button.style = discord.ButtonStyle.danger
-            auto_roll_button.label = "Stop Auto Roll"
-            await interaction.response.send_message("Auto roll started. It will automatically stop after 3 minutes.", ephemeral=True)
-            asyncio.create_task(auto_roll(interaction))
-        
-        await interaction.message.edit(view=view)
-
-    auto_roll_button.callback = auto_roll_callback
-    view.add_item(auto_roll_button)
-
-    # Auto Sell Button
-    auto_sell_button = discord.ui.Button(
-        style=discord.ButtonStyle.primary if user_id not in auto_sell_users else discord.ButtonStyle.danger,
-        label="Auto Pet Sell" if user_id not in auto_sell_users else "Stop Auto Pet Sell",
-        custom_id="auto_pet_sell"
-    )
-
-    async def auto_sell_callback(interaction: discord.Interaction):
-        if interaction.user.id != user_id:
-            await interaction.response.send_message("You cannot use this button.", ephemeral=True)
-            return
-
-        if user_id in auto_sell_users:
-            auto_sell_users.remove(user_id)
-            auto_sell_button.style = discord.ButtonStyle.primary
-            auto_sell_button.label = "Auto Pet Sell"
-            await interaction.response.send_message("Auto pet sell stopped.", ephemeral=True)
-            # Re-add the sell button only if it's not already removed
-            if not any(item.custom_id == "sell_pet" for item in view.children):
-                view.add_item(sell_button)
-        else:
-            auto_sell_users.add(user_id)
-            auto_sell_button.style = discord.ButtonStyle.danger
-            auto_sell_button.label = "Stop Auto Pet Sell"
-            await interaction.response.send_message("Auto pet sell started. You cannot manually sell pets while auto-sell is enabled.", ephemeral=True)
-            # Remove the sell button to prevent manual selling
-            view.remove_item(sell_button)
-        
-        await interaction.message.edit(view=view)
-
-    auto_sell_button.callback = auto_sell_callback
-    view.add_item(auto_sell_button)
-
-    # Handle Auto Sell: Automatically sell the pet if auto-sell is enabled
-    if user_id in auto_sell_users:
-        user_cash[user_id] = user_cash.get(user_id, 0) + rap_value
-        embed.add_field(name="Auto Sell", value=f"Pet automatically sold for ${rap_value}. New balance: ${user_cash[user_id]}", inline=False)
-        # Remove the sell button since it's auto-sold
-        if any(item.custom_id == "sell_pet" for item in view.children):
-            view.remove_item(sell_button)
-
     return embed, view
 
 async def schedule_next_luck_opportunity(interaction: discord.Interaction, user_id: int):
@@ -273,7 +263,7 @@ async def schedule_next_luck_opportunity(interaction: discord.Interaction, user_
         luck_percentage = (new_luck - 1) * 100
         await interaction.response.send_message(f"Your luck has been increased to {luck_percentage}% for 30 minutes!", ephemeral=True)
         
-        # Remove the used button
+        # Remove the increase luck button
         view = interaction.message.components[0]
         view.remove_item(increase_luck_button)
         await interaction.message.edit(view=view)
@@ -283,9 +273,68 @@ async def schedule_next_luck_opportunity(interaction: discord.Interaction, user_
     
     increase_luck_button.callback = increase_luck_callback
     
-    view = interaction.message.components[0]
-    view.add_item(increase_luck_button)
-    await interaction.message.edit(view=view)
+    # Assuming the original message is the last one sent
+    # This might need adjustment based on your actual bot's message handling
+    try:
+        message = interaction.message
+        view = PetRollView(rap_value=0, user_id=user_id)  # rap_value is irrelevant here
+        view.remove_item(increase_luck_button)
+        view.add_item(increase_luck_button)
+        await message.edit(view=view)
+    except Exception as e:
+        print(f"Error scheduling next luck opportunity: {e}")
+
+async def auto_sell_process_new_pet(interaction: discord.Interaction, view: PetRollView):
+    """
+    This function handles auto-selling new pets rolled while auto-sell is enabled.
+    """
+    user_id = view.user_id
+    sell_value = view.rap_value
+    
+    if not view.pet_sold:
+        # Automatically sell the pet
+        user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
+        view.pet_sold = True
+        await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
+
+        # Disable the sell button
+        view.sell_pet_button.disabled = True
+        view.sell_pet_button.label = "Sold"
+
+        # Disable auto-sell since the pet is already sold
+        view.auto_sell = False
+        view.auto_pet_sell_button.label = "Auto Pet Sell"
+        await interaction.message.edit(view=view)
+
+        # Notify the user
+        await interaction.followup.send("Auto-sell has been disabled since the pet was automatically sold.", ephemeral=True)
+
+async def auto_sell(interaction: discord.Interaction, view: PetRollView):
+    """
+    This coroutine handles continuous auto-selling while auto-sell is enabled.
+    """
+    user_id = view.user_id
+    while view.auto_sell and not view.pet_sold:
+        # Automatically sell the pet
+        sell_value = view.rap_value
+        user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
+        view.pet_sold = True
+        await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
+
+        # Disable the sell button
+        view.sell_pet_button.disabled = True
+        view.sell_pet_button.label = "Sold"
+
+        # Disable auto-sell since the pet is already sold
+        view.auto_sell = False
+        view.auto_pet_sell_button.label = "Auto Pet Sell"
+        await interaction.message.edit(view=view)
+
+        # Notify the user
+        await interaction.followup.send("Auto-sell has been disabled since the pet was automatically sold.", ephemeral=True)
+        break  # Exit the loop since the pet is sold
+
+    # If you want auto-sell to handle multiple pets rolled over time, remove the break and implement additional logic
 
 async def auto_roll(interaction: discord.Interaction):
     user_id = interaction.user.id
@@ -293,12 +342,32 @@ async def auto_roll(interaction: discord.Interaction):
     while user_id in auto_roll_users:
         if time.time() - start_time >= 180:  # 3 minutes
             auto_roll_users.remove(user_id)
-            await interaction.followup.send("auto roll stopped, to turn it on again, roll again then turn it on", ephemeral=True)
+            await interaction.followup.send("auto roll stopped, to turn it on roll again and start it again", ephemeral=True)
             break
         
         result = await perform_roll(interaction)
         if result:
-            await interaction.followup.send(embed=result[0], view=result[1])
+            embed, view = result
+            # If auto-sell is enabled, automatically sell the pet
+            if user_id in auto_sell_users:
+                # Wait briefly to ensure the message is sent before auto-selling
+                await asyncio.sleep(1)
+                # Automatically sell the pet
+                sell_value = view.rap_value
+                user_cash[user_id] = user_cash.get(user_id, 0) + sell_value
+                view.pet_sold = True
+                await interaction.followup.send(f"Auto-sell: You sold the pet for ${sell_value}. Your new balance is ${user_cash[user_id]}.", ephemeral=True)
+
+                # Disable the sell button
+                view.sell_pet_button.disabled = True
+                view.sell_pet_button.label = "Sold"
+
+                # Disable auto-sell since the pet is already sold
+                view.auto_sell = False
+                view.auto_pet_sell_button.label = "Auto Pet Sell"
+                await interaction.message.edit(view=view)
+
+            await interaction.followup.send(embed=embed, view=view)
         else:
             await interaction.followup.send("An error occurred.")
         await asyncio.sleep(5)  # Wait for 5 seconds between rolls