Update sportbet.py

sportbet.py

@@ -9,20 +9,6 @@ user_bets = {}
 
 API_KEY = "jE7yBJVRNAwdDesMgTzTXUUSx1It41Fq"
 
-def get_current_nfl_week():
-    """
-    Calculate the current NFL week based on the start date.
-    Adjust the start_date as per the actual NFL season start.
-    """
-    # 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(timezone.utc)
-    delta_days = (today.date() - start_date.date()).days
-    week_number = (delta_days // 7) + 1
-    if week_number < 1:
-        week_number = 1
-    return week_number
-
 async def fetch_nhl_scores():
     today = datetime.now().strftime('%Y%m%d')
     url = f"https://api.foxsports.com/bifrost/v1/nhl/scoreboard/segment/{today}?apikey={API_KEY}"
@@ -30,11 +16,16 @@ async def fetch_nhl_scores():
         async with session.get(url) as response:
             return await response.json()
 
-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()
+async def fetch_nfl_scores():
+    current_year = datetime.now().year
+    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
 
 class SportSelect(discord.ui.Select):
     def __init__(self):
@@ -54,41 +45,34 @@ class SportSelect(discord.ui.Select):
             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.")
+                await interaction.followup.send("No NHL games available for betting today.", ephemeral=False)
                 return
             view = GameSelect(upcoming_games, "NHL")
-            await interaction.followup.send("Select a game to bet on:", view=view)
+            await interaction.followup.send("Select a game to bet on:", view=view, ephemeral=False)
         elif selected_sport == "NFL":
-            current_week = get_current_nfl_week()
-            scores = await fetch_nfl_scores(current_week)
+            scores = await fetch_nfl_scores()
+            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]
             if not upcoming_games:
-                await interaction.followup.send("No NFL games available for betting this week.")
+                await interaction.followup.send("No NFL games available for betting this week.", ephemeral=False)
                 return
             view = GameSelect(upcoming_games, "NFL")
-            await interaction.followup.send(f"Select a game to bet on for Week {current_week}:", view=view)
+            await interaction.followup.send("Select a game to bet on:", view=view, ephemeral=False)
 
 class GameSelect(discord.ui.View):
     def __init__(self, games, league):
         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
-            ]
+        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))
 
@@ -102,31 +86,23 @@ class GameOptionSelect(discord.ui.Select):
         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.")
+            await interaction.response.send_message("Selected game data not found.", ephemeral=False)
             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)
+        await interaction.followup.send("Select a team to bet on:", view=view, ephemeral=False)
 
 class TeamSelect(discord.ui.View):
     def __init__(self, game, league):
         super().__init__()
         self.league = league
-        if self.league == "NHL":
-            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'])
-            ]
-        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'])
-            ]
+        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))
 
@@ -159,7 +135,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}**.")
+            await interaction.response.send_message(f"Bet placed on **{self.team}** for **${bet_amount}**.", ephemeral=False)
 
             user = await interaction.client.fetch_user(self.user_id)
             embed = discord.Embed(title="Bet Placed", color=0x787878)
@@ -183,17 +159,12 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
 
             asyncio.create_task(self.monitor_game(interaction, bet_amount))
         except ValueError as e:
-            await interaction.response.send_message(str(e))
+            await interaction.response.send_message(str(e), ephemeral=False)
 
     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['eventTime'].replace('Z', '+00:00'))
-            event_id = self.game_data['id']
-            fetch_scores = lambda: fetch_nfl_scores(get_current_nfl_week())
+        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:
@@ -202,80 +173,45 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
         user = await interaction.client.fetch_user(self.user_id)
         await user.send(f"Your team **{self.team}** has started playing!")
 
-        previous_scores = {}
-        if self.league == "NHL":
-            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['lowerTeam']['name']: self.game_data.get('lowerTeam', {}).get('score', 0),
-                self.game_data['upperTeam']['name']: self.game_data.get('upperTeam', {}).get('score', 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":
-                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('lowerTeam', {}).get('score', 0),
-                    game['upperTeam']['name']: game.get('upperTeam', {}).get('score', 0)
-                }
-                is_final = event_status == 3
-            elif self.league == "NFL":
-                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:
+            game = None
+            for section in scores.get('sectionList', []):
+                for evt in section.get('events', []):
+                    if evt['id'] == event_id:
+                        game = evt
                         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
+                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']]}"
-                    elif self.league == "NFL":
-                        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']]}"
+                    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:
-                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['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']
+                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
@@ -302,7 +238,7 @@ class SportBetView(discord.ui.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]:
-        await interaction.response.send_message("You have no active bets.")
+        await interaction.response.send_message("You have no active bets.", ephemeral=False)
         return
 
     embed = discord.Embed(title="Your Current Bets", color=0x787878)
@@ -311,16 +247,10 @@ async def show_current_bets(interaction: discord.Interaction):
         team = bet['team']
         amount = bet['amount']
         game = bet['game_data']
-        if league == "NHL":
-            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>"
-        elif league == "NFL":
-            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>"
+        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}",
@@ -348,33 +278,28 @@ async def show_current_bets(interaction: discord.Interaction):
 
     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.")
+            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]
-        league = cancelled_bet['league']
-        game = cancelled_bet['game_data']
-        if league == "NHL":
-            start_time = datetime.fromisoformat(game['eventTime'].replace('Z', '+00:00'))
-        elif league == "NFL":
-            start_time = datetime.fromisoformat(game['eventTime'].replace('Z', '+00:00'))
+        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.")
+            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.")
+        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)
+    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)
+    await interaction.response.send_message("Select a sport to bet on:", view=view, ephemeral=False)