Update sportbet.py

sportbet.py

@@ -16,7 +16,7 @@ def get_current_nfl_week():
     """
     # Example start date for NFL Week 1
     start_date = datetime(2024, 9, 6)  # Adjust this date to the actual start of the NFL season
-    today = datetime.now()
+    today = datetime.now(timezone.utc)
     delta_days = (today.date() - start_date.date()).days
     week_number = (delta_days // 7) + 1
     if week_number < 1:
@@ -30,9 +30,8 @@ async def fetch_nhl_scores():
         async with session.get(url) as response:
             return await response.json()
 
-async def fetch_nfl_scores():
-    current_week = get_current_nfl_week()
-    url = f"https://api.foxsports.com/bifrost/v1/nfl/scoreboard/segment/2024-{current_week}-1?apikey={API_KEY}"
+async def fetch_nfl_scores(week_number):
+    url = f"https://api.foxsports.com/bifrost/v1/nfl/scoreboard/segment/2024-{week_number}-1?apikey={API_KEY}"
     async with aiohttp.ClientSession() as session:
         async with session.get(url) as response:
             return await response.json()
@@ -45,58 +44,101 @@ class SportSelect(discord.ui.Select):
         ]
         super().__init__(placeholder="Select a sport to bet on", min_values=1, max_values=1, options=options)
 
-class GameSelect(discord.ui.Select):
+    async def callback(self, interaction: discord.Interaction):
+        selected_sport = self.values[0]
+        await interaction.response.edit_message(content=f"Selected Sport: {selected_sport}. Fetching games...", view=None)
+        await asyncio.sleep(1)  # Brief pause for better UX
+
+        if selected_sport == "NHL":
+            scores = await fetch_nhl_scores()
+            events = scores.get('sectionList', [])[0].get('events', [])
+            upcoming_games = [game for game in events if game.get('eventStatus') == 2]
+            if not upcoming_games:
+                await interaction.followup.send("No NHL games available for betting today.", ephemeral=True)
+                return
+            view = GameSelect(upcoming_games, "NHL")
+            await interaction.followup.send("Select a game to bet on:", view=view, ephemeral=True)
+        elif selected_sport == "NFL":
+            current_week = get_current_nfl_week()
+            scores = await fetch_nfl_scores(current_week)
+            events = scores.get('sectionList', [])[0].get('events', [])
+            upcoming_games = [game for game in events if game.get('eventStatus') == 2]
+            if not upcoming_games:
+                await interaction.followup.send("No NFL games available for betting this week.", ephemeral=True)
+                return
+            view = GameSelect(upcoming_games, "NFL")
+            await interaction.followup.send(f"Select a game to bet on for Week {current_week}:", view=view, ephemeral=True)
+
+class GameSelect(discord.ui.View):
     def __init__(self, games, league):
-        options = [
-            discord.SelectOption(
-                label=f"{game['lowerTeam']['longName']} vs {game['upperTeam']['longName']}" if league == "NHL" else f"{game['teams']['away']['teamName']} vs {game['teams']['home']['teamName']}",
-                value=f"{game['lowerTeam']['name']}_{game['upperTeam']['name']}" if league == "NHL" else f"{game['teams']['away']['abbreviation']}_{game['teams']['home']['abbreviation']}",
-                description=f"Start time: <t:{int(datetime.fromisoformat(game['eventTime'].replace('Z', '+00:00')).timestamp())}:R>"
-            ) for game in games
-        ]
+        super().__init__()
+        self.league = league
+        if self.league == "NHL":
+            options = [
+                discord.SelectOption(
+                    label=f"{game['lowerTeam']['longName']} vs {game['upperTeam']['longName']}",
+                    value=game['id'],
+                    description=f"Start time: <t:{int(datetime.fromisoformat(game['eventTime'].replace('Z', '+00:00')).timestamp())}:F>"
+                ) for game in games
+            ]
+        elif self.league == "NFL":
+            options = [
+                discord.SelectOption(
+                    label=f"{game['lowerTeam']['longName']} vs {game['upperTeam']['longName']}",
+                    value=game['id'],
+                    description=f"Start time: <t:{int(datetime.fromisoformat(game['eventTime'].replace('Z', '+00:00')).timestamp())}:F>"
+                ) for game in games
+            ]
+        self.games = {game['id']: game for game in games}
+        self.add_item(GameOptionSelect(options, self.league, self.games))
+
+class GameOptionSelect(discord.ui.Select):
+    def __init__(self, options, league, games):
         super().__init__(placeholder="Select a game", min_values=1, max_values=1, options=options)
         self.league = league
         self.games = games
 
     async def callback(self, interaction: discord.Interaction):
-        selected_value = self.values[0]
-        if self.league == "NHL":
-            selected_game = next(game for game in self.games if f"{game['lowerTeam']['name']}_{game['upperTeam']['name']}" == selected_value)
-            await interaction.response.edit_message(content="Select a team to bet on:", view=TeamSelect(selected_game, self.league))
-        elif self.league == "NFL":
-            selected_game = next(game for game in self.games if f"{game['teams']['away']['abbreviation']}_{game['teams']['home']['abbreviation']}" == selected_value)
-            await interaction.response.edit_message(content="Select a team to bet on:", view=TeamSelect(selected_game, self.league))
+        selected_game_id = self.values[0]
+        game_data = self.games.get(selected_game_id)
+        if not game_data:
+            await interaction.response.send_message("Selected game data not found.", ephemeral=True)
+            return
+        await interaction.response.edit_message(content="Select a team to bet on:", view=None)
+        await asyncio.sleep(1)  # Brief pause for better UX
+        view = TeamSelect(game_data, self.league)
+        await interaction.followup.send("Select a team to bet on:", view=view, ephemeral=True)
 
 class TeamSelect(discord.ui.View):
     def __init__(self, game, league):
         super().__init__()
         self.league = league
-        if league == "NHL":
+        if self.league == "NHL":
             away_team = game['lowerTeam']
             home_team = game['upperTeam']
-        elif league == "NFL":
-            away_team = game['teams']['away']
-            home_team = game['teams']['home']
-        self.add_item(TeamOptionSelect(away_team, home_team, league))
+            options = [
+                discord.SelectOption(label=away_team['longName'], value=away_team['name']),
+                discord.SelectOption(label=home_team['longName'], value=home_team['name'])
+            ]
+        elif self.league == "NFL":
+            away_team = game['lowerTeam']
+            home_team = game['upperTeam']
+            options = [
+                discord.SelectOption(label=away_team['longName'], value=away_team['name']),
+                discord.SelectOption(label=home_team['longName'], value=home_team['name'])
+            ]
+        self.game = game
+        self.add_item(TeamOptionSelect(options, league, game))
 
 class TeamOptionSelect(discord.ui.Select):
-    def __init__(self, away_team, home_team, league):
-        options = [
-            discord.SelectOption(label=away_team['longName'] if league == "NHL" else away_team['teamName'], value=away_team['name'] if league == "NHL" else away_team['abbreviation']),
-            discord.SelectOption(label=home_team['longName'] if league == "NHL" else home_team['teamName'], value=home_team['name'] if league == "NHL" else home_team['abbreviation'])
-        ]
+    def __init__(self, options, league, game):
         super().__init__(placeholder="Select a team to bet on", min_values=1, max_values=1, options=options)
         self.league = league
-        self.game = None
+        self.game = game
 
     async def callback(self, interaction: discord.Interaction):
         selected_team = self.values[0]
-        view = self.view  # Access the parent view
-        if self.league == "NHL":
-            selected_game = next(game for game in view.games if f"{game['lowerTeam']['name']}_{game['upperTeam']['name']}" == view.children[0].values[0])
-        elif self.league == "NFL":
-            selected_game = next(game for game in view.games if f"{game['teams']['away']['abbreviation']}_{game['teams']['home']['abbreviation']}" == view.children[0].values[0])
-        await interaction.response.send_modal(BetModal(selected_team, interaction.user.id, selected_game, self.league))
+        await interaction.response.send_modal(BetModal(selected_team, interaction.user.id, self.game, self.league))
 
 class BetModal(discord.ui.Modal, title="Place Your Bet"):
     bet_amount = discord.ui.TextInput(label="Bet Amount", placeholder="Enter bet amount", required=True)
@@ -117,7 +159,7 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
                 raise ValueError("Insufficient balance. Please check your balance and try again.")
 
             user_cash[self.user_id] -= bet_amount
-            await interaction.response.send_message(f"Bet placed on {self.team} for ${bet_amount}.", ephemeral=True)
+            await interaction.response.send_message(f"Bet placed on **{self.team}** for **${bet_amount}**.", ephemeral=True)
 
             user = await interaction.client.fetch_user(self.user_id)
             embed = discord.Embed(title="Bet Placed", color=0x00ff00)
@@ -128,8 +170,8 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
                 game_description = f"{self.game_data['lowerTeam']['longName']} vs {self.game_data['upperTeam']['longName']}"
                 start_time = self.game_data['eventTime']
             elif self.league == "NFL":
-                game_description = f"{self.game_data['teams']['away']['teamName']} vs {self.game_data['teams']['home']['teamName']}"
-                start_time = self.game_data['startTime']
+                game_description = f"{self.game_data['lowerTeam']['longName']} vs {self.game_data['upperTeam']['longName']}"
+                start_time = self.game_data['eventTime']
             embed.add_field(name="Game", value=game_description, inline=False)
             embed.add_field(name="Start Time", value=f"<t:{int(datetime.fromisoformat(start_time.replace('Z', '+00:00')).timestamp())}:F>", inline=False)
             await user.send(embed=embed)
@@ -150,58 +192,83 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
     async def monitor_game(self, interaction, bet_amount):
         if self.league == "NHL":
             game_start = datetime.fromisoformat(self.game_data['eventTime'].replace('Z', '+00:00'))
+            event_id = self.game_data['id']
+            fetch_scores = fetch_nhl_scores
         elif self.league == "NFL":
-            game_start = datetime.fromisoformat(self.game_data['startTime'].replace('Z', '+00:00'))
+            game_start = datetime.fromisoformat(self.game_data['eventTime'].replace('Z', '+00:00'))
+            event_id = self.game_data['id']
+            fetch_scores = lambda: fetch_nfl_scores(get_current_nfl_week())
+
         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!")
+        await user.send(f"Your team **{self.team}** has started playing!")
 
         previous_scores = {}
         if self.league == "NHL":
-            previous_scores = {self.game_data['lowerTeam']['name']: 0, self.game_data['upperTeam']['name']: 0}
+            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)
+            }
         elif self.league == "NFL":
-            previous_scores = {self.game_data['teams']['away']['abbreviation']: 0, self.game_data['teams']['home']['abbreviation']: 0}
+            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()
             if self.league == "NHL":
-                scores = await fetch_nhl_scores()
-                events = scores.get('sectionList', [])[0].get('events', [])
-                game = next((g for g in events if g['lowerTeam']['name'] == self.game_data['lowerTeam']['name'] and 
-                             g['upperTeam']['name'] == self.game_data['upperTeam']['name']), None)
-            elif self.league == "NFL":
-                scores = await fetch_nfl_scores()
-                events = scores.get('sectionList', [])[0].get('events', [])
-                game = next((g for g in events if g['teams']['away']['abbreviation'] == self.game_data['teams']['away']['abbreviation'] and 
-                             g['teams']['home']['abbreviation'] == self.game_data['teams']['home']['abbreviation']), None)
-
-            if game is None:
-                await asyncio.sleep(60)
-                continue
-
-            if self.league == "NHL":
-                event_status = game.get('eventStatus', 2)  # Default to 2 if not present
+                sections = scores.get('sectionList', [])
+                game = None
+                for section in sections:
+                    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.get('score', 0),
-                    game['upperTeam']['name']: game.get('score', 0)
+                    game['lowerTeam']['name']: game.get('lowerTeam', {}).get('score', 0),
+                    game['upperTeam']['name']: game.get('upperTeam', {}).get('score', 0)
                 }
                 is_final = event_status == 3
             elif self.league == "NFL":
-                event_status = game.get('status', {}).get('state', 'PREVIEW')
-                current_scores = game.get('scores', {})
-                is_final = event_status == 'FINAL'
+                sections = scores.get('sectionList', [])
+                game = None
+                for section in sections:
+                    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.team
                     if self.league == "NHL":
                         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']]}"
+                        message = f"**{team_name}** SCORED! Current score: {current_scores[self.game_data['lowerTeam']['name']]} - {current_scores[self.game_data['upperTeam']['name']]}"
                     elif self.league == "NFL":
-                        team_name = self.game_data['teams']['away']['teamName'] if team == self.game_data['teams']['away']['abbreviation'] else self.game_data['teams']['home']['teamName']
-                        opponent = self.game_data['teams']['home']['teamName'] if team == self.game_data['teams']['away']['abbreviation'] else self.game_data['teams']['away']['teamName']
-                        message = f"{team_name} scored! Current score: {current_scores.get(self.game_data['teams']['away']['abbreviation'],0)} - {current_scores.get(self.game_data['teams']['home']['abbreviation'],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()
@@ -210,18 +277,19 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
                 if self.league == "NHL":
                     winner = self.game_data['lowerTeam']['name'] if current_scores[self.game_data['lowerTeam']['name']] > current_scores[self.game_data['upperTeam']['name']] else self.game_data['upperTeam']['name']
                 elif self.league == "NFL":
-                    away_score = current_scores.get(self.game_data['teams']['away']['abbreviation'], 0)
-                    home_score = current_scores.get(self.game_data['teams']['home']['abbreviation'], 0)
-                    winner = self.game_data['teams']['away']['abbreviation'] if away_score > home_score else self.game_data['teams']['home']['abbreviation']
+                    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 won. You won ${winnings}!")
+                    await user.send(f"🎉 **Congratulations!** Your team **{self.team}** won! You won **${winnings}**!")
                 else:
-                    await user.send(f"Sorry, your team lost. Better luck next time!")
+                    await user.send(f"😞 **Sorry!** Your team **{self.team}** lost. Better luck next time!")
 
-                user_bets[self.user_id] = [bet for bet in user_bets[self.user_id] if bet['game_data'] != self.game_data]
+                # 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
@@ -235,43 +303,6 @@ class SportBetView(discord.ui.View):
     async def view_bets(self, interaction: discord.Interaction, button: discord.ui.Button):
         await show_current_bets(interaction)
 
-async def show_game_selection(interaction: discord.Interaction):
-    view = SportBetView()
-    await interaction.response.send_message("Select a sport to bet on:", view=view, ephemeral=True)
-
-class SportSelectView(discord.ui.View):
-    def __init__(self):
-        super().__init__()
-        self.add_item(SportSelect())
-
-class SportSelect(discord.ui.Select):
-    def __init__(self):
-        options = [
-            discord.SelectOption(label="NHL", description="Bet on NHL games"),
-            discord.SelectOption(label="NFL", description="Bet on NFL games")
-        ]
-        super().__init__(placeholder="Select a sport to bet on", min_values=1, max_values=1, options=options)
-
-    async def callback(self, interaction: discord.Interaction):
-        selected_sport = self.values[0]
-        if selected_sport == "NHL":
-            scores = await fetch_nhl_scores()
-            events = scores.get('sectionList', [])[0].get('events', [])
-            upcoming_games = [game for game in events if game['eventStatus'] == 2]
-        elif selected_sport == "NFL":
-            scores = await fetch_nfl_scores()
-            events = scores.get('sectionList', [])[0].get('events', [])
-            upcoming_games = [game for game in events if game['status']['state'] == 'PREVIEW']
-
-        if not upcoming_games:
-            await interaction.response.edit_message(content="No games available for betting.", view=None)
-            return
-
-        view = discord.ui.View()
-        game_select = GameSelect(upcoming_games, selected_sport)
-        view.add_item(game_select)
-        await interaction.response.edit_message(content="Select a game to bet on:", view=view)
-
 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]:
@@ -283,18 +314,17 @@ async def show_current_bets(interaction: discord.Interaction):
         league = bet['league']
         team = bet['team']
         amount = bet['amount']
+        game = bet['game_data']
         if league == "NHL":
-            game = bet['game_data']
             game_description = f"{game['lowerTeam']['longName']} vs {game['upperTeam']['longName']}"
             start_time = game['eventTime']
-            score = f"{game.get('lowerTeam', {}).get('score', 'N/A')} - {game.get('upperTeam', {}).get('score', 'N/A')}" if game.get('score') else "N/A"
-            status = "Final" if game.get('score') else f"Starts <t:{int(datetime.fromisoformat(start_time.replace('Z', '+00:00')).timestamp())}:R>"
+            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>"
         elif league == "NFL":
-            game = bet['game_data']
-            game_description = f"{game['teams']['away']['teamName']} vs {game['teams']['home']['teamName']}"
-            start_time = game['startTime']
-            score = f"{game['scores'].get(game['teams']['away']['abbreviation'], 'N/A')} - {game['scores'].get(game['teams']['home']['abbreviation'], 'N/A')}" if 'scores' in game else "N/A"
-            status = "Final" if game['status']['state'] == 'FINAL' else f"Starts <t:{int(datetime.fromisoformat(start_time.replace('Z', '+00:00')).timestamp())}:R>"
+            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}",
@@ -320,9 +350,9 @@ async def show_current_bets(interaction: discord.Interaction):
     )
     view.add_item(cancel_select)
 
-    async def cancel_callback(interaction: discord.Interaction):
-        if interaction.user.id != user_id:
-            await interaction.response.send_message("You cannot cancel other users' bets.", ephemeral=True)
+    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=True)
             return
 
         bet_index = int(cancel_select.values[0])
@@ -332,21 +362,23 @@ async def show_current_bets(interaction: discord.Interaction):
         if league == "NHL":
             start_time = datetime.fromisoformat(game['eventTime'].replace('Z', '+00:00'))
         elif league == "NFL":
-            start_time = datetime.fromisoformat(game['startTime'].replace('Z', '+00:00'))
+            start_time = datetime.fromisoformat(game['eventTime'].replace('Z', '+00:00'))
 
         if datetime.now(timezone.utc) >= start_time:
-            await interaction.response.send_message("You cannot cancel your bet as the game has already started.", ephemeral=True)
+            await interaction_cancel.response.send_message("You cannot cancel your bet as the game has already started.", ephemeral=True)
             return
 
-        user_cash[interaction.user.id] += cancelled_bet['amount']
+        user_cash[user_id] += cancelled_bet['amount']
         user_bets[user_id].pop(bet_index)
-        await interaction.response.send_message(f"Bet cancelled. ${cancelled_bet['amount']} has been refunded.", ephemeral=True)
+        await interaction_cancel.response.send_message(f"Bet cancelled. **${cancelled_bet['amount']}** has been refunded.", ephemeral=True)
         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=True)
 
 @app_commands.command(name="sportbet", description="Bet on sports games")
 async def sportbet(interaction: discord.Interaction):
-    await show_game_selection(interaction)
+    view = SportBetView()
+    await interaction.response.send_message("?", view=view, ephemeral=True)