Update sportbet.py

sportbet.py

@@ -2,326 +2,216 @@ import discord
 from discord import app_commands
 import aiohttp
 import asyncio
-from datetime import datetime, timezone, timedelta
-from cash import user_cash  # Ensure you have a 'cash.py' module managing user_cash as a dictionary
+from datetime import datetime, timezone
+from cash import user_cash
 
 user_bets = {}
 
-API_KEY = "jE7yBJVRNAwdDesMgTzTXUUSx1It41Fq"
-
 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}"
     async with aiohttp.ClientSession() as session:
-        async with session.get(url) as response:
+        async with session.get("https://nhl-score-api.herokuapp.com/api/scores/latest") as response:
             return await response.json()
 
-async def fetch_nfl_scores():
-    current_year = datetime.now().year
-    current_week = None
-    scores = None
-
-    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()
-                events = data['sectionList'][0]['events']
-                
-                # Check if any game in this week is upcoming
-                if any(game['eventStatus'] == 1 for game in events):
-                    current_week = week
-                    scores = data
-                    break
-
-    return scores
-
-async def show_nfl_games(interaction: discord.Interaction):
-    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') == 1]  # 1: Scheduled
-    
-    if not upcoming_games:
-        await interaction.followup.send("No upcoming NFL games available for betting this week.", ephemeral=False)
-        return
-
-    view = GameSelect(upcoming_games, "NFL")
-    await interaction.followup.send("Select a game to bet on:", view=view, ephemeral=False)
-
-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]
-        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') == 1]
-            if not upcoming_games:
-                await interaction.followup.send("No upcoming 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, ephemeral=False)
-        elif selected_sport == "NFL":
-            await show_nfl_games(interaction)
-
-class GameSelect(discord.ui.View):
-    def __init__(self, games, league):
-        super().__init__()
-        self.league = league
+class GameSelect(discord.ui.Select):
+    def __init__(self, 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>"
+                label=f"{game['teams']['away']['teamName']} vs {game['teams']['home']['teamName']}",
+                value=f"{game['teams']['away']['abbreviation']}_{game['teams']['home']['abbreviation']}",
+                description=f"Start time: <t:{int(datetime.fromisoformat(game['startTime'].replace('Z', '+00:00')).timestamp())}:R>"
             ) 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_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=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, ephemeral=False)
+        super().__init__(placeholder="Select a game", options=options)
 
-class TeamSelect(discord.ui.View):
-    def __init__(self, game, league):
-        super().__init__()
-        self.league = league
-        away_team = game['lowerTeam']
-        home_team = game['upperTeam']
+class TeamSelect(discord.ui.Select):
+    def __init__(self, away_team, home_team):
         options = [
-            discord.SelectOption(label=away_team['longName'], value=away_team['name']),
-            discord.SelectOption(label=home_team['longName'], value=home_team['name'])
+            discord.SelectOption(label=away_team['teamName'], value=away_team['abbreviation']),
+            discord.SelectOption(label=home_team['teamName'], value=home_team['abbreviation'])
         ]
-        self.game = game
-        self.add_item(TeamOptionSelect(options, league, game))
-
-class TeamOptionSelect(discord.ui.Select):
-    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 = game
-
-    async def callback(self, interaction: discord.Interaction):
-        selected_team = self.values[0]
-        await interaction.response.send_modal(BetModal(selected_team, interaction.user.id, self.game, self.league))
+        super().__init__(placeholder="Select a team to bet on", options=options)
 
 class BetModal(discord.ui.Modal, title="Place Your Bet"):
-    bet_amount = discord.ui.TextInput(label="Bet Amount", placeholder="Enter bet amount", required=True)
+    bet_amount = discord.ui.TextInput(label="Bet Amount", placeholder="Enter bet amount")
 
-    def __init__(self, team, user_id, game_data, league):
+    def __init__(self, team, user_id, game_data):
         super().__init__()
         self.team = team
         self.user_id = user_id
         self.game_data = game_data
-        self.league = league
 
     async def on_submit(self, interaction: discord.Interaction):
         try:
             bet_amount = int(self.bet_amount.value)
             if bet_amount <= 0:
-                raise ValueError("Bet amount must be greater than 0.")
+                raise ValueError("Bet more than 0 dollars")
             if bet_amount > user_cash.get(self.user_id, 0):
-                raise ValueError("Insufficient balance. Please check your balance and try again.")
+                raise ValueError("You are too poor. 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=False)
-
+            await interaction.response.send_message(f"Bet placed on {self.team} for ${bet_amount}")
+            
             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)
+            embed.add_field(name="Game", value=f"{self.game_data['teams']['away']['teamName']} vs {self.game_data['teams']['home']['teamName']}", inline=False)
+            embed.add_field(name="Start Time", value=f"<t:{int(datetime.fromisoformat(self.game_data['startTime'].replace('Z', '+00:00')).timestamp())}:R>", 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({
-                "league": self.league,
                 "team": self.team,
                 "amount": bet_amount,
                 "game_data": self.game_data
             })
-
+            
             asyncio.create_task(self.monitor_game(interaction, bet_amount))
         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:
+            await interaction.response.send_message(str(e), ephemeral=True)
+
+    async def monitor_game(self, interaction, bet_amount):
+        game_start = datetime.fromisoformat(self.game_data['startTime'].replace('Z', '+00:00'))
+        await asyncio.sleep((game_start - datetime.now(timezone.utc)).total_seconds())
+
+        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['teams']['away']['abbreviation']: 0, self.game_data['teams']['home']['abbreviation']: 0}
+
+        while True:
+            scores = await fetch_nhl_scores()
+            game = next((g for g in scores['games'] 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 or game['status']['state'] == 'PREVIEW':
+                await asyncio.sleep(60)
+                continue
+
+            current_scores = game['scores']
+            
+            for team in [self.game_data['teams']['away']['abbreviation'], self.game_data['teams']['home']['abbreviation']]:
+                if current_scores[team] > previous_scores[team]:
+                    team_name = game['teams']['away']['teamName'] if team == game['teams']['away']['abbreviation'] else game['teams']['home']['teamName']
+                    await user.send(f"{team_name} SCORED! Current score: {current_scores[self.game_data['teams']['away']['abbreviation']]} - {current_scores[self.game_data['teams']['home']['abbreviation']]}")
+            
+            previous_scores = current_scores.copy()
+            
+            if game['status']['state'] == 'FINAL':
+                winner = self.game_data['teams']['away']['abbreviation'] if current_scores[self.game_data['teams']['away']['abbreviation']] > current_scores[self.game_data['teams']['home']['abbreviation']] else self.game_data['teams']['home']['abbreviation']
+                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}!")
+                else:
+                    await user.send(f"Sorry, your 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]
                 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 or game['lowerTeam'].get('isLoser') is not None or game['upperTeam'].get('isLoser') is not None
-
-        # 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:
-            winner = None
-            if game['lowerTeam'].get('isLoser') == True:
-                winner = game['upperTeam']['name']
-            elif game['upperTeam'].get('isLoser') == True:
-                winner = game['lowerTeam']['name']
-            else:
-                # Fallback to score comparison if isLoser is not set
-                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
+            
+            await asyncio.sleep(60)  # Check for updates every minute
 
 class SportBetView(discord.ui.View):
     def __init__(self):
         super().__init__()
-        self.add_item(SportSelect())
+
+    @discord.ui.button(label="Bet Again", style=discord.ButtonStyle.primary)
+    async def bet_again(self, interaction: discord.Interaction, button: discord.ui.Button):
+        await show_game_selection(interaction)
 
     @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_game_selection(interaction: discord.Interaction):
+    scores = await fetch_nhl_scores()
+    upcoming_games = [game for game in scores['games'] if game['status']['state'] == 'PREVIEW']
+
+    if not upcoming_games:
+        await interaction.response.send_message("No games available for betting.")
+        return
+
+    view = discord.ui.View()
+    game_select = GameSelect(upcoming_games)
+    view.add_item(game_select)
+
+    await interaction.response.send_message("Select a game to bet on:", view=view)
+
+    async def game_callback(interaction: discord.Interaction):
+        selected_game = next(game for game in upcoming_games if f"{game['teams']['away']['abbreviation']}_{game['teams']['home']['abbreviation']}" == game_select.values[0])
+        
+        team_view = discord.ui.View()
+        team_select = TeamSelect(selected_game['teams']['away'], selected_game['teams']['home'])
+        team_view.add_item(team_select)
+
+        await interaction.response.edit_message(content="Select a team to bet on:", view=team_view)
+
+        async def team_callback(interaction: discord.Interaction):
+            selected_team = team_select.values[0]
+            await interaction.response.send_modal(BetModal(selected_team, interaction.user.id, selected_game))
+
+        team_select.callback = team_callback
+
+    game_select.callback = game_callback
+
 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)
+        await interaction.response.send_message("You have no active bets.")
         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
-        )
+    scores = await fetch_nhl_scores()
+    
+    for i, bet in enumerate(user_bets[user_id]):
+        game = next((g for g in scores['games'] if g['teams']['away']['abbreviation'] == bet['game_data']['teams']['away']['abbreviation'] and 
+                     g['teams']['home']['abbreviation'] == bet['game_data']['teams']['home']['abbreviation']), None)
+        
+        start_time = datetime.fromisoformat(bet['game_data']['startTime'].replace('Z', '+00:00'))
+        current_time = datetime.now(timezone.utc)
+        
+        if current_time < start_time:
+            status = f"Starts <t:{int(start_time.timestamp())}:R>"
+            score = "N/A"
+        else:
+            status = game['status']['state'] if game else "Unknown"
+            score = f"{game['scores'][bet['game_data']['teams']['away']['abbreviation']]} - {game['scores'][bet['game_data']['teams']['home']['abbreviation']]}" if game and 'scores' in game else "Unknown"
+        
+        embed.add_field(name=f"Bet {i+1}", value=(
+            f"Team: {bet['team']}\n"
+            f"Amount: ${bet['amount']}\n"
+            f"Game: {bet['game_data']['teams']['away']['teamName']} vs {bet['game_data']['teams']['home']['teamName']}\n"
+            f"Status: {status}\n"
+            f"Current Score: {score}\n"
+            f"Start Time: <t:{int(start_time.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)
-        ]
-    )
+    cancel_select = discord.ui.Select(placeholder="Select a bet to cancel", options=[
+        discord.SelectOption(label=f"Bet {i+1}", value=str(i)) for i in range(len(user_bets[user_id]))
+    ])
     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)
+    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)
             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
-
+        cancelled_bet = user_bets[user_id].pop(bet_index)
         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]
+        await interaction.response.send_message(f"Bet cancelled. ${cancelled_bet['amount']} has been refunded")
 
     cancel_select.callback = cancel_callback
 
-    await interaction.response.send_message(embed=embed, view=view, ephemeral=False)
+    await interaction.response.send_message(embed=embed, view=view)
 
 @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)
+    user_id = interaction.user.id
+    if user_id in user_bets and user_bets[user_id]:
+        view = SportBetView()
+        await interaction.response.send_message("?", view=view)
+    else:
+        await show_game_selection(interaction)