Update sportbet.py

sportbet.py

@@ -18,14 +18,17 @@ async def fetch_nhl_scores():
 
 async def fetch_nfl_scores():
     current_year = datetime.now().year
+    all_games = []
     for week in range(1, 18):  # NFL regular season has 17 weeks
         url = f"https://api.foxsports.com/bifrost/v1/nfl/scoreboard/segment/{current_year}-{week}-1?apikey={API_KEY}"
         async with aiohttp.ClientSession() as session:
             async with session.get(url) as response:
                 data = await response.json()
-                if data['sectionList'][0]['events'][0]['eventStatus'] == 2:
-                    return data
-    return None  # If no current week is found
+                for section in data.get('sectionList', []):
+                    for event in section.get('events', []):
+                        if event['eventStatus'] == 2:  # Change this condition based on your needs
+                            all_games.append(event)
+    return all_games if all_games else None
 
 class SportSelect(discord.ui.Select):
     def __init__(self):
@@ -54,8 +57,7 @@ class SportSelect(discord.ui.Select):
             if not scores:
                 await interaction.followup.send("No NFL games available for betting this week.", ephemeral=False)
                 return
-            events = scores.get('sectionList', [])[0].get('events', [])
-            upcoming_games = [game for game in events if game.get('eventStatus') == 2]
+            upcoming_games = [game for game in scores if game.get('eventStatus') == 2]
             if not upcoming_games:
                 await interaction.followup.send("No NFL games available for betting this week.", ephemeral=False)
                 return
@@ -161,145 +163,150 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
         except ValueError as e:
             await interaction.response.send_message(str(e), ephemeral=False)
 
-    async def monitor_game(self, interaction, bet_amount):
+    async def monitor_game(self, interaction: discord.Interaction, bet_amount: int):
         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
+        
+        fetch_scores_func_map = {
+          "NHL": fetch_nhl_scores,
+          "NFL": fetch_nfl_scores,
+          # Add other leagues here as needed.
+      }
+        
+      fetch_scores_func_map["NFL"]()
+
+      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_func_map[self.league]()
+          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
 
 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']
-        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)
-
-    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)
+      super().__init__()
+      self.add_item(SportSelect())
+
+@discord.ui.button(label ="View Bets", style=discord.ButtonStyle.secondary )
+async def view_bets (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 )
+
+      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 )
+          
+          
+          
+          
+@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 )