Update sportbet.py

sportbet.py

@@ -157,149 +157,137 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
                 "game_data": self.game_data
             })
 
-            asyncio.create_task(self.monitor_game(interaction, bet_amount))
+            asyncio.create_task(self.monitor_game(interaction))
+            
         except ValueError as e:
             await interaction.response.send_message(str(e), ephemeral=False)
 
-    async def monitor_game(self, interaction, bet_amount):
-        game_start = datetime.fromisoformat(self.game_data['eventTime'].replace('Z', '+00:00'))
-        event_id = self.game_data['id']
-        fetch_scores = fetch_nhl_scores if self.league == "NHL" else fetch_nfl_scores
-
-        sleep_duration = (game_start - datetime.now(timezone.utc)).total_seconds()
-        if sleep_duration > 0:
-            await asyncio.sleep(sleep_duration)
-
-        user = await interaction.client.fetch_user(self.user_id)
-        await user.send(f"Your team **{self.team}** has started playing!")
-
-        previous_scores = {
-            self.game_data['lowerTeam']['name']: self.game_data.get('lowerTeam', {}).get('score', 0),
-            self.game_data['upperTeam']['name']: self.game_data.get('upperTeam', {}).get('score', 0)
-        }
-
-        while True:
-            scores = await fetch_scores()
-            game = None
-            for section in scores.get('sectionList', []):
-                for evt in section.get('events', []):
-                    if evt['id'] == event_id:
-                        game = evt
-                        break
-                if game:
-                    break
-            if not game:
-                await asyncio.sleep(60)
-                continue
-
-            event_status = game.get('eventStatus', 2)
-            current_scores = {
-                game['lowerTeam']['name']: game['lowerTeam'].get('score', 0),
-                game['upperTeam']['name']: game['upperTeam'].get('score', 0)
-            }
-            is_final = event_status == 3
-
-            # Check for score updates
-            for team, score in current_scores.items():
-                if score > previous_scores.get(team, 0):
-                    team_name = self.game_data['lowerTeam']['longName'] if team == self.game_data['lowerTeam']['name'] else self.game_data['upperTeam']['longName']
-                    message = f"**{team_name}** SCORED! Current score: {current_scores[self.game_data['lowerTeam']['name']]} - {current_scores[self.game_data['upperTeam']['name']]}"
-                    await user.send(message)
-
-            previous_scores = current_scores.copy()
-
-            if is_final:
-                away_score = current_scores.get(self.game_data['lowerTeam']['name'], 0)
-                home_score = current_scores.get(self.game_data['upperTeam']['name'], 0)
-                winner = self.game_data['lowerTeam']['name'] if away_score > home_score else self.game_data['upperTeam']['name']
-
-                if winner == self.team:
-                    winnings = bet_amount * 2
-                    user_cash[self.user_id] += winnings
-                    await user.send(f"🎉 **Congratulations!** Your team **{self.team}** won! You won **${winnings}**!")
-                else:
-                    await user.send(f"😞 **Sorry!** Your team **{self.team}** lost. Better luck next time!")
-
-                # Remove the completed bet
-                user_bets[self.user_id] = [bet for bet in user_bets[self.user_id] if not (bet['league'] == self.league and bet['team'] == self.team and bet['game_data']['id'] == event_id)]
-                break
-
-            await asyncio.sleep(60)  # Check every minute
+    async def monitor_game(self, interaction):
+        
+       # Fetch initial scores and set up monitoring loop
+        
+       previous_scores = {
+           self.game_data['lowerTeam']['name']: None,
+           self.game_data['upperTeam']['name']: None,
+       }
+       
+       while True:
+           scores_response = await fetch_nhl_scores() if self.league == "NHL" else fetch_nfl_scores()
+           event_list_key='events' if 'events' in scores_response.get('sectionList', [{}])[0] else 'games'
+           current_game=None
 
-class SportBetView(discord.ui.View):
-    def __init__(self):
-        super().__init__()
-        self.add_item(SportSelect())
+           for section in scores_response.get('sectionList', []):
+               for event in section.get(event_list_key , []):
+                   if event['id'] == self.game_data['id']:
+                       current_game=event
+                       break
 
-    @discord.ui.button(label="View Bets", style=discord.ButtonStyle.secondary)
-    async def view_bets(self, interaction: discord.Interaction, button: discord.ui.Button):
-        await show_current_bets(interaction)
-
-async def show_current_bets(interaction: discord.Interaction):
-    user_id = interaction.user.id
-    if user_id not in user_bets or not user_bets[user_id]:
-        await interaction.response.send_message("You have no active bets.", ephemeral=False)
-        return
-
-    embed = discord.Embed(title="Your Current Bets", color=0x787878)
-    for i, bet in enumerate(user_bets[user_id], 1):
-        league = bet['league']
-        team = bet['team']
-        amount = bet['amount']
-        game = bet['game_data']
-        game_description = f"{game['lowerTeam']['longName']} vs {game['upperTeam']['longName']}"
-        start_time = game['eventTime']
-        score = f"{game['lowerTeam'].get('score', 'N/A')} - {game['upperTeam'].get('score', 'N/A')}"
-        status = "Final" if game.get('upperTeam', {}).get('score') is not None else f"Starts <t:{int(datetime.fromisoformat(start_time.replace('Z', '+00:00')).timestamp())}:R>"
-
-        embed.add_field(
-            name=f"Bet {i}: {league}",
-            value=(
-                f"**Team:** {team}\n"
-                f"**Amount:** ${amount}\n"
-                f"**Game:** {game_description}\n"
-                f"**Status:** {status}\n"
-                f"**Current Score:** {score}\n"
-                f"**Start Time:** <t:{int(datetime.fromisoformat(start_time.replace('Z', '+00:00')).timestamp())}:F>"
-            ),
-            inline=False
-        )
-
-    view = discord.ui.View()
-    cancel_select = discord.ui.Select(
-        placeholder="Select a bet to cancel",
-        min_values=1,
-        max_values=1,
-        options=[
-            discord.SelectOption(label=f"Bet {i}", value=str(i-1)) for i in range(1, len(user_bets[user_id]) + 1)
-        ]
-    )
-    view.add_item(cancel_select)
+           if not current_game:
+               await asyncio.sleep(60) 
+               continue
 
-    async def cancel_callback(interaction_cancel: discord.Interaction):
-        if interaction_cancel.user.id != user_id:
-            await interaction_cancel.response.send_message("You cannot cancel other users' bets.", ephemeral=False)
-            return
+           current_scores={
+               current_game['lowerTeam']['name']: current_game['lowerTeam'].get('score'),
+               current_game['upperTeam']['name']: current_game['upperTeam'].get('score'),
+           }
 
-        bet_index = int(cancel_select.values[0])
-        cancelled_bet = user_bets[user_id][bet_index]
-        start_time = datetime.fromisoformat(cancelled_bet['game_data']['eventTime'].replace('Z', '+00:00'))
+           score_changed=False
 
-        if datetime.now(timezone.utc) >= start_time:
-            await interaction_cancel.response.send_message("You cannot cancel your bet as the game has already started.", ephemeral=False)
-            return
+           for team_name,current_score in current_scores.items():
+               previous_score=previous_scores[team_name]
 
-        user_cash[user_id] += cancelled_bet['amount']
-        user_bets[user_id].pop(bet_index)
-        await interaction_cancel.response.send_message(f"Bet cancelled. **${cancelled_bet['amount']}** has been refunded.", ephemeral=False)
-        if not user_bets[user_id]:
-            del user_bets[user_id]
+               if previous_score is None or current_score!=previous_score:
+                   score_changed=True
 
-    cancel_select.callback = cancel_callback
+           previous_scores=current_scores.copy()
 
-    await interaction.response.send_message(embed=embed, view=view, ephemeral=False)
+           if score_changed:
+               away_score=current_scores[self.game_data['lowerTeam']['name']] or 'N/A'
+               home_score=current_scores[self.game_data['upperTeam']['name']] or 'N/A'
+               message=f"Current score update: {away_score} - {home_score}"
+               user=await interaction.client.fetch_user(self.user_id)
+               await user.send(message)
 
-@app_commands.command(name="sportbet", description="Bet on sports games")
-async def sportbet(interaction: discord.Interaction):
-    view = SportBetView()
-    await interaction.response.send_message("Select a sport to bet on:", view=view, ephemeral=False)
+           event_status=current_game.get('eventStatus')
+
+           if event_status==3: 
+               break
+
+           await asyncio.sleep(60)
+
+class SportBetView(discord.ui.View):
+    def __init__(self):
+         super().__init__()
+         self.add_item(SportSelect())
+
+    @discord.ui.button(label="View Bets", style=discord.ButtonStyle.secondary)
+    async def view_bets(self ,interaction:discord.Interaction ,button :discord.ui.Button ):
+         await show_current_bets(interaction)
+
+async def show_current_bets(interaction:discord.Interaction ):
+     user_id=interaction.user.id
+
+     if user_id not in user_bets or not user_bets[user_id]:
+         await interaction.response.send_message("You have no active bets." ,ephemeral=False )
+         return
+
+     embed=discord.Embed(title ="Your Current Bets" ,color=0x787878 )
+
+     for i ,bet in enumerate(user_bets[user_id] ,1 ):
+         league=bet ['league']
+         team=bet ['team']
+         amount=bet ['amount']
+         game=bet ['game_data']
+         away_score='N/A' if 'score' not in game ['lowerTeam'] else str(game ['lowerTeam']['score'])
+         home_score='N/A' if 'score' not in game ['upperTeam'] else str(game ['upperTeam']['score'])
+         status='Final' if 'score' in game ['upperTeam'] else f"Starts <t:{int(datetime.fromisoformat(game ['eventTime'].replace('Z','+00:00')).timestamp())}:R>"
+         
+         embed.add_field(
+             name=f"Bet {i}: {league}" ,
+             value=(f"**Team:** {team}\n"
+                    f"**Amount:** ${amount}\n"
+                    f"**Game:** {game ['lowerTeam']['longName']} vs {game ['upperTeam']['longName']}\n"
+                    f"**Status:** {status}\n"
+                    f"**Current Score:** {away_score} - {home_score}\n"
+                    f"**Start Time:** <t:{int(datetime.fromisoformat(game ['eventTime'].replace('Z','+00:00')).timestamp())}:F>"),
+             inline=False )
+
+     view=discord.ui.View()
+     cancel_select=discord.ui.Select(
+         placeholder ="Select a bet to cancel",
+         min_values=1 ,
+         max_values=1 ,
+         options=[
+             discord.SelectOption(label=f"Bet {i}" ,value=str(i-1)) for i in range(1 ,len(user_bets[user_id])+1 )
+             ]
+     )
+     view.add_item(cancel_select)
+
+     async def cancel_callback(interaction_cancel :discord.Interaction ):
+          if interaction_cancel.user.id !=user_id :
+              await interaction_cancel.response.send_message("You cannot cancel other users' bets." ,ephemeral=False )
+              return
+
+          bet_index=int(cancel_select.values[0])
+          cancelled_bet=user_bets[user_id][bet_index]
+          start_time=datetime.fromisoformat(cancelled_bet ['game_data']['eventTime'].replace('Z','+00:00'))
+
+          if datetime.now(timezone.utc)>=start_time :
+              await interaction_cancel.response.send_message("You cannot cancel your bet as the game has already started." ,ephemeral=False )
+              return
+
+          user_cash[user_id]+=cancelled_bet ['amount']
+          user_bets[user_id].pop(bet_index)
+          await interaction_cancel.response.send_message(f"Bet cancelled. **${cancelled_bet ['amount']}** has been refunded." ,ephemeral=False )
+
+          if not user_bets[user_id]:
+              del user_bets[user_id]
+
+     cancel_select.callback=cancel_callback
+
+     await interaction.response.send_message(embed=embed ,view=view ,ephemeral=False )
+
+@app_commands.command(name ="sportbet" ,description ="Bet on sports games")
+async def sportbet(interaction :discord.Interaction ):
+     view=SportBetView()
+     await interaction.response.send_message("Select a sport to bet on:" ,view=view ,ephemeral=False )