Update sportbet.py

sportbet.py

@@ -18,14 +18,10 @@ async def fetch_nhl_scores():
 
 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
+    url = f"https://api.foxsports.com/bifrost/v1/nfl/scoreboard/segment/{current_year}?apikey={API_KEY}"
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url) as response:
+            return await response.json()
 
 class SportSelect(discord.ui.Select):
     def __init__(self):
@@ -51,9 +47,6 @@ class SportSelect(discord.ui.Select):
             await interaction.followup.send("Select a game to bet on:", view=view, ephemeral=False)
         elif selected_sport == "NFL":
             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:
@@ -85,6 +78,13 @@ class GameOptionSelect(discord.ui.Select):
     async def callback(self, interaction: discord.Interaction):
         selected_game_id = self.values[0]
         game_data = self.games.get(selected_game_id)
+        
+        # Restrict betting to one hour before the game starts
+        game_start_time = datetime.fromisoformat(game_data['eventTime'].replace('Z', '+00:00'))
+        if datetime.now(timezone.utc) > game_start_time - timedelta(hours=1):
+            await interaction.response.send_message("Betting is closed for this game as it starts within an hour.", ephemeral=False)
+            return
+        
         if not game_data:
             await interaction.response.send_message("Selected game data not found.", ephemeral=False)
             return
@@ -137,169 +137,168 @@ class BetModal(discord.ui.Modal, title="Place Your Bet"):
             user_cash[self.user_id] -= 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)
-            embed.add_field(name="League", value=self.league, inline=False)
-            embed.add_field(name="Team", value=self.team, inline=False)
-            embed.add_field(name="Amount", value=f"${bet_amount}", inline=False)
-            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)
-
-            if self.user_id not in user_bets:
-                user_bets[self.user_id] = []
-            user_bets[self.user_id].append({
+            user_bets.setdefault(self.user_id, []).append({
                 "league": self.league,
                 "team": self.team,
                 "amount": bet_amount,
                 "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):
+        
+       # Monitor the game's progress and determine the outcome.
+       event_id = self.game_data['id']
+       fetch_scores_func = fetch_nhl_scores if self.league == "NHL" else fetch_nfl_scores
 
-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)
+       # Wait until the game's start time.
+       start_time_utc = datetime.fromisoformat(self.game_data['eventTime'].replace('Z', '+00:00'))
+       sleep_duration_seconds = (start_time_utc - datetime.now(timezone.utc)).total_seconds()
+       if sleep_duration_seconds > 0:
+           await asyncio.sleep(sleep_duration_seconds)
 
-    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
+       user_obj = await interaction.client.fetch_user(self.user_id)
+       await user_obj.send(f"Your team **{self.team}** has started playing!")
 
-        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'))
+       previous_scores_dicts_map={
+           'lowerTeam':self.game_data.get('lowerTeam', {}).get('score', 0),
+           'upperTeam':self.game_data.get('upperTeam', {}).get('score', 0)
+       }
 
-        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
+       while True:
+           scores_dicts_map=await fetch_scores_func()
+           current_game=None
 
-        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]
+           for section_dict in scores_dicts_map.get('sectionList', []):
+               for event_dict in section_dict.get('events', []):
+                   if event_dict['id']==event_id:
+                       current_game=event_dict
+                       break
 
-    cancel_select.callback = cancel_callback
+               if current_game:
+                   break
 
-    await interaction.response.send_message(embed=embed, view=view, ephemeral=False)
+           if not current_game:
+               await asyncio.sleep(60)
+               continue
 
-@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', 2)
+           current_scores_dicts_map={
+               'lowerTeam':current_game['lowerTeam'].get('score', 0),
+               'upperTeam':current_game['upperTeam'].get('score', 0)
+           }
+
+           is_final_event_status_bool=(event_status==3)
+
+           # Check and notify score updates.
+           for team_key_str,current_score_int in current_scores_dicts_map.items():
+               previous_score_int=previous_scores_dicts_map.get(team_key_str)
+
+               if current_score_int>previous_score_int:
+                   team_name_str=self.game_data[team_key_str]['longName']
+                   message_str=f"**{team_name_str}** SCORED! Current score: {current_scores_dicts_map['lowerTeam']} - {current_scores_dicts_map['upperTeam']}"
+                   await user_obj.send(message_str)
+
+           previous_scores_dicts_map=current_scores_dicts_map.copy()
+
+           if is_final_event_status_bool:
+               lower_score_int=current_scores_dicts_map.get('lowerTeam', 0)
+               upper_score_int=current_scores_dicts_map.get('upperTeam', 0)
+               winner_str=self.game_data['lowerTeam']['name']if lower_score_int>upper_score_int else self.game_data['upperTeam']['name']
+
+               if winner_str==self.team:
+                   winnings_int=(bet_amount*2)
+                   user_cash[self.user_id]+=winnings_int
+                   await user_obj.send(f"🎉 **Congratulations!** Your team **{self.team}** won! You won **${winnings_int}**.")
+               else:
+                   await user_obj.send(f"😞 **Sorry!** Your team **{self.team}** lost. Better luck next time!")
+
+               # Remove completed bets.
+               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=int eraction.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,b et in enumerate(user_bets[user_id],1 ):
+         league,b et["league"]
+         team,b et["team"]
+         amount,b et["amount"]
+         g ame,b et["game_data"]
+         g ame_description,f "{game['lowerTeam']['longName']} vs {game['upperTeam']['longName']}"
+         s tart_time,g ame["eventTime"]
+         score,f "{game['lowerTeam'].get('score','N/A')} - {game['upperTeam'].get('score','N/A')}"
+         status,"Final"if g ame.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 
+
+         b et_index=int(cancel_select.values[0])
+         c ancelled_bet=user_bets[user_id][bet_index]
+         s tart_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"]
+         u ser_bets[user_id].pop(bet_index )
+         await interaction_cancel.response.send_message(f"Bet cancelled. **${cancelled_bet['amount']}** has been refunded." ,ephemeral=False )
+         
+          # Remove empty bets list for the user 
+          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 )