Update sportbet.py

sportbet.py

@@ -1,5 +1,4 @@
 import discord
-from discord.ext import commands
 from discord import app_commands
 import aiohttp
 import asyncio
@@ -8,7 +7,7 @@ from cash import user_cash  # Ensure you have a 'cash.py' module managing user_c
 
 user_bets = {}
 
-API_KEY = "jE7yBJVRNAwdDesMgTzTXUUSx1It41Fq"  # Replace with your actual API key
+API_KEY = "jE7yBJVRNAwdDesMgTzTXUUSx1It41Fq"
 
 async def fetch_nhl_scores():
     today = datetime.now().strftime('%Y%m%d')
@@ -19,29 +18,13 @@ async def fetch_nhl_scores():
 
 async def fetch_nfl_scores():
     current_year = datetime.now().year
-    # Start by fetching data to get quickNav
-    url = f"https://api.foxsports.com/bifrost/v1/nfl/scoreboard/segment/{current_year}-1-1?apikey={API_KEY}"
+    current_week = (datetime.now().isocalendar()[1] - 36) % 18  # Approximate NFL week
+    if current_week == 0:
+        current_week = 18
+    url = f"https://api.foxsports.com/bifrost/v1/nfl/scoreboard/segment/{current_year}-{current_week}-1?apikey={API_KEY}"
     async with aiohttp.ClientSession() as session:
         async with session.get(url) as response:
-            data = await response.json()
-            quick_nav = data.get('quickNav', [])
-            current_week_id = None
-            for week_info in quick_nav:
-                if week_info.get('selected'):
-                    current_week_id = week_info['id']  # e.g., '2024-7-1'
-                    break
-            if current_week_id:
-                # Fetch data for the current week
-                url_current_week = f"https://api.foxsports.com/bifrost/v1/nfl/scoreboard/segment/{current_week_id}?apikey={API_KEY}"
-                async with session.get(url_current_week) as response_current_week:
-                    data_current_week = await response_current_week.json()
-                    return data_current_week
-    return None  # If no current week is found
-
-intents = discord.Intents.default()
-intents.message_content = True  # Required for receiving message content
-
-bot = commands.Bot(command_prefix='!', intents=intents)
+            return await response.json()
 
 class SportSelect(discord.ui.Select):
     def __init__(self):
@@ -70,10 +53,8 @@ class SportSelect(discord.ui.Select):
             if not scores:
                 await interaction.followup.send("No NFL games available for betting this week.", ephemeral=False)
                 return
-            events = []
-            for section in scores.get('sectionList', []):
-                events.extend(section.get('events', []))
-            upcoming_games = [game for game in events if game.get('eventStatus') == 2]
+            events = scores.get('sectionList', [])[0].get('events', [])
+            upcoming_games = [game for game in events if 'score' not in game.get('upperTeam', {}) and 'score' not in game.get('lowerTeam', {})]
             if not upcoming_games:
                 await interaction.followup.send("No NFL games available for betting this week.", ephemeral=False)
                 return
@@ -220,21 +201,16 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
             # Check for score updates
             for team, score in current_scores.items():
                 if score > previous_scores.get(team, 0):
-                    team_name = game['lowerTeam']['longName'] if team == game['lowerTeam']['name'] else game['upperTeam']['longName']
-                    message = f"**{team_name}** SCORED! Current score: {current_scores[game['lowerTeam']['name']]} - {current_scores[game['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:
-                away_score = current_scores.get(game['lowerTeam']['name'], 0)
-                home_score = current_scores.get(game['upperTeam']['name'], 0)
-                if away_score > home_score:
-                    winner = game['lowerTeam']['name']
-                elif home_score > away_score:
-                    winner = game['upperTeam']['name']
-                else:
-                    winner = None  # It's a tie
+                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
@@ -273,7 +249,7 @@ async def show_current_bets(interaction: discord.Interaction):
         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('eventStatus') == 3 else f"Starts <t:{int(datetime.fromisoformat(start_time.replace('Z', '+00:00')).timestamp())}:R>"
+        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}",
@@ -289,36 +265,40 @@ async def show_current_bets(interaction: discord.Interaction):
         )
 
     view = discord.ui.View()
-
-    cancel_options = [
-        discord.SelectOption(
-            label=f"Bet {i}",
-            value=str(i-1),
-            description=f"{bet['league']} - {bet['team']} vs {bet['game_data']['lowerTeam']['longName']} vs {bet['game_data']['upperTeam']['longName']}"
-        )
-        for i, bet in enumerate(user_bets[user_id], 1)
-    ]
-
     cancel_select = discord.ui.Select(
         placeholder="Select a bet to cancel",
         min_values=1,
         max_values=1,
-        options=cancel_options
+        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
 
-    async def cancel_callback(interaction: discord.Interaction):
-        index = int(cancel_select.values[0])
-        bet = user_bets[user_id][index]
-        refund_amount = bet['amount']
-        user_cash[user_id] += refund_amount
-        del user_bets[user_id][index]
-        await interaction.response.send_message(f"Bet on **{bet['team']}** has been canceled. **${refund_amount}** has been refunded to your account.", ephemeral=False)
+        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
-    view.add_item(cancel_select)
 
     await interaction.response.send_message(embed=embed, view=view, ephemeral=False)
 
-@bot.tree.command(name="sportbet")
-async def bet(interaction: discord.Interaction):
-    await interaction.response.send_message("Choose a sport to bet on:", view=SportBetView(), 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)