From 14103e48b75a9588944ebfc7c622978a734b3f93 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Wed, 4 Mar 2026 08:13:31 -0600 Subject: [PATCH 01/12] feat: Add Scouting feature (Wonder Pick-style social pack opening) When a player opens a pack, a scout opportunity is posted to #pack-openings with face-down card buttons. Other players can blind-pick one card using daily scout tokens (2/day), receiving a copy. The opener keeps all cards. New files: - discord_ui/scout_view.py: ScoutView with dynamic buttons and claim logic - helpers/scouting.py: create_scout_opportunity() and embed builder - cogs/economy_new/scouting.py: /scout-tokens command and cleanup task Modified: - helpers/main.py: Hook into open_st_pr_packs() after display_cards() - paperdynasty.py: Register scouting cog Requires new API endpoints in paper-dynasty-database (scout_opportunities). Tracks #44. Co-Authored-By: Claude Opus 4.6 --- cogs/economy_new/scouting.py | 104 +++++++++++ discord_ui/__init__.py | 35 ++-- discord_ui/scout_view.py | 339 +++++++++++++++++++++++++++++++++++ helpers/__init__.py | 9 +- helpers/main.py | 46 +++-- helpers/scouting.py | 173 ++++++++++++++++++ paperdynasty.py | 69 +++---- 7 files changed, 716 insertions(+), 59 deletions(-) create mode 100644 cogs/economy_new/scouting.py create mode 100644 discord_ui/scout_view.py create mode 100644 helpers/scouting.py diff --git a/cogs/economy_new/scouting.py b/cogs/economy_new/scouting.py new file mode 100644 index 0000000..9e895e5 --- /dev/null +++ b/cogs/economy_new/scouting.py @@ -0,0 +1,104 @@ +""" +Scouting Cog — Scout token management and expired opportunity cleanup. +""" + +import datetime +import logging + +import discord +from discord import app_commands +from discord.ext import commands, tasks + +from api_calls import db_get +from helpers.utils import int_timestamp +from helpers.discord_utils import get_team_embed +from helpers.main import get_team_by_owner +from helpers.constants import PD_SEASON, IMAGES + +logger = logging.getLogger("discord_app") + +SCOUT_TOKENS_PER_DAY = 2 + + +class Scouting(commands.Cog): + """Scout token tracking and expired opportunity cleanup.""" + + def __init__(self, bot): + self.bot = bot + self.cleanup_expired.start() + + async def cog_unload(self): + self.cleanup_expired.cancel() + + @app_commands.command( + name="scout-tokens", + description="Check how many scout tokens you have left today", + ) + async def scout_tokens_command(self, interaction: discord.Interaction): + await interaction.response.defer(ephemeral=True) + + team = await get_team_by_owner(interaction.user.id) + if not team: + await interaction.followup.send( + "You need a Paper Dynasty team first!", + ephemeral=True, + ) + return + + now = datetime.datetime.now() + midnight = int_timestamp( + datetime.datetime(now.year, now.month, now.day, 0, 0, 0) + ) + + used_today = await db_get( + "rewards", + params=[ + ("name", "Scout Token"), + ("team_id", team["id"]), + ("created_after", midnight), + ], + ) + tokens_used = used_today["count"] if used_today else 0 + tokens_remaining = max(0, SCOUT_TOKENS_PER_DAY - tokens_used) + + embed = get_team_embed(title="Scout Tokens", team=team) + embed.description = ( + f"**{tokens_remaining}** of **{SCOUT_TOKENS_PER_DAY}** tokens remaining today.\n\n" + f"Tokens reset at midnight Central." + ) + + if tokens_remaining == 0: + embed.description += "\n\nYou've used all your tokens! Check back tomorrow." + + await interaction.followup.send(embed=embed, ephemeral=True) + + @tasks.loop(minutes=15) + async def cleanup_expired(self): + """Log expired unclaimed scout opportunities. + + This is a safety net — the ScoutView's on_timeout handles the UI side. + If the bot restarted mid-scout, those views are lost; this just logs it. + """ + try: + now = int_timestamp(datetime.datetime.now()) + expired = await db_get( + "scout_opportunities", + params=[ + ("claimed", False), + ("expired_before", now), + ], + ) + if expired and expired.get("count", 0) > 0: + logger.info( + f"Found {expired['count']} expired unclaimed scout opportunities" + ) + except Exception as e: + logger.debug(f"Scout cleanup check failed (API may not be ready): {e}") + + @cleanup_expired.before_loop + async def before_cleanup(self): + await self.bot.wait_until_ready() + + +async def setup(bot): + await bot.add_cog(Scouting(bot)) diff --git a/discord_ui/__init__.py b/discord_ui/__init__.py index 6e40231..88a3f9d 100644 --- a/discord_ui/__init__.py +++ b/discord_ui/__init__.py @@ -7,17 +7,32 @@ This package contains all Discord UI classes and components used throughout the from .confirmations import Question, Confirm, ButtonOptions from .pagination import Pagination from .selectors import ( - SelectChoicePackTeam, SelectOpenPack, SelectPaperdexCardset, - SelectPaperdexTeam, SelectBuyPacksCardset, SelectBuyPacksTeam, - SelectUpdatePlayerTeam, SelectView + SelectChoicePackTeam, + SelectOpenPack, + SelectPaperdexCardset, + SelectPaperdexTeam, + SelectBuyPacksCardset, + SelectBuyPacksTeam, + SelectUpdatePlayerTeam, + SelectView, ) from .dropdowns import Dropdown, DropdownView +from .scout_view import ScoutView __all__ = [ - 'Question', 'Confirm', 'ButtonOptions', - 'Pagination', - 'SelectChoicePackTeam', 'SelectOpenPack', 'SelectPaperdexCardset', - 'SelectPaperdexTeam', 'SelectBuyPacksCardset', 'SelectBuyPacksTeam', - 'SelectUpdatePlayerTeam', 'SelectView', - 'Dropdown', 'DropdownView' -] \ No newline at end of file + "Question", + "Confirm", + "ButtonOptions", + "Pagination", + "SelectChoicePackTeam", + "SelectOpenPack", + "SelectPaperdexCardset", + "SelectPaperdexTeam", + "SelectBuyPacksCardset", + "SelectBuyPacksTeam", + "SelectUpdatePlayerTeam", + "SelectView", + "Dropdown", + "DropdownView", + "ScoutView", +] diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py new file mode 100644 index 0000000..2e7dfb8 --- /dev/null +++ b/discord_ui/scout_view.py @@ -0,0 +1,339 @@ +""" +Scout View — Face-down card button UI for the Scouting feature. + +When a player opens a pack, a ScoutView is posted with one button per card. +Other players can click a button to "scout" (blind-pick) one card, receiving +a copy. The opener keeps all their cards. Multiple players can scout different +cards from the same pack — each costs one scout token. +""" + +import datetime +import logging + +import discord + +from api_calls import db_get, db_post, db_patch +from helpers.main import get_team_by_owner, get_card_embeds +from helpers.utils import int_timestamp +from helpers.discord_utils import get_team_embed +from helpers.constants import IMAGES, PD_SEASON + +logger = logging.getLogger("discord_app") + +SCOUT_TOKENS_PER_DAY = 2 + + +class ScoutView(discord.ui.View): + """Displays face-down card buttons for a scout opportunity. + + - One button per card, labeled "Card 1" ... "Card N" + - Any player EXCEPT the pack opener can interact + - Each card can be scouted once; multiple players can scout different cards + - One scout per player per pack + - Timeout: 30 minutes + """ + + def __init__( + self, + scout_opp_id: int, + cards: list[dict], + opener_team: dict, + opener_user_id: int, + bot, + ): + super().__init__(timeout=1800.0) + self.scout_opp_id = scout_opp_id + self.cards = cards + self.opener_team = opener_team + self.opener_user_id = opener_user_id + self.bot = bot + self.message: discord.Message | None = None + self.card_lines: list[tuple[int, str]] = [] + + # Per-card claim tracking: position -> scouter team name + self.claimed_positions: dict[int, str] = {} + # Per-user lock: user IDs who have already scouted this pack + self.scouted_users: set[int] = set() + # Positions currently being processed (prevent double-click race) + self.processing: set[int] = set() + + for i, card in enumerate(cards): + button = ScoutButton( + card=card, + position=i, + scout_view=self, + ) + self.add_item(button) + + @property + def all_claimed(self) -> bool: + return len(self.claimed_positions) >= len(self.cards) + + async def update_message(self): + """Refresh the embed with current claim state.""" + if not self.message: + return + + from helpers.scouting import build_scouted_card_list + + scouted_ids = {} + for pos, team_name in self.claimed_positions.items(): + player_id = self.cards[pos]["player"]["player_id"] + scouted_ids[player_id] = team_name + + card_list = build_scouted_card_list(self.card_lines, scouted_ids) + claim_count = len(self.claimed_positions) + + if self.all_claimed: + title = "Fully Scouted!" + footer_text = f"Paper Dynasty Season {PD_SEASON} \u2022 All cards scouted" + else: + title = f"Scout Opportunity! ({claim_count}/{len(self.cards)} scouted)" + footer_text = ( + f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player" + ) + + embed = get_team_embed(title=title, team=self.opener_team) + embed.description = ( + f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}\n\n" + ) + if not self.all_claimed: + embed.description += ( + "Pick a card — but which is which?\n" + "Costs 1 Scout Token (2 per day, resets at midnight Central)." + ) + + embed.set_footer(text=footer_text, icon_url=IMAGES["logo"]) + + try: + await self.message.edit(embed=embed, view=self) + except Exception as e: + logger.error(f"Failed to update scout message: {e}") + + async def on_timeout(self): + """Disable all buttons and update the embed when the window expires.""" + for item in self.children: + item.disabled = True + + if self.message: + try: + from helpers.scouting import build_scouted_card_list + + scouted_ids = {} + for pos, team_name in self.claimed_positions.items(): + player_id = self.cards[pos]["player"]["player_id"] + scouted_ids[player_id] = team_name + + card_list = build_scouted_card_list(self.card_lines, scouted_ids) + claim_count = len(self.claimed_positions) + + if claim_count > 0: + title = ( + f"Scout Window Closed ({claim_count}/{len(self.cards)} scouted)" + ) + else: + title = "Scout Window Closed" + + embed = get_team_embed(title=title, team=self.opener_team) + embed.description = ( + f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}" + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON}", + icon_url=IMAGES["logo"], + ) + await self.message.edit(embed=embed, view=self) + except Exception as e: + logger.error(f"Failed to edit expired scout message: {e}") + + +class ScoutButton(discord.ui.Button): + """A single face-down card button in a ScoutView.""" + + def __init__(self, card: dict, position: int, scout_view: ScoutView): + super().__init__( + label=f"Card {position + 1}", + style=discord.ButtonStyle.secondary, + row=0, + ) + self.card = card + self.position = position + self.scout_view: ScoutView = scout_view + + async def callback(self, interaction: discord.Interaction): + view = self.scout_view + + # Block the opener + if interaction.user.id == view.opener_user_id: + await interaction.response.send_message( + "You can't scout your own pack!", + ephemeral=True, + ) + return + + # One scout per player per pack + if interaction.user.id in view.scouted_users: + await interaction.response.send_message( + "You already scouted a card from this pack!", + ephemeral=True, + ) + return + + # This card already taken + if self.position in view.claimed_positions: + await interaction.response.send_message( + "This card was already scouted! Try a different one.", + ephemeral=True, + ) + return + + # Prevent double-click race on same card + if self.position in view.processing: + await interaction.response.send_message( + "Hold on, someone's claiming this card right now...", + ephemeral=True, + ) + return + + view.processing.add(self.position) + await interaction.response.defer(ephemeral=True) + + try: + # Get scouting player's team + scouter_team = await get_team_by_owner(interaction.user.id) + if not scouter_team: + await interaction.followup.send( + "You need a Paper Dynasty team to scout! Ask an admin to set one up.", + ephemeral=True, + ) + return + + # Check scout token balance + now = datetime.datetime.now() + midnight = int_timestamp( + datetime.datetime(now.year, now.month, now.day, 0, 0, 0) + ) + used_today = await db_get( + "rewards", + params=[ + ("name", "Scout Token"), + ("team_id", scouter_team["id"]), + ("created_after", midnight), + ], + ) + tokens_used = used_today["count"] if used_today else 0 + + if tokens_used >= SCOUT_TOKENS_PER_DAY: + await interaction.followup.send( + "You're out of scout tokens for today! You get 2 per day, resetting at midnight Central.", + ephemeral=True, + ) + return + + # Record the claim in the database + try: + await db_post( + "scout_claims", + payload={ + "scout_opportunity_id": view.scout_opp_id, + "card_id": self.card["id"], + "claimed_by_team_id": scouter_team["id"], + }, + ) + except Exception as e: + logger.error(f"Failed to record scout claim: {e}") + await interaction.followup.send( + "Something went wrong claiming this scout. Try again!", + ephemeral=True, + ) + return + + # Consume a scout token + current = await db_get("current") + await db_post( + "rewards", + payload={ + "name": "Scout Token", + "team_id": scouter_team["id"], + "season": current["season"] if current else PD_SEASON, + "week": current["week"] if current else 1, + "created": int_timestamp(now), + }, + ) + + # Create a copy of the card for the scouter + await db_post( + "cards", + payload={ + "cards": [ + { + "player_id": self.card["player"]["player_id"], + "team_id": scouter_team["id"], + } + ], + }, + ) + + # Track the claim + view.claimed_positions[self.position] = scouter_team["lname"] + view.scouted_users.add(interaction.user.id) + + # Update this button + self.disabled = True + self.style = discord.ButtonStyle.success + self.label = "Scouted!" + + # If all cards claimed, disable remaining buttons and stop + if view.all_claimed: + for item in view.children: + item.disabled = True + view.stop() + + # Update the shared embed + await view.update_message() + + # Send the scouter their card details (ephemeral) + player_name = self.card["player"]["p_name"] + rarity_name = self.card["player"]["rarity"]["name"] + + card_for_embed = { + "player": self.card["player"], + "team": scouter_team, + } + card_embeds = await get_card_embeds(card_for_embed) + await interaction.followup.send( + content=f"You scouted a **{rarity_name}** {player_name}!", + embeds=card_embeds, + ephemeral=True, + ) + + # Notify for shiny scouts (rarity >= 5) + if self.card["player"]["rarity"]["value"] >= 5: + try: + from helpers.discord_utils import send_to_channel + + notif_embed = get_team_embed(title="Rare Scout!", team=scouter_team) + notif_embed.description = ( + f"**{scouter_team['lname']}** scouted a " + f"**{rarity_name}** {player_name}!" + ) + notif_embed.set_thumbnail( + url=self.card["player"].get("headshot", IMAGES["logo"]) + ) + await send_to_channel( + view.bot, "pd-network-news", embed=notif_embed + ) + except Exception as e: + logger.error(f"Failed to send shiny scout notification: {e}") + + except Exception as e: + logger.error(f"Unexpected error in scout callback: {e}", exc_info=True) + try: + await interaction.followup.send( + "Something went wrong. Please try again.", + ephemeral=True, + ) + except Exception: + pass + finally: + view.processing.discard(self.position) diff --git a/helpers/__init__.py b/helpers/__init__.py index 4b62f4e..8c7e39d 100644 --- a/helpers/__init__.py +++ b/helpers/__init__.py @@ -6,7 +6,7 @@ The package is organized into logical modules for better maintainability. Modules: - constants: Application constants and configuration -- utils: General utility functions +- utils: General utility functions - random_content: Random content generators - search_utils: Search and fuzzy matching functionality - discord_utils: Discord helper functions @@ -21,9 +21,10 @@ Modules: # This allows existing code to continue working during the migration from helpers.main import * -# Import from migrated modules +# Import from migrated modules from .constants import * from .utils import * from .random_content import * -from .search_utils import * -from .discord_utils import * \ No newline at end of file +from .search_utils import * +from .discord_utils import * +from .scouting import * diff --git a/helpers/main.py b/helpers/main.py index ed16a3b..4dfc659 100644 --- a/helpers/main.py +++ b/helpers/main.py @@ -8,7 +8,7 @@ import traceback import discord import pygsheets -import requests +import aiohttp from discord.ext import commands from api_calls import * @@ -43,17 +43,21 @@ async def get_player_photo(player): ) try: - resp = requests.get(req_url, timeout=0.5) - except Exception as e: + async with aiohttp.ClientSession() as session: + async with session.get( + req_url, timeout=aiohttp.ClientTimeout(total=0.5) + ) as resp: + if resp.status == 200: + data = await resp.json() + if data["player"] and data["player"][0]["strSport"] == "Baseball": + await db_patch( + "players", + object_id=player["player_id"], + params=[("headshot", data["player"][0]["strThumb"])], + ) + return data["player"][0]["strThumb"] + except Exception: return None - if resp.status_code == 200 and resp.json()["player"]: - if resp.json()["player"][0]["strSport"] == "Baseball": - await db_patch( - "players", - object_id=player["player_id"], - params=[("headshot", resp.json()["player"][0]["strThumb"])], - ) - return resp.json()["player"][0]["strThumb"] return None @@ -1681,9 +1685,9 @@ async def paperdex_team_embed(team: dict, mlb_team: dict) -> list[discord.Embed] for cardset_id in coll_data: if cardset_id != "total_owned": if coll_data[cardset_id]["players"]: - coll_data[cardset_id]["embeds"][0].description = ( - f"{mlb_team['lname']} / {coll_data[cardset_id]['name']}" - ) + coll_data[cardset_id]["embeds"][ + 0 + ].description = f"{mlb_team['lname']} / {coll_data[cardset_id]['name']}" coll_data[cardset_id]["embeds"][0].add_field( name="# Collected / # Total Cards", value=f"{coll_data[cardset_id]['owned']} / {len(coll_data[cardset_id]['players'])}", @@ -1749,6 +1753,8 @@ async def open_st_pr_packs(all_packs: list, team: dict, context): all_cards = [] for p_id in pack_ids: new_cards = await db_get("cards", params=[("pack_id", p_id)]) + for card in new_cards["cards"]: + card.setdefault("pack_id", p_id) all_cards.extend(new_cards["cards"]) if not all_cards: @@ -1764,6 +1770,18 @@ async def open_st_pr_packs(all_packs: list, team: dict, context): await context.channel.send(content=f"Let's head down to {pack_channel.mention}!") await display_cards(all_cards, team, pack_channel, author, pack_cover=pack_cover) + # Create scout opportunities for each pack + from helpers.scouting import create_scout_opportunity + + for p_id in pack_ids: + pack_cards = [c for c in all_cards if c.get("pack_id") == p_id] + if pack_cards: + await create_scout_opportunity( + pack_cards, team, pack_channel, author, context + ) + if len(pack_ids) > 1: + await asyncio.sleep(2) + async def get_choice_from_cards( interaction: discord.Interaction, diff --git a/helpers/scouting.py b/helpers/scouting.py new file mode 100644 index 0000000..32536fc --- /dev/null +++ b/helpers/scouting.py @@ -0,0 +1,173 @@ +""" +Scouting Helper Functions + +Handles creation of scout opportunities after pack openings +and embed formatting for the scouting feature. +""" + +import asyncio +import datetime +import logging +import random + +import discord + +from api_calls import db_post +from helpers.utils import int_timestamp +from helpers.discord_utils import get_team_embed +from helpers.constants import IMAGES, PD_SEASON + +logger = logging.getLogger("discord_app") + +SCOUT_WINDOW_SECONDS = 1800 # 30 minutes + +# Rarity value → display symbol +RARITY_SYMBOLS = { + 8: "\U0001f7e1", # HoF — yellow + 5: "\U0001f7e3", # MVP — purple + 3: "\U0001f535", # All-Star — blue + 2: "\U0001f7e2", # Starter — green + 1: "\u26aa", # Reserve — white + 0: "\u26ab", # Replacement — black +} + + +def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: + """Build a shuffled list of (player_id, display_line) tuples.""" + lines = [] + for card in cards: + player = card["player"] + rarity_val = player["rarity"]["value"] + symbol = RARITY_SYMBOLS.get(rarity_val, "\u26ab") + lines.append( + ( + player["player_id"], + f"{symbol} {player['rarity']['name']} — {player['p_name']}", + ) + ) + random.shuffle(lines) + return lines + + +def build_scout_embed( + opener_team: dict, + cards: list[dict], + card_lines: list[tuple[int, str]] = None, +) -> discord.Embed: + """Build the embed shown above the scout buttons. + + Shows a shuffled list of cards (rarity + player name) so scouters + know what's in the pack but not which button maps to which card. + Returns (embed, card_lines) so the view can store the shuffled order. + """ + embed = get_team_embed(title="Scout Opportunity!", team=opener_team) + + if card_lines is None: + card_lines = _build_card_lines(cards) + + card_list = "\n".join(line for _, line in card_lines) + + embed.description = ( + f"**{opener_team['lname']}** just opened a pack!\n\n" + f"**Cards in this pack:**\n{card_list}\n\n" + f"Pick a card — but which is which?\n" + f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" + f"This window closes in **30 minutes**." + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One player per pack", + icon_url=IMAGES["logo"], + ) + return embed, card_lines + + +def build_scouted_card_list( + card_lines: list[tuple[int, str]], + scouted_cards: dict[int, str], +) -> str: + """Rebuild the card list marking scouted cards with the scouter's team name. + + Parameters + ---------- + card_lines : shuffled list of (player_id, display_line) tuples + scouted_cards : {player_id: scouter_team_name} for each claimed card + """ + result = [] + for player_id, line in card_lines: + if player_id in scouted_cards: + team_name = scouted_cards[player_id] + result.append(f"{line} \u2014 \u2714\ufe0f *{team_name}*") + else: + result.append(line) + return "\n".join(result) + + +async def create_scout_opportunity( + pack_cards: list[dict], + opener_team: dict, + channel: discord.TextChannel, + opener_user, + context, +) -> None: + """Create a scout opportunity and post the ScoutView to the channel. + + Called after display_cards() completes in open_st_pr_packs(). + Wrapped in try/except so scouting failures never crash pack opening. + + Parameters + ---------- + pack_cards : list of card dicts from a single pack + opener_team : team dict for the pack opener + channel : the #pack-openings channel + opener_user : discord.Member or discord.User who opened the pack + context : the command context (Context or Interaction), used to get bot + """ + from discord_ui.scout_view import ScoutView + + # Only create scout opportunities in the pack-openings channel + if not channel or channel.name != "pack-openings": + return + + if not pack_cards: + return + + now = datetime.datetime.now() + expires_at = int_timestamp(now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)) + created = int_timestamp(now) + + card_ids = [c["id"] for c in pack_cards] + + try: + scout_opp = await db_post( + "scout_opportunities", + payload={ + "pack_id": pack_cards[0].get("pack_id"), + "opener_team_id": opener_team["id"], + "card_ids": card_ids, + "expires_at": expires_at, + "created": created, + }, + ) + except Exception as e: + logger.error(f"Failed to create scout opportunity: {e}") + return + + embed, card_lines = build_scout_embed(opener_team, pack_cards) + + # Get bot reference from context + bot = getattr(context, "bot", None) or getattr(context, "client", None) + + view = ScoutView( + scout_opp_id=scout_opp["id"], + cards=pack_cards, + opener_team=opener_team, + opener_user_id=opener_user.id, + bot=bot, + ) + view.card_lines = card_lines + + try: + msg = await channel.send(embed=embed, view=view) + view.message = msg + except Exception as e: + logger.error(f"Failed to post scout opportunity message: {e}") diff --git a/paperdynasty.py b/paperdynasty.py index d7d9ea1..951654a 100644 --- a/paperdynasty.py +++ b/paperdynasty.py @@ -12,12 +12,12 @@ from in_game.gameplay_queries import get_channel_game_or_none from health_server import run_health_server from notify_restart import send_restart_notification -raw_log_level = os.getenv('LOG_LEVEL') -if raw_log_level == 'DEBUG': +raw_log_level = os.getenv("LOG_LEVEL") +if raw_log_level == "DEBUG": log_level = logging.DEBUG -elif raw_log_level == 'INFO': +elif raw_log_level == "INFO": log_level = logging.INFO -elif raw_log_level == 'WARN': +elif raw_log_level == "WARN": log_level = logging.WARNING else: log_level = logging.ERROR @@ -29,17 +29,17 @@ else: # level=log_level # ) # logger.getLogger('discord.http').setLevel(logger.INFO) -logger = logging.getLogger('discord_app') +logger = logging.getLogger("discord_app") logger.setLevel(log_level) handler = RotatingFileHandler( - filename='logs/discord.log', + filename="logs/discord.log", # encoding='utf-8', maxBytes=32 * 1024 * 1024, # 32 MiB backupCount=5, # Rotate through 5 files ) -formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') +formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") handler.setFormatter(formatter) # dt_fmt = '%Y-%m-%d %H:%M:%S' @@ -48,27 +48,30 @@ handler.setFormatter(formatter) logger.addHandler(handler) COGS = [ - 'cogs.owner', - 'cogs.admins', - 'cogs.economy', - 'cogs.players', - 'cogs.gameplay', + "cogs.owner", + "cogs.admins", + "cogs.economy", + "cogs.players", + "cogs.gameplay", + "cogs.economy_new.scouting", ] intents = discord.Intents.default() intents.members = True intents.message_content = True -bot = commands.Bot(command_prefix='.', - intents=intents, - # help_command=None, - description='The Paper Dynasty Bot\nIf you have questions, feel free to contact Cal.', - case_insensitive=True, - owner_id=258104532423147520) +bot = commands.Bot( + command_prefix=".", + intents=intents, + # help_command=None, + description="The Paper Dynasty Bot\nIf you have questions, feel free to contact Cal.", + case_insensitive=True, + owner_id=258104532423147520, +) @bot.event async def on_ready(): - logger.info('Logged in as:') + logger.info("Logged in as:") logger.info(bot.user.name) logger.info(bot.user.id) @@ -77,9 +80,11 @@ async def on_ready(): @bot.tree.error -async def on_app_command_error(interaction: discord.Interaction, error: discord.app_commands.AppCommandError): +async def on_app_command_error( + interaction: discord.Interaction, error: discord.app_commands.AppCommandError +): """Global error handler for all app commands (slash commands).""" - logger.error(f'App command error in {interaction.command}: {error}', exc_info=error) + logger.error(f"App command error in {interaction.command}: {error}", exc_info=error) # CRITICAL: Release play lock if command failed during gameplay # This prevents permanent user lockouts when exceptions occur @@ -97,22 +102,23 @@ async def on_app_command_error(interaction: discord.Interaction, error: discord. session.add(current_play) session.commit() except Exception as lock_error: - logger.error(f'Failed to release play lock after error: {lock_error}', exc_info=lock_error) + logger.error( + f"Failed to release play lock after error: {lock_error}", + exc_info=lock_error, + ) # Try to respond to the user try: if not interaction.response.is_done(): await interaction.response.send_message( - f'❌ An error occurred: {str(error)}', - ephemeral=True + f"❌ An error occurred: {str(error)}", ephemeral=True ) else: await interaction.followup.send( - f'❌ An error occurred: {str(error)}', - ephemeral=True + f"❌ An error occurred: {str(error)}", ephemeral=True ) except Exception as e: - logger.error(f'Failed to send error message to user: {e}') + logger.error(f"Failed to send error message to user: {e}") async def main(): @@ -120,10 +126,10 @@ async def main(): for c in COGS: try: await bot.load_extension(c) - logger.info(f'Loaded cog: {c}') + logger.info(f"Loaded cog: {c}") except Exception as e: - logger.error(f'Failed to load cog: {c}') - logger.error(f'{e}') + logger.error(f"Failed to load cog: {c}") + logger.error(f"{e}") # Start health server and bot concurrently async with bot: @@ -132,7 +138,7 @@ async def main(): try: # Start bot (this blocks until bot stops) - await bot.start(os.environ.get('BOT_TOKEN', 'NONE')) + await bot.start(os.environ.get("BOT_TOKEN", "NONE")) finally: # Cleanup: cancel health server when bot stops health_task.cancel() @@ -141,4 +147,5 @@ async def main(): except asyncio.CancelledError: pass + asyncio.run(main()) -- 2.25.1 From d538c679c319be12ab3a99aca171ed5e7801f959 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Wed, 4 Mar 2026 19:29:44 -0600 Subject: [PATCH 02/12] refactor: Consolidate scouting utilities, add test suite, use Discord timestamps - Consolidate SCOUT_TOKENS_PER_DAY and get_scout_tokens_used() into helpers/scouting.py (was duplicated across 3 files) - Add midnight_timestamp() utility to helpers/utils.py - Remove _build_scouted_ids() wrapper, use self.claims directly - Fix build_scout_embed return type annotation - Use Discord relative timestamps for scout window countdown - Add 66-test suite covering helpers, ScoutView, and cog Co-Authored-By: Claude Opus 4.6 --- cogs/economy_new/scouting.py | 18 +- discord_ui/__init__.py | 6 +- discord_ui/scout_view.py | 137 +-- helpers/scouting.py | 53 +- helpers/utils.py | 115 +-- tests/scouting/__init__.py | 0 tests/scouting/conftest.py | 160 ++++ tests/scouting/test_scout_view.py | 1029 +++++++++++++++++++++++ tests/scouting/test_scouting_cog.py | 269 ++++++ tests/scouting/test_scouting_helpers.py | 374 ++++++++ 10 files changed, 1987 insertions(+), 174 deletions(-) create mode 100644 tests/scouting/__init__.py create mode 100644 tests/scouting/conftest.py create mode 100644 tests/scouting/test_scout_view.py create mode 100644 tests/scouting/test_scouting_cog.py create mode 100644 tests/scouting/test_scouting_helpers.py diff --git a/cogs/economy_new/scouting.py b/cogs/economy_new/scouting.py index 9e895e5..118927a 100644 --- a/cogs/economy_new/scouting.py +++ b/cogs/economy_new/scouting.py @@ -10,6 +10,7 @@ from discord import app_commands from discord.ext import commands, tasks from api_calls import db_get +from helpers.scouting import SCOUT_TOKENS_PER_DAY, get_scout_tokens_used from helpers.utils import int_timestamp from helpers.discord_utils import get_team_embed from helpers.main import get_team_by_owner @@ -17,8 +18,6 @@ from helpers.constants import PD_SEASON, IMAGES logger = logging.getLogger("discord_app") -SCOUT_TOKENS_PER_DAY = 2 - class Scouting(commands.Cog): """Scout token tracking and expired opportunity cleanup.""" @@ -45,20 +44,7 @@ class Scouting(commands.Cog): ) return - now = datetime.datetime.now() - midnight = int_timestamp( - datetime.datetime(now.year, now.month, now.day, 0, 0, 0) - ) - - used_today = await db_get( - "rewards", - params=[ - ("name", "Scout Token"), - ("team_id", team["id"]), - ("created_after", midnight), - ], - ) - tokens_used = used_today["count"] if used_today else 0 + tokens_used = await get_scout_tokens_used(team["id"]) tokens_remaining = max(0, SCOUT_TOKENS_PER_DAY - tokens_used) embed = get_team_embed(title="Scout Tokens", team=team) diff --git a/discord_ui/__init__.py b/discord_ui/__init__.py index 88a3f9d..ffc1390 100644 --- a/discord_ui/__init__.py +++ b/discord_ui/__init__.py @@ -17,7 +17,10 @@ from .selectors import ( SelectView, ) from .dropdowns import Dropdown, DropdownView -from .scout_view import ScoutView + +# ScoutView intentionally NOT imported here to avoid circular import: +# helpers.main → discord_ui → scout_view → helpers.main +# Import directly: from discord_ui.scout_view import ScoutView __all__ = [ "Question", @@ -34,5 +37,4 @@ __all__ = [ "SelectView", "Dropdown", "DropdownView", - "ScoutView", ] diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 2e7dfb8..11ce77a 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -3,32 +3,30 @@ Scout View — Face-down card button UI for the Scouting feature. When a player opens a pack, a ScoutView is posted with one button per card. Other players can click a button to "scout" (blind-pick) one card, receiving -a copy. The opener keeps all their cards. Multiple players can scout different -cards from the same pack — each costs one scout token. +a copy. The opener keeps all their cards. Multiple players can scout the same +card — each gets their own copy. """ -import datetime import logging import discord -from api_calls import db_get, db_post, db_patch +from api_calls import db_get, db_post from helpers.main import get_team_by_owner, get_card_embeds +from helpers.scouting import SCOUT_TOKENS_PER_DAY, get_scout_tokens_used from helpers.utils import int_timestamp from helpers.discord_utils import get_team_embed from helpers.constants import IMAGES, PD_SEASON logger = logging.getLogger("discord_app") -SCOUT_TOKENS_PER_DAY = 2 - class ScoutView(discord.ui.View): """Displays face-down card buttons for a scout opportunity. - One button per card, labeled "Card 1" ... "Card N" - Any player EXCEPT the pack opener can interact - - Each card can be scouted once; multiple players can scout different cards + - Any card can be scouted multiple times by different players - One scout per player per pack - Timeout: 30 minutes """ @@ -40,6 +38,7 @@ class ScoutView(discord.ui.View): opener_team: dict, opener_user_id: int, bot, + expires_unix: int = None, ): super().__init__(timeout=1800.0) self.scout_opp_id = scout_opp_id @@ -47,15 +46,18 @@ class ScoutView(discord.ui.View): self.opener_team = opener_team self.opener_user_id = opener_user_id self.bot = bot + self.expires_unix = expires_unix self.message: discord.Message | None = None self.card_lines: list[tuple[int, str]] = [] - # Per-card claim tracking: position -> scouter team name - self.claimed_positions: dict[int, str] = {} + # Per-card claim tracking: player_id -> list of scouter team names + self.claims: dict[int, list[str]] = {} # Per-user lock: user IDs who have already scouted this pack self.scouted_users: set[int] = set() - # Positions currently being processed (prevent double-click race) - self.processing: set[int] = set() + # Users currently being processed (prevent double-click race) + self.processing_users: set[int] = set() + # Total scout count + self.total_scouts = 0 for i, card in enumerate(cards): button = ScoutButton( @@ -65,10 +67,6 @@ class ScoutView(discord.ui.View): ) self.add_item(button) - @property - def all_claimed(self) -> bool: - return len(self.claimed_positions) >= len(self.cards) - async def update_message(self): """Refresh the embed with current claim state.""" if not self.message: @@ -76,34 +74,26 @@ class ScoutView(discord.ui.View): from helpers.scouting import build_scouted_card_list - scouted_ids = {} - for pos, team_name in self.claimed_positions.items(): - player_id = self.cards[pos]["player"]["player_id"] - scouted_ids[player_id] = team_name - - card_list = build_scouted_card_list(self.card_lines, scouted_ids) - claim_count = len(self.claimed_positions) - - if self.all_claimed: - title = "Fully Scouted!" - footer_text = f"Paper Dynasty Season {PD_SEASON} \u2022 All cards scouted" - else: - title = f"Scout Opportunity! ({claim_count}/{len(self.cards)} scouted)" - footer_text = ( - f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player" - ) + card_list = build_scouted_card_list(self.card_lines, self.claims) + title = f"Scout Opportunity! ({self.total_scouts} scouted)" embed = get_team_embed(title=title, team=self.opener_team) - embed.description = ( - f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}\n\n" - ) - if not self.all_claimed: - embed.description += ( - "Pick a card — but which is which?\n" - "Costs 1 Scout Token (2 per day, resets at midnight Central)." - ) + if self.expires_unix: + time_line = f"Scout window closes ." + else: + time_line = "Scout window closes in **30 minutes**." - embed.set_footer(text=footer_text, icon_url=IMAGES["logo"]) + embed.description = ( + f"**{self.opener_team['lname']}**'s pack\n\n" + f"{card_list}\n\n" + f"Pick a card — but which is which?\n" + f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" + f"{time_line}" + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", + icon_url=IMAGES["logo"], + ) try: await self.message.edit(embed=embed, view=self) @@ -119,18 +109,10 @@ class ScoutView(discord.ui.View): try: from helpers.scouting import build_scouted_card_list - scouted_ids = {} - for pos, team_name in self.claimed_positions.items(): - player_id = self.cards[pos]["player"]["player_id"] - scouted_ids[player_id] = team_name + card_list = build_scouted_card_list(self.card_lines, self.claims) - card_list = build_scouted_card_list(self.card_lines, scouted_ids) - claim_count = len(self.claimed_positions) - - if claim_count > 0: - title = ( - f"Scout Window Closed ({claim_count}/{len(self.cards)} scouted)" - ) + if self.total_scouts > 0: + title = f"Scout Window Closed ({self.total_scouts} scouted)" else: title = "Scout Window Closed" @@ -179,23 +161,11 @@ class ScoutButton(discord.ui.Button): ) return - # This card already taken - if self.position in view.claimed_positions: - await interaction.response.send_message( - "This card was already scouted! Try a different one.", - ephemeral=True, - ) + # Prevent double-click race for same user + if interaction.user.id in view.processing_users: return - # Prevent double-click race on same card - if self.position in view.processing: - await interaction.response.send_message( - "Hold on, someone's claiming this card right now...", - ephemeral=True, - ) - return - - view.processing.add(self.position) + view.processing_users.add(interaction.user.id) await interaction.response.defer(ephemeral=True) try: @@ -209,19 +179,7 @@ class ScoutButton(discord.ui.Button): return # Check scout token balance - now = datetime.datetime.now() - midnight = int_timestamp( - datetime.datetime(now.year, now.month, now.day, 0, 0, 0) - ) - used_today = await db_get( - "rewards", - params=[ - ("name", "Scout Token"), - ("team_id", scouter_team["id"]), - ("created_after", midnight), - ], - ) - tokens_used = used_today["count"] if used_today else 0 + tokens_used = await get_scout_tokens_used(scouter_team["id"]) if tokens_used >= SCOUT_TOKENS_PER_DAY: await interaction.followup.send( @@ -257,7 +215,7 @@ class ScoutButton(discord.ui.Button): "team_id": scouter_team["id"], "season": current["season"] if current else PD_SEASON, "week": current["week"] if current else 1, - "created": int_timestamp(now), + "created": int_timestamp(), }, ) @@ -275,19 +233,12 @@ class ScoutButton(discord.ui.Button): ) # Track the claim - view.claimed_positions[self.position] = scouter_team["lname"] + player_id = self.card["player"]["player_id"] + if player_id not in view.claims: + view.claims[player_id] = [] + view.claims[player_id].append(scouter_team["lname"]) view.scouted_users.add(interaction.user.id) - - # Update this button - self.disabled = True - self.style = discord.ButtonStyle.success - self.label = "Scouted!" - - # If all cards claimed, disable remaining buttons and stop - if view.all_claimed: - for item in view.children: - item.disabled = True - view.stop() + view.total_scouts += 1 # Update the shared embed await view.update_message() @@ -336,4 +287,4 @@ class ScoutButton(discord.ui.Button): except Exception: pass finally: - view.processing.discard(self.position) + view.processing_users.discard(interaction.user.id) diff --git a/helpers/scouting.py b/helpers/scouting.py index 32536fc..ab2d2c2 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -12,13 +12,14 @@ import random import discord -from api_calls import db_post -from helpers.utils import int_timestamp +from api_calls import db_get, db_post +from helpers.utils import int_timestamp, midnight_timestamp from helpers.discord_utils import get_team_embed from helpers.constants import IMAGES, PD_SEASON logger = logging.getLogger("discord_app") +SCOUT_TOKENS_PER_DAY = 2 SCOUT_WINDOW_SECONDS = 1800 # 30 minutes # Rarity value → display symbol @@ -32,6 +33,19 @@ RARITY_SYMBOLS = { } +async def get_scout_tokens_used(team_id: int) -> int: + """Return how many scout tokens a team has used today.""" + used_today = await db_get( + "rewards", + params=[ + ("name", "Scout Token"), + ("team_id", team_id), + ("created_after", midnight_timestamp()), + ], + ) + return used_today["count"] if used_today else 0 + + def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: """Build a shuffled list of (player_id, display_line) tuples.""" lines = [] @@ -53,7 +67,8 @@ def build_scout_embed( opener_team: dict, cards: list[dict], card_lines: list[tuple[int, str]] = None, -) -> discord.Embed: + expires_unix: int = None, +) -> tuple[discord.Embed, list[tuple[int, str]]]: """Build the embed shown above the scout buttons. Shows a shuffled list of cards (rarity + player name) so scouters @@ -67,12 +82,17 @@ def build_scout_embed( card_list = "\n".join(line for _, line in card_lines) + if expires_unix: + time_line = f"Scout window closes ." + else: + time_line = "Scout window closes in **30 minutes**." + embed.description = ( f"**{opener_team['lname']}** just opened a pack!\n\n" f"**Cards in this pack:**\n{card_list}\n\n" f"Pick a card — but which is which?\n" f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" - f"This window closes in **30 minutes**." + f"{time_line}" ) embed.set_footer( text=f"Paper Dynasty Season {PD_SEASON} \u2022 One player per pack", @@ -83,20 +103,25 @@ def build_scout_embed( def build_scouted_card_list( card_lines: list[tuple[int, str]], - scouted_cards: dict[int, str], + scouted_cards: dict[int, list[str]], ) -> str: - """Rebuild the card list marking scouted cards with the scouter's team name. + """Rebuild the card list marking scouted cards with scouter team names. Parameters ---------- card_lines : shuffled list of (player_id, display_line) tuples - scouted_cards : {player_id: scouter_team_name} for each claimed card + scouted_cards : {player_id: [team_name, ...]} for each claimed card """ result = [] for player_id, line in card_lines: - if player_id in scouted_cards: - team_name = scouted_cards[player_id] - result.append(f"{line} \u2014 \u2714\ufe0f *{team_name}*") + teams = scouted_cards.get(player_id) + if teams: + count = len(teams) + names = ", ".join(f"*{t}*" for t in teams) + if count == 1: + result.append(f"{line} \u2014 \u2714\ufe0f {names}") + else: + result.append(f"{line} \u2014 \u2714\ufe0f x{count} ({names})") else: result.append(line) return "\n".join(result) @@ -152,7 +177,12 @@ async def create_scout_opportunity( logger.error(f"Failed to create scout opportunity: {e}") return - embed, card_lines = build_scout_embed(opener_team, pack_cards) + expires_unix = int( + (now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)).timestamp() + ) + embed, card_lines = build_scout_embed( + opener_team, pack_cards, expires_unix=expires_unix + ) # Get bot reference from context bot = getattr(context, "bot", None) or getattr(context, "client", None) @@ -163,6 +193,7 @@ async def create_scout_opportunity( opener_team=opener_team, opener_user_id=opener_user.id, bot=bot, + expires_unix=expires_unix, ) view.card_lines = card_lines diff --git a/helpers/utils.py b/helpers/utils.py index 9fc70e3..7535bf7 100644 --- a/helpers/utils.py +++ b/helpers/utils.py @@ -4,6 +4,7 @@ General Utilities This module contains standalone utility functions with minimal dependencies, including timestamp conversion, position abbreviations, and simple helpers. """ + import datetime from typing import Optional import discord @@ -16,48 +17,55 @@ def int_timestamp(datetime_obj: Optional[datetime.datetime] = None): return int(datetime.datetime.now().timestamp()) +def midnight_timestamp() -> int: + """Return today's midnight (00:00:00) as an integer millisecond timestamp.""" + now = datetime.datetime.now() + midnight = datetime.datetime(now.year, now.month, now.day, 0, 0, 0) + return int_timestamp(midnight) + + def get_pos_abbrev(field_pos: str) -> str: """Convert position name to standard abbreviation.""" - if field_pos.lower() == 'catcher': - return 'C' - elif field_pos.lower() == 'first baseman': - return '1B' - elif field_pos.lower() == 'second baseman': - return '2B' - elif field_pos.lower() == 'third baseman': - return '3B' - elif field_pos.lower() == 'shortstop': - return 'SS' - elif field_pos.lower() == 'left fielder': - return 'LF' - elif field_pos.lower() == 'center fielder': - return 'CF' - elif field_pos.lower() == 'right fielder': - return 'RF' + if field_pos.lower() == "catcher": + return "C" + elif field_pos.lower() == "first baseman": + return "1B" + elif field_pos.lower() == "second baseman": + return "2B" + elif field_pos.lower() == "third baseman": + return "3B" + elif field_pos.lower() == "shortstop": + return "SS" + elif field_pos.lower() == "left fielder": + return "LF" + elif field_pos.lower() == "center fielder": + return "CF" + elif field_pos.lower() == "right fielder": + return "RF" else: - return 'P' + return "P" def position_name_to_abbrev(position_name): """Convert position name to abbreviation (alternate format).""" - if position_name == 'Catcher': - return 'C' - elif position_name == 'First Base': - return '1B' - elif position_name == 'Second Base': - return '2B' - elif position_name == 'Third Base': - return '3B' - elif position_name == 'Shortstop': - return 'SS' - elif position_name == 'Left Field': - return 'LF' - elif position_name == 'Center Field': - return 'CF' - elif position_name == 'Right Field': - return 'RF' - elif position_name == 'Pitcher': - return 'P' + if position_name == "Catcher": + return "C" + elif position_name == "First Base": + return "1B" + elif position_name == "Second Base": + return "2B" + elif position_name == "Third Base": + return "3B" + elif position_name == "Shortstop": + return "SS" + elif position_name == "Left Field": + return "LF" + elif position_name == "Center Field": + return "CF" + elif position_name == "Right Field": + return "RF" + elif position_name == "Pitcher": + return "P" else: return position_name @@ -67,13 +75,13 @@ def user_has_role(user: discord.User | discord.Member, role_name: str) -> bool: for x in user.roles: if x.name == role_name: return True - + return False def get_roster_sheet_legacy(team): """Get legacy roster sheet URL for a team.""" - return f'https://docs.google.com/spreadsheets/d/{team.gsheet}/edit' + return f"https://docs.google.com/spreadsheets/d/{team.gsheet}/edit" def get_roster_sheet(team): @@ -83,13 +91,15 @@ def get_roster_sheet(team): Handles both dict and Team object formats. """ # Handle both dict (team["gsheet"]) and object (team.gsheet) formats - gsheet = team.get("gsheet") if isinstance(team, dict) else getattr(team, "gsheet", None) - return f'https://docs.google.com/spreadsheets/d/{gsheet}/edit' + gsheet = ( + team.get("gsheet") if isinstance(team, dict) else getattr(team, "gsheet", None) + ) + return f"https://docs.google.com/spreadsheets/d/{gsheet}/edit" def get_player_url(team, player) -> str: """Generate player URL for SBA or Baseball Reference.""" - if team.get('league') == 'SBA': + if team.get("league") == "SBA": return f'https://statsplus.net/super-baseball-association/player/{player["player_id"]}' else: return f'https://www.baseball-reference.com/players/{player["bbref_id"][0]}/{player["bbref_id"]}.shtml' @@ -101,7 +111,7 @@ def owner_only(ctx) -> bool: owners = [287463767924137994, 1087936030899347516] # Handle both Context (has .author) and Interaction (has .user) objects - user = getattr(ctx, 'user', None) or getattr(ctx, 'author', None) + user = getattr(ctx, "user", None) or getattr(ctx, "author", None) if user and user.id in owners: return True @@ -121,35 +131,36 @@ def get_context_user(ctx): discord.User or discord.Member: The user who invoked the command """ # Handle both Context (has .author) and Interaction (has .user) objects - return getattr(ctx, 'user', None) or getattr(ctx, 'author', None) + return getattr(ctx, "user", None) or getattr(ctx, "author", None) def get_cal_user(ctx): """Get the Cal user from context. Always returns an object with .mention attribute.""" import logging - logger = logging.getLogger('discord_app') - + + logger = logging.getLogger("discord_app") + # Define placeholder user class first class PlaceholderUser: def __init__(self): self.mention = "<@287463767924137994>" self.id = 287463767924137994 - + # Handle both Context and Interaction objects - if hasattr(ctx, 'bot'): # Context object + if hasattr(ctx, "bot"): # Context object bot = ctx.bot logger.debug("get_cal_user: Using Context object") - elif hasattr(ctx, 'client'): # Interaction object + elif hasattr(ctx, "client"): # Interaction object bot = ctx.client logger.debug("get_cal_user: Using Interaction object") else: logger.error("get_cal_user: No bot or client found in context") return PlaceholderUser() - + if not bot: logger.error("get_cal_user: bot is None") return PlaceholderUser() - + logger.debug(f"get_cal_user: Searching among members") try: for user in bot.get_all_members(): @@ -158,7 +169,7 @@ def get_cal_user(ctx): return user except Exception as e: logger.error(f"get_cal_user: Exception in get_all_members: {e}") - + # Fallback: try to get user directly by ID logger.debug("get_cal_user: User not found in get_all_members, trying get_user") try: @@ -170,7 +181,7 @@ def get_cal_user(ctx): logger.debug("get_cal_user: get_user returned None") except Exception as e: logger.error(f"get_cal_user: Exception in get_user: {e}") - + # Last resort: return a placeholder user object with mention logger.debug("get_cal_user: Using placeholder user") - return PlaceholderUser() \ No newline at end of file + return PlaceholderUser() diff --git a/tests/scouting/__init__.py b/tests/scouting/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/scouting/conftest.py b/tests/scouting/conftest.py new file mode 100644 index 0000000..523e38f --- /dev/null +++ b/tests/scouting/conftest.py @@ -0,0 +1,160 @@ +"""Shared fixtures for scouting feature tests.""" + +import pytest +import asyncio +from unittest.mock import AsyncMock, MagicMock, Mock + +import discord +from discord.ext import commands + +# --------------------------------------------------------------------------- +# Sample data factories +# --------------------------------------------------------------------------- + + +def _make_player(player_id, name, rarity_name, rarity_value, headshot=None): + """Build a minimal player dict matching the API shape used by scouting.""" + return { + "player_id": player_id, + "p_name": name, + "rarity": {"name": rarity_name, "value": rarity_value, "color": "ffffff"}, + "headshot": headshot or "https://example.com/headshot.jpg", + } + + +def _make_card(card_id, player): + """Wrap a player dict inside a card dict (as returned by the cards API).""" + return {"id": card_id, "player": player} + + +@pytest.fixture +def sample_players(): + """Five players spanning different rarities for a realistic pack.""" + return [ + _make_player(101, "Mike Trout", "MVP", 5), + _make_player(102, "Juan Soto", "All-Star", 3), + _make_player(103, "Marcus Semien", "Starter", 2), + _make_player(104, "Willy Adames", "Reserve", 1), + _make_player(105, "Generic Bench", "Replacement", 0), + ] + + +@pytest.fixture +def sample_cards(sample_players): + """Five card dicts wrapping the sample players.""" + return [_make_card(i + 1, p) for i, p in enumerate(sample_players)] + + +@pytest.fixture +def opener_team(): + """Team dict for the pack opener.""" + return { + "id": 10, + "abbrev": "OPN", + "sname": "Openers", + "lname": "Opening Squad", + "gm_id": 99999, + "gmname": "Opener GM", + "color": "a6ce39", + "logo": "https://example.com/logo.png", + "season": 4, + } + + +@pytest.fixture +def scouter_team(): + """Team dict for a player who scouts a card.""" + return { + "id": 20, + "abbrev": "SCT", + "sname": "Scouts", + "lname": "Scouting Squad", + "gm_id": 88888, + "gmname": "Scout GM", + "color": "3498db", + "logo": "https://example.com/scout_logo.png", + "season": 4, + } + + +@pytest.fixture +def scouter_team_2(): + """Second scouter team for multi-scout tests.""" + return { + "id": 30, + "abbrev": "SC2", + "sname": "Scouts2", + "lname": "Second Scouts", + "gm_id": 77777, + "gmname": "Scout GM 2", + "color": "e74c3c", + "logo": "https://example.com/scout2_logo.png", + "season": 4, + } + + +# --------------------------------------------------------------------------- +# Discord mocks +# --------------------------------------------------------------------------- + + +@pytest.fixture +def mock_bot(): + """Mock Discord bot.""" + bot = AsyncMock(spec=commands.Bot) + bot.get_cog = Mock(return_value=None) + bot.add_cog = AsyncMock() + bot.wait_until_ready = AsyncMock() + + # Mock guild / channel lookup for send_to_channel + channel_mock = AsyncMock(spec=discord.TextChannel) + channel_mock.send = AsyncMock() + guild_mock = Mock(spec=discord.Guild) + guild_mock.text_channels = [channel_mock] + channel_mock.name = "pd-network-news" + bot.guilds = [guild_mock] + return bot + + +@pytest.fixture +def mock_interaction(): + """Mock Discord interaction for slash commands.""" + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.response.is_done = Mock(return_value=False) + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + + interaction.user = Mock(spec=discord.Member) + interaction.user.id = 12345 + interaction.user.mention = "<@12345>" + + interaction.channel = Mock(spec=discord.TextChannel) + interaction.channel.name = "pack-openings" + interaction.channel.send = AsyncMock() + + return interaction + + +@pytest.fixture +def mock_channel(): + """Mock #pack-openings channel.""" + channel = AsyncMock(spec=discord.TextChannel) + channel.name = "pack-openings" + channel.send = AsyncMock() + return channel + + +# --------------------------------------------------------------------------- +# Logging suppression +# --------------------------------------------------------------------------- + + +@pytest.fixture(autouse=True) +def silence_logging(): + """Suppress log noise during tests.""" + import logging + + logging.getLogger("discord_app").setLevel(logging.CRITICAL) diff --git a/tests/scouting/test_scout_view.py b/tests/scouting/test_scout_view.py new file mode 100644 index 0000000..10853a0 --- /dev/null +++ b/tests/scouting/test_scout_view.py @@ -0,0 +1,1029 @@ +"""Tests for discord_ui/scout_view.py — ScoutView and ScoutButton behavior. + +Covers view initialization, button callbacks (guard rails, claim flow, +token checks, multi-scout), embed updates, and timeout handling. + +Note: All tests that instantiate ScoutView must be async because +discord.ui.View.__init__ requires a running event loop. +""" + +import pytest +from unittest.mock import AsyncMock, MagicMock, Mock, patch + +import discord + +from discord_ui.scout_view import ScoutView, ScoutButton, SCOUT_TOKENS_PER_DAY + +# --------------------------------------------------------------------------- +# ScoutView initialization +# --------------------------------------------------------------------------- + + +class TestScoutViewInit: + """Tests for ScoutView construction and initial state.""" + + @pytest.mark.asyncio + async def test_creates_one_button_per_card( + self, sample_cards, opener_team, mock_bot + ): + """Should add exactly one button per card in the pack.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + buttons = [c for c in view.children if isinstance(c, discord.ui.Button)] + assert len(buttons) == len(sample_cards) + + @pytest.mark.asyncio + async def test_buttons_labeled_sequentially( + self, sample_cards, opener_team, mock_bot + ): + """Buttons should be labeled 'Card 1', 'Card 2', etc.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + labels = [c.label for c in view.children if isinstance(c, discord.ui.Button)] + expected = [f"Card {i + 1}" for i in range(len(sample_cards))] + assert labels == expected + + @pytest.mark.asyncio + async def test_buttons_are_secondary_style( + self, sample_cards, opener_team, mock_bot + ): + """All buttons should start with the gray/secondary style (face-down).""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + for btn in view.children: + if isinstance(btn, discord.ui.Button): + assert btn.style == discord.ButtonStyle.secondary + + @pytest.mark.asyncio + async def test_initial_state_is_clean(self, sample_cards, opener_team, mock_bot): + """Claims, scouted_users, and processing_users should all start empty.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + assert view.claims == {} + assert view.scouted_users == set() + assert view.processing_users == set() + assert view.total_scouts == 0 + + @pytest.mark.asyncio + async def test_timeout_is_30_minutes(self, sample_cards, opener_team, mock_bot): + """The view timeout should be 1800 seconds (30 minutes).""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + assert view.timeout == 1800.0 + + +# --------------------------------------------------------------------------- +# ScoutButton callback — guard rails +# --------------------------------------------------------------------------- + + +class TestScoutButtonGuards: + """Tests for the access control checks in ScoutButton.callback.""" + + def _make_view(self, sample_cards, opener_team, mock_bot): + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + return view + + @pytest.mark.asyncio + async def test_opener_blocked(self, sample_cards, opener_team, mock_bot): + """The pack opener should be rejected with an ephemeral message.""" + view = self._make_view(sample_cards, opener_team, mock_bot) + button = view.children[0] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.user = Mock() + interaction.user.id = 99999 # same as opener + + await button.callback(interaction) + + interaction.response.send_message.assert_called_once() + call_kwargs = interaction.response.send_message.call_args[1] + assert call_kwargs["ephemeral"] is True + assert "own pack" in interaction.response.send_message.call_args[0][0].lower() + + @pytest.mark.asyncio + async def test_already_scouted_blocked(self, sample_cards, opener_team, mock_bot): + """A user who already scouted this pack should be rejected.""" + view = self._make_view(sample_cards, opener_team, mock_bot) + view.scouted_users.add(12345) + button = view.children[0] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await button.callback(interaction) + + interaction.response.send_message.assert_called_once() + assert ( + "already scouted" + in interaction.response.send_message.call_args[0][0].lower() + ) + + @pytest.mark.asyncio + async def test_double_click_silently_ignored( + self, sample_cards, opener_team, mock_bot + ): + """If a user is already being processed, the click should be silently dropped.""" + view = self._make_view(sample_cards, opener_team, mock_bot) + view.processing_users.add(12345) + button = view.children[0] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.user = Mock() + interaction.user.id = 12345 + + await button.callback(interaction) + + # Should not have called defer or send_message + interaction.response.defer.assert_not_called() + + +# --------------------------------------------------------------------------- +# ScoutButton callback — successful scout flow +# --------------------------------------------------------------------------- + + +class TestScoutButtonSuccess: + """Tests for the happy-path scout claim flow.""" + + def _make_view_with_message(self, sample_cards, opener_team, mock_bot): + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + return view + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_successful_scout_creates_card_copy( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """A valid scout should POST a scout_claim, consume a token, and create a card copy.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.response.send_message = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + button = view.children[0] + await button.callback(interaction) + + # Should have deferred + interaction.response.defer.assert_called_once_with(ephemeral=True) + + # db_post should be called 3 times: scout_claims, rewards, cards + assert mock_db_post.call_count == 3 + + # Verify scout_claims POST + claim_call = mock_db_post.call_args_list[0] + assert claim_call[0][0] == "scout_claims" + + # Verify rewards POST (token consumption) + reward_call = mock_db_post.call_args_list[1] + assert reward_call[0][0] == "rewards" + assert reward_call[1]["payload"]["name"] == "Scout Token" + + # Verify cards POST (card copy) + card_call = mock_db_post.call_args_list[2] + assert card_call[0][0] == "cards" + + # User should be marked as scouted + assert 12345 in view.scouted_users + assert view.total_scouts == 1 + + # Ephemeral follow-up with card details + interaction.followup.send.assert_called() + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_no_team_rejects( + self, + mock_get_team, + mock_db_post, + sample_cards, + opener_team, + mock_bot, + ): + """A user without a PD team should be rejected with an ephemeral message.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_team.return_value = None + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + button = view.children[0] + await button.callback(interaction) + + interaction.followup.send.assert_called_once() + msg = interaction.followup.send.call_args[0][0] + assert "team" in msg.lower() + assert mock_db_post.call_count == 0 + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_out_of_tokens_rejects( + self, + mock_get_team, + mock_get_tokens, + mock_db_post, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """A user who has used all daily tokens should be rejected.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = SCOUT_TOKENS_PER_DAY # all used + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + button = view.children[0] + await button.callback(interaction) + + interaction.followup.send.assert_called_once() + msg = interaction.followup.send.call_args[0][0] + assert "out of scout tokens" in msg.lower() + assert mock_db_post.call_count == 0 + + +# --------------------------------------------------------------------------- +# Multi-scout behavior +# --------------------------------------------------------------------------- + + +class TestMultiScout: + """Tests for the multi-scout-per-card design. + + Any card can be scouted by multiple different players, but each player + can only scout one card per pack. + """ + + def _make_view_with_message(self, sample_cards, opener_team, mock_bot): + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + return view + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_two_users_can_scout_same_card( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + scouter_team_2, + mock_bot, + ): + """Two different users should both be able to scout the same card.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + button = view.children[0] # both pick the same card + + # First scouter + mock_get_team.return_value = scouter_team + interaction1 = AsyncMock(spec=discord.Interaction) + interaction1.response = AsyncMock() + interaction1.response.defer = AsyncMock() + interaction1.followup = AsyncMock() + interaction1.followup.send = AsyncMock() + interaction1.user = Mock() + interaction1.user.id = 11111 + + await button.callback(interaction1) + assert 11111 in view.scouted_users + assert view.total_scouts == 1 + + # Second scouter — same card + mock_get_team.return_value = scouter_team_2 + interaction2 = AsyncMock(spec=discord.Interaction) + interaction2.response = AsyncMock() + interaction2.response.defer = AsyncMock() + interaction2.followup = AsyncMock() + interaction2.followup.send = AsyncMock() + interaction2.user = Mock() + interaction2.user.id = 22222 + + await button.callback(interaction2) + assert 22222 in view.scouted_users + assert view.total_scouts == 2 + + # Claims should track both teams under the same player_id + player_id = sample_cards[0]["player"]["player_id"] + assert player_id in view.claims + assert len(view.claims[player_id]) == 2 + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_same_user_cannot_scout_twice( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """The same user should be blocked from scouting a second card.""" + view = self._make_view_with_message(sample_cards, opener_team, mock_bot) + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + # First scout succeeds + interaction1 = AsyncMock(spec=discord.Interaction) + interaction1.response = AsyncMock() + interaction1.response.defer = AsyncMock() + interaction1.followup = AsyncMock() + interaction1.followup.send = AsyncMock() + interaction1.user = Mock() + interaction1.user.id = 12345 + + await view.children[0].callback(interaction1) + assert view.total_scouts == 1 + + # Second scout by same user is blocked + interaction2 = AsyncMock(spec=discord.Interaction) + interaction2.response = AsyncMock() + interaction2.response.send_message = AsyncMock() + interaction2.user = Mock() + interaction2.user.id = 12345 + + await view.children[1].callback(interaction2) + + interaction2.response.send_message.assert_called_once() + assert ( + "already scouted" + in interaction2.response.send_message.call_args[0][0].lower() + ) + assert view.total_scouts == 1 # unchanged + + @pytest.mark.asyncio + async def test_buttons_never_disabled_after_scout( + self, sample_cards, opener_team, mock_bot + ): + """All buttons should remain enabled regardless of how many scouts happen. + + This verifies the 'unlimited scouts per card' design — buttons + only disable on timeout, not on individual claims. + """ + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + # Simulate claims on every card + for card in sample_cards: + pid = card["player"]["player_id"] + view.claims[pid] = ["Team A", "Team B"] + + for btn in view.children: + if isinstance(btn, discord.ui.Button): + assert not btn.disabled + + +# --------------------------------------------------------------------------- +# ScoutView.on_timeout +# --------------------------------------------------------------------------- + + +class TestScoutViewTimeout: + """Tests for the timeout handler that closes the scout window.""" + + @pytest.mark.asyncio + async def test_timeout_disables_all_buttons( + self, sample_cards, opener_team, mock_bot + ): + """After timeout, every button should be disabled.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + await view.on_timeout() + + for btn in view.children: + if isinstance(btn, discord.ui.Button): + assert btn.disabled + + @pytest.mark.asyncio + async def test_timeout_updates_embed_title( + self, sample_cards, opener_team, mock_bot + ): + """The embed title should change to 'Scout Window Closed' on timeout.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + await view.on_timeout() + + view.message.edit.assert_called_once() + call_kwargs = view.message.edit.call_args[1] + embed = call_kwargs["embed"] + assert "closed" in embed.title.lower() + + @pytest.mark.asyncio + async def test_timeout_with_scouts_shows_count( + self, sample_cards, opener_team, mock_bot + ): + """When there were scouts, the closed title should include the count.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.total_scouts = 5 + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + await view.on_timeout() + + embed = view.message.edit.call_args[1]["embed"] + assert "5" in embed.title + + @pytest.mark.asyncio + async def test_timeout_without_message_is_safe( + self, sample_cards, opener_team, mock_bot + ): + """Timeout should not crash if the message reference is None.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.message = None + + # Should not raise + await view.on_timeout() + + +# --------------------------------------------------------------------------- +# Processing user cleanup +# --------------------------------------------------------------------------- + + +class TestProcessingUserCleanup: + """Verify the processing_users set is cleaned up in all code paths.""" + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_processing_cleared_on_success( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """After a successful scout, the user should be removed from processing_users.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + assert 12345 not in view.processing_users + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_processing_cleared_on_claim_db_failure( + self, + mock_get_team, + mock_get_tokens, + mock_db_post, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """If db_post('scout_claims') raises, processing_users should still be cleared.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_post.side_effect = Exception("DB down") + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + assert 12345 not in view.processing_users + # Scout should not have been recorded + assert view.total_scouts == 0 + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_processing_cleared_on_no_team( + self, + mock_get_team, + sample_cards, + opener_team, + mock_bot, + ): + """If the user has no team, they should still be removed from processing_users.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + mock_get_team.return_value = None + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + assert 12345 not in view.processing_users + + +# --------------------------------------------------------------------------- +# db_get("current") fallback +# --------------------------------------------------------------------------- + + +class TestCurrentSeasonFallback: + """Tests for the fallback when db_get('current') returns None.""" + + @pytest.mark.asyncio + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_current_returns_none_uses_fallback( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """When db_get('current') returns None, rewards should use PD_SEASON fallback.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = None # db_get("current") returns None + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await view.children[0].callback(interaction) + + # Should still complete successfully + assert view.total_scouts == 1 + assert 12345 in view.scouted_users + + # Verify the rewards POST used fallback values + from helpers.constants import PD_SEASON + + reward_call = mock_db_post.call_args_list[1] + assert reward_call[1]["payload"]["season"] == PD_SEASON + assert reward_call[1]["payload"]["week"] == 1 + + +# --------------------------------------------------------------------------- +# Shiny scout notification +# --------------------------------------------------------------------------- + + +class TestShinyScoutNotification: + """Tests for the rare-card notification path (rarity >= 5).""" + + @pytest.mark.asyncio + @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_shiny_card_sends_notification( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + mock_send_to_channel, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """Scouting a card with rarity >= 5 should post to #pd-network-news.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, # card 0 is MVP (rarity 5) + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + # Card 0 is MVP (rarity value 5) — should trigger notification + await view.children[0].callback(interaction) + + mock_send_to_channel.assert_called_once() + call_args = mock_send_to_channel.call_args + assert call_args[0][1] == "pd-network-news" + + @pytest.mark.asyncio + @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_non_shiny_card_no_notification( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + mock_send_to_channel, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """Scouting a card with rarity < 5 should NOT post a notification.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, # card 2 is Starter (rarity 2) + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + # Card 2 is Starter (rarity value 2) — no notification + await view.children[2].callback(interaction) + + mock_send_to_channel.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) + @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) + @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) + async def test_shiny_notification_failure_does_not_crash( + self, + mock_get_team, + mock_get_tokens, + mock_db_get, + mock_db_post, + mock_card_embeds, + mock_send_to_channel, + sample_cards, + opener_team, + scouter_team, + mock_bot, + ): + """If sending the shiny notification fails, the scout should still succeed.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock() + + mock_get_team.return_value = scouter_team + mock_get_tokens.return_value = 0 + mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") + mock_db_post.return_value = {"id": 100} + mock_card_embeds.return_value = [Mock(spec=discord.Embed)] + mock_send_to_channel.side_effect = Exception("Channel not found") + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + # Should not raise even though notification fails + await view.children[0].callback(interaction) + + # Scout should still complete + assert view.total_scouts == 1 + assert 12345 in view.scouted_users + + +# --------------------------------------------------------------------------- +# update_message edge cases +# --------------------------------------------------------------------------- + + +class TestUpdateMessage: + """Tests for ScoutView.update_message edge cases.""" + + @pytest.mark.asyncio + async def test_update_message_with_no_message_is_noop( + self, sample_cards, opener_team, mock_bot + ): + """update_message should silently return if self.message is None.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = None + + # Should not raise + await view.update_message() + + @pytest.mark.asyncio + async def test_update_message_edit_failure_is_caught( + self, sample_cards, opener_team, mock_bot + ): + """If message.edit raises, it should be caught and logged, not re-raised.""" + view = ScoutView( + scout_opp_id=1, + cards=sample_cards, + opener_team=opener_team, + opener_user_id=99999, + bot=mock_bot, + ) + view.card_lines = [ + (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) + ] + view.message = AsyncMock(spec=discord.Message) + view.message.edit = AsyncMock( + side_effect=discord.HTTPException(Mock(status=500), "Server error") + ) + + # Should not raise + await view.update_message() diff --git a/tests/scouting/test_scouting_cog.py b/tests/scouting/test_scouting_cog.py new file mode 100644 index 0000000..5bca155 --- /dev/null +++ b/tests/scouting/test_scouting_cog.py @@ -0,0 +1,269 @@ +"""Tests for cogs/economy_new/scouting.py — the Scouting cog. + +Covers the /scout-tokens command and the cleanup_expired background task. + +Note: Scouting.__init__ calls self.cleanup_expired.start() which requires +a running event loop. All tests that instantiate the cog must be async. +""" + +import datetime + +import pytest +from unittest.mock import AsyncMock, MagicMock, Mock, patch + +import discord +from discord.ext import commands + +from cogs.economy_new.scouting import Scouting, SCOUT_TOKENS_PER_DAY + + +def _make_team(): + return { + "id": 1, + "lname": "Test Team", + "color": "a6ce39", + "logo": "https://example.com/logo.png", + "season": 4, + } + + +# --------------------------------------------------------------------------- +# Cog setup +# --------------------------------------------------------------------------- + + +class TestScoutingCogSetup: + """Tests for cog initialization and lifecycle.""" + + @pytest.mark.asyncio + async def test_cog_initializes(self, mock_bot): + """The Scouting cog should initialize without errors.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + assert cog.bot is mock_bot + + @pytest.mark.asyncio + async def test_cleanup_task_starts(self, mock_bot): + """The cleanup_expired loop task should be started on init.""" + cog = Scouting(mock_bot) + assert cog.cleanup_expired.is_running() + cog.cleanup_expired.cancel() + + @pytest.mark.asyncio + async def test_cog_unload_calls_cancel(self, mock_bot): + """Unloading the cog should call cancel on the cleanup task.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + # Verify cog_unload runs without error + await cog.cog_unload() + + +# --------------------------------------------------------------------------- +# /scout-tokens command +# --------------------------------------------------------------------------- + + +class TestScoutTokensCommand: + """Tests for the /scout-tokens slash command.""" + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_shows_remaining_tokens( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """Should display the correct number of remaining tokens.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = 1 # 1 used today + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + interaction.response.defer.assert_called_once_with(ephemeral=True) + interaction.followup.send.assert_called_once() + + call_kwargs = interaction.followup.send.call_args[1] + embed = call_kwargs["embed"] + remaining = SCOUT_TOKENS_PER_DAY - 1 + assert str(remaining) in embed.description + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_no_team_rejects(self, mock_get_team, mock_get_tokens, mock_bot): + """A user without a PD team should get a rejection message.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = None + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + msg = interaction.followup.send.call_args[0][0] + assert "team" in msg.lower() + mock_get_tokens.assert_not_called() + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_all_tokens_used_shows_zero( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """When all tokens are used, should show 0 remaining with extra message.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = SCOUT_TOKENS_PER_DAY + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + assert "0" in embed.description + assert ( + "used all" in embed.description.lower() + or "tomorrow" in embed.description.lower() + ) + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_no_tokens_used_shows_full( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """When no tokens have been used, should show the full daily allowance.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = 0 + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + assert str(SCOUT_TOKENS_PER_DAY) in embed.description + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_db_get_returns_none(self, mock_get_team, mock_get_tokens, mock_bot): + """If get_scout_tokens_used returns 0 (API failure handled internally), should show full tokens.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = ( + 0 # get_scout_tokens_used handles None internally + ) + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + assert str(SCOUT_TOKENS_PER_DAY) in embed.description + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.get_scout_tokens_used", new_callable=AsyncMock) + @patch("cogs.economy_new.scouting.get_team_by_owner", new_callable=AsyncMock) + async def test_over_limit_tokens_shows_zero( + self, mock_get_team, mock_get_tokens, mock_bot + ): + """If somehow more tokens than the daily limit were used, should show 0 not negative.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_get_team.return_value = _make_team() + mock_get_tokens.return_value = 5 # more than SCOUT_TOKENS_PER_DAY + + interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.defer = AsyncMock() + interaction.followup = AsyncMock() + interaction.followup.send = AsyncMock() + interaction.user = Mock() + interaction.user.id = 12345 + + await cog.scout_tokens_command.callback(cog, interaction) + + embed = interaction.followup.send.call_args[1]["embed"] + # Should show "0" not "-3" + assert "0" in embed.description + assert "-" not in embed.description.split("remaining")[0] + + +# --------------------------------------------------------------------------- +# cleanup_expired task +# --------------------------------------------------------------------------- + + +class TestCleanupExpired: + """Tests for the background cleanup task.""" + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.db_get", new_callable=AsyncMock) + async def test_cleanup_logs_expired_opportunities(self, mock_db_get, mock_bot): + """The cleanup task should query for expired unclaimed opportunities.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_db_get.return_value = {"count": 3} + + # Call the coroutine directly (not via the loop) + await cog.cleanup_expired.coro(cog) + + mock_db_get.assert_called_once() + call_args = mock_db_get.call_args + assert call_args[0][0] == "scout_opportunities" + + @pytest.mark.asyncio + @patch("cogs.economy_new.scouting.db_get", new_callable=AsyncMock) + async def test_cleanup_handles_api_failure(self, mock_db_get, mock_bot): + """Cleanup should not crash if the API is unavailable.""" + cog = Scouting(mock_bot) + cog.cleanup_expired.cancel() + + mock_db_get.side_effect = Exception("API not ready") + + # Should not raise + await cog.cleanup_expired.coro(cog) diff --git a/tests/scouting/test_scouting_helpers.py b/tests/scouting/test_scouting_helpers.py new file mode 100644 index 0000000..dc635da --- /dev/null +++ b/tests/scouting/test_scouting_helpers.py @@ -0,0 +1,374 @@ +"""Tests for helpers/scouting.py — embed builders and scout opportunity creation. + +Covers the pure functions (_build_card_lines, build_scout_embed, +build_scouted_card_list) and the async create_scout_opportunity flow. +""" + +import pytest +from unittest.mock import AsyncMock, MagicMock, Mock, patch + +import discord + +from helpers.scouting import ( + _build_card_lines, + build_scout_embed, + build_scouted_card_list, + create_scout_opportunity, + RARITY_SYMBOLS, +) + +# --------------------------------------------------------------------------- +# _build_card_lines +# --------------------------------------------------------------------------- + + +class TestBuildCardLines: + """Tests for the shuffled card line builder.""" + + def test_returns_correct_count(self, sample_cards): + """Should produce one line per card in the pack.""" + lines = _build_card_lines(sample_cards) + assert len(lines) == len(sample_cards) + + def test_each_line_contains_player_id(self, sample_cards): + """Each tuple's first element should be the player_id from the card.""" + lines = _build_card_lines(sample_cards) + ids = {pid for pid, _ in lines} + expected_ids = {c["player"]["player_id"] for c in sample_cards} + assert ids == expected_ids + + def test_each_line_contains_player_name(self, sample_cards): + """The display string should include the player's name.""" + lines = _build_card_lines(sample_cards) + for pid, display in lines: + card = next(c for c in sample_cards if c["player"]["player_id"] == pid) + assert card["player"]["p_name"] in display + + def test_each_line_contains_rarity_name(self, sample_cards): + """The display string should include the rarity tier name.""" + lines = _build_card_lines(sample_cards) + for pid, display in lines: + card = next(c for c in sample_cards if c["player"]["player_id"] == pid) + assert card["player"]["rarity"]["name"] in display + + def test_rarity_symbol_present(self, sample_cards): + """Each line should start with the appropriate rarity emoji.""" + lines = _build_card_lines(sample_cards) + for pid, display in lines: + card = next(c for c in sample_cards if c["player"]["player_id"] == pid) + rarity_val = card["player"]["rarity"]["value"] + expected_symbol = RARITY_SYMBOLS.get(rarity_val, "\u26ab") + assert display.startswith(expected_symbol) + + def test_output_is_shuffled(self, sample_cards): + """Over many runs, the order should not always match the input order. + + We run 20 iterations — if it comes out sorted every time, the shuffle + is broken (probability ~1/20! per run, effectively zero). + """ + input_order = [c["player"]["player_id"] for c in sample_cards] + saw_different = False + for _ in range(20): + lines = _build_card_lines(sample_cards) + output_order = [pid for pid, _ in lines] + if output_order != input_order: + saw_different = True + break + assert saw_different, "Card lines were never shuffled across 20 runs" + + def test_empty_cards(self): + """Empty input should produce an empty list.""" + assert _build_card_lines([]) == [] + + def test_unknown_rarity_uses_fallback_symbol(self): + """A rarity value not in RARITY_SYMBOLS should get the black circle fallback.""" + card = { + "id": 99, + "player": { + "player_id": 999, + "p_name": "Unknown Rarity", + "rarity": {"name": "Legendary", "value": 99, "color": "gold"}, + }, + } + lines = _build_card_lines([card]) + assert lines[0][1].startswith("\u26ab") # black circle fallback + + +# --------------------------------------------------------------------------- +# build_scout_embed +# --------------------------------------------------------------------------- + + +class TestBuildScoutEmbed: + """Tests for the embed builder shown above scout buttons.""" + + def test_returns_embed_and_card_lines(self, opener_team, sample_cards): + """Should return a (discord.Embed, list) tuple.""" + embed, card_lines = build_scout_embed(opener_team, sample_cards) + assert isinstance(embed, discord.Embed) + assert isinstance(card_lines, list) + assert len(card_lines) == len(sample_cards) + + def test_embed_description_contains_team_name(self, opener_team, sample_cards): + """The embed body should mention the opener's team name.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + assert opener_team["lname"] in embed.description + + def test_embed_description_contains_all_player_names( + self, opener_team, sample_cards + ): + """Every player name from the pack should appear in the embed.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + for card in sample_cards: + assert card["player"]["p_name"] in embed.description + + def test_embed_mentions_token_cost(self, opener_team, sample_cards): + """The embed should tell users about the scout token cost.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + assert "Scout Token" in embed.description + + def test_embed_mentions_time_limit(self, opener_team, sample_cards): + """The embed should mention the 30-minute window.""" + embed, _ = build_scout_embed(opener_team, sample_cards) + assert "30 minutes" in embed.description + + def test_prebuilt_card_lines_are_reused(self, opener_team, sample_cards): + """When card_lines are passed in, they should be reused (not rebuilt).""" + prebuilt = [(101, "Custom Line 1"), (102, "Custom Line 2")] + embed, returned_lines = build_scout_embed( + opener_team, sample_cards, card_lines=prebuilt + ) + assert returned_lines is prebuilt + assert "Custom Line 1" in embed.description + assert "Custom Line 2" in embed.description + + +# --------------------------------------------------------------------------- +# build_scouted_card_list +# --------------------------------------------------------------------------- + + +class TestBuildScoutedCardList: + """Tests for the card list formatter that marks scouted cards.""" + + def test_no_scouts_returns_plain_lines(self): + """With no scouts, output should match the raw card lines.""" + card_lines = [ + (101, "\U0001f7e3 MVP — Mike Trout"), + (102, "\U0001f535 All-Star — Juan Soto"), + ] + result = build_scouted_card_list(card_lines, {}) + assert result == "\U0001f7e3 MVP — Mike Trout\n\U0001f535 All-Star — Juan Soto" + + def test_single_scout_shows_team_name(self): + """A card scouted once should show a checkmark and the team name.""" + card_lines = [ + (101, "\U0001f7e3 MVP — Mike Trout"), + (102, "\U0001f535 All-Star — Juan Soto"), + ] + scouted = {101: ["Scouting Squad"]} + result = build_scouted_card_list(card_lines, scouted) + assert "\u2714\ufe0f" in result # checkmark + assert "*Scouting Squad*" in result + # Unscouted card should appear plain + lines = result.split("\n") + assert "\u2714" not in lines[1] + + def test_multiple_scouts_shows_count_and_names(self): + """A card scouted multiple times should show the count and all team names.""" + card_lines = [(101, "\U0001f7e3 MVP — Mike Trout")] + scouted = {101: ["Team A", "Team B", "Team C"]} + result = build_scouted_card_list(card_lines, scouted) + assert "x3" in result + assert "*Team A*" in result + assert "*Team B*" in result + assert "*Team C*" in result + + def test_mixed_scouted_and_unscouted(self): + """Only scouted cards should have marks; unscouted cards stay plain.""" + card_lines = [ + (101, "Line A"), + (102, "Line B"), + (103, "Line C"), + ] + scouted = {102: ["Some Team"]} + result = build_scouted_card_list(card_lines, scouted) + lines = result.split("\n") + assert "\u2714" not in lines[0] + assert "\u2714" in lines[1] + assert "\u2714" not in lines[2] + + def test_empty_input(self): + """Empty card lines should produce an empty string.""" + assert build_scouted_card_list([], {}) == "" + + def test_two_scouts_shows_count(self): + """Two scouts on the same card should show x2.""" + card_lines = [(101, "Line A")] + scouted = {101: ["Team X", "Team Y"]} + result = build_scouted_card_list(card_lines, scouted) + assert "x2" in result + + +# --------------------------------------------------------------------------- +# create_scout_opportunity +# --------------------------------------------------------------------------- + + +class TestCreateScoutOpportunity: + """Tests for the async scout opportunity creation flow.""" + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_posts_to_api_and_sends_message( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """Should POST to scout_opportunities and send a message to the channel.""" + mock_db_post.return_value = {"id": 42} + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + # API was called to create the opportunity + mock_db_post.assert_called_once() + call_args = mock_db_post.call_args + assert call_args[0][0] == "scout_opportunities" + assert call_args[1]["payload"]["opener_team_id"] == opener_team["id"] + + # Message was sent to the channel + mock_channel.send.assert_called_once() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_skips_wrong_channel( + self, mock_db_post, sample_cards, opener_team, mock_bot + ): + """Should silently return when the channel is not #pack-openings.""" + channel = AsyncMock(spec=discord.TextChannel) + channel.name = "general" + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, channel, opener_user, context + ) + + mock_db_post.assert_not_called() + channel.send.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_skips_empty_pack( + self, mock_db_post, opener_team, mock_channel, mock_bot + ): + """Should silently return when pack_cards is empty.""" + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + [], opener_team, mock_channel, opener_user, context + ) + + mock_db_post.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_skips_none_channel( + self, mock_db_post, sample_cards, opener_team, mock_bot + ): + """Should handle None channel without crashing.""" + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, None, opener_user, context + ) + + mock_db_post.assert_not_called() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_api_failure_does_not_raise( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """Scout creation failure must never crash the pack opening flow.""" + mock_db_post.side_effect = Exception("API down") + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + # Should not raise + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_channel_send_failure_does_not_raise( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """If the channel.send fails, it should be caught gracefully.""" + mock_db_post.return_value = {"id": 42} + mock_channel.send.side_effect = discord.HTTPException( + Mock(status=500), "Server error" + ) + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + # Should not raise + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_context_client_fallback( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """When context.bot is None, should fall back to context.client for the bot ref.""" + mock_db_post.return_value = {"id": 42} + opener_user = Mock() + opener_user.id = 99999 + context = Mock(spec=[]) # empty spec — no .bot attribute + context.client = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) + + mock_channel.send.assert_called_once() + + @pytest.mark.asyncio + @patch("helpers.scouting.db_post", new_callable=AsyncMock) + async def test_view_message_is_assigned( + self, mock_db_post, sample_cards, opener_team, mock_channel, mock_bot + ): + """The message returned by channel.send should be assigned to view.message. + + This linkage is required for update_message and on_timeout to work. + """ + mock_db_post.return_value = {"id": 42} + sent_msg = AsyncMock(spec=discord.Message) + mock_channel.send.return_value = sent_msg + opener_user = Mock() + opener_user.id = 99999 + context = Mock() + context.bot = mock_bot + + await create_scout_opportunity( + sample_cards, opener_team, mock_channel, opener_user, context + ) -- 2.25.1 From d569e9190507bdbc0ea1603e2976f8935d19f724 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Wed, 4 Mar 2026 19:39:43 -0600 Subject: [PATCH 03/12] =?UTF-8?q?fix:=20Address=20PR=20review=20findings?= =?UTF-8?q?=20=E2=80=94=20two=20bugs=20and=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix int_timestamp() no-arg path returning seconds instead of milliseconds, which would silently break the daily scout token cap against the real API - Acknowledge double-click interactions with ephemeral message instead of silently returning (Discord requires all interactions to be acked) - Reorder scout flow: create card copy before consuming token so a failure doesn't cost the player a token for nothing - Move build_scouted_card_list import to top of scout_view.py - Remove unused asyncio import from helpers/scouting.py - Fix footer text inconsistency ("One scout per player" everywhere) - Update tests for new operation order and double-click behavior Co-Authored-By: Claude Opus 4.6 --- discord_ui/scout_view.py | 39 ++++++++++++++++++------------- helpers/scouting.py | 3 +-- helpers/utils.py | 11 +++++---- tests/scouting/test_scout_view.py | 31 +++++++++++++++--------- 4 files changed, 51 insertions(+), 33 deletions(-) diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 11ce77a..0d5a12f 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -13,7 +13,11 @@ import discord from api_calls import db_get, db_post from helpers.main import get_team_by_owner, get_card_embeds -from helpers.scouting import SCOUT_TOKENS_PER_DAY, get_scout_tokens_used +from helpers.scouting import ( + SCOUT_TOKENS_PER_DAY, + build_scouted_card_list, + get_scout_tokens_used, +) from helpers.utils import int_timestamp from helpers.discord_utils import get_team_embed from helpers.constants import IMAGES, PD_SEASON @@ -72,8 +76,6 @@ class ScoutView(discord.ui.View): if not self.message: return - from helpers.scouting import build_scouted_card_list - card_list = build_scouted_card_list(self.card_lines, self.claims) title = f"Scout Opportunity! ({self.total_scouts} scouted)" @@ -163,6 +165,10 @@ class ScoutButton(discord.ui.Button): # Prevent double-click race for same user if interaction.user.id in view.processing_users: + await interaction.response.send_message( + "Your scout is already being processed!", + ephemeral=True, + ) return view.processing_users.add(interaction.user.id) @@ -206,6 +212,20 @@ class ScoutButton(discord.ui.Button): ) return + # Create a copy of the card for the scouter (before consuming token + # so a failure here doesn't cost the player a token for nothing) + await db_post( + "cards", + payload={ + "cards": [ + { + "player_id": self.card["player"]["player_id"], + "team_id": scouter_team["id"], + } + ], + }, + ) + # Consume a scout token current = await db_get("current") await db_post( @@ -219,19 +239,6 @@ class ScoutButton(discord.ui.Button): }, ) - # Create a copy of the card for the scouter - await db_post( - "cards", - payload={ - "cards": [ - { - "player_id": self.card["player"]["player_id"], - "team_id": scouter_team["id"], - } - ], - }, - ) - # Track the claim player_id = self.card["player"]["player_id"] if player_id not in view.claims: diff --git a/helpers/scouting.py b/helpers/scouting.py index ab2d2c2..a21b9f9 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -5,7 +5,6 @@ Handles creation of scout opportunities after pack openings and embed formatting for the scouting feature. """ -import asyncio import datetime import logging import random @@ -95,7 +94,7 @@ def build_scout_embed( f"{time_line}" ) embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON} \u2022 One player per pack", + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", icon_url=IMAGES["logo"], ) return embed, card_lines diff --git a/helpers/utils.py b/helpers/utils.py index 7535bf7..8b091ab 100644 --- a/helpers/utils.py +++ b/helpers/utils.py @@ -11,10 +11,13 @@ import discord def int_timestamp(datetime_obj: Optional[datetime.datetime] = None): - """Convert current datetime to integer timestamp.""" - if datetime_obj: - return int(datetime.datetime.timestamp(datetime_obj) * 1000) - return int(datetime.datetime.now().timestamp()) + """Convert a datetime to an integer millisecond timestamp. + + If no argument is given, uses the current time. + """ + if datetime_obj is None: + datetime_obj = datetime.datetime.now() + return int(datetime.datetime.timestamp(datetime_obj) * 1000) def midnight_timestamp() -> int: diff --git a/tests/scouting/test_scout_view.py b/tests/scouting/test_scout_view.py index 10853a0..906bb97 100644 --- a/tests/scouting/test_scout_view.py +++ b/tests/scouting/test_scout_view.py @@ -162,19 +162,26 @@ class TestScoutButtonGuards: async def test_double_click_silently_ignored( self, sample_cards, opener_team, mock_bot ): - """If a user is already being processed, the click should be silently dropped.""" + """If a user is already being processed, they should get an ephemeral rejection.""" view = self._make_view(sample_cards, opener_team, mock_bot) view.processing_users.add(12345) button = view.children[0] interaction = AsyncMock(spec=discord.Interaction) + interaction.response = AsyncMock() + interaction.response.send_message = AsyncMock() interaction.user = Mock() interaction.user.id = 12345 await button.callback(interaction) - # Should not have called defer or send_message - interaction.response.defer.assert_not_called() + interaction.response.send_message.assert_called_once() + call_kwargs = interaction.response.send_message.call_args[1] + assert call_kwargs["ephemeral"] is True + assert ( + "already being processed" + in interaction.response.send_message.call_args[0][0].lower() + ) # --------------------------------------------------------------------------- @@ -242,22 +249,22 @@ class TestScoutButtonSuccess: # Should have deferred interaction.response.defer.assert_called_once_with(ephemeral=True) - # db_post should be called 3 times: scout_claims, rewards, cards + # db_post should be called 3 times: scout_claims, cards, rewards assert mock_db_post.call_count == 3 # Verify scout_claims POST claim_call = mock_db_post.call_args_list[0] assert claim_call[0][0] == "scout_claims" - # Verify rewards POST (token consumption) - reward_call = mock_db_post.call_args_list[1] + # Verify cards POST (card copy — created before token consumption) + card_call = mock_db_post.call_args_list[1] + assert card_call[0][0] == "cards" + + # Verify rewards POST (token consumption — after card is safely created) + reward_call = mock_db_post.call_args_list[2] assert reward_call[0][0] == "rewards" assert reward_call[1]["payload"]["name"] == "Scout Token" - # Verify cards POST (card copy) - card_call = mock_db_post.call_args_list[2] - assert card_call[0][0] == "cards" - # User should be marked as scouted assert 12345 in view.scouted_users assert view.total_scouts == 1 @@ -797,9 +804,11 @@ class TestCurrentSeasonFallback: assert 12345 in view.scouted_users # Verify the rewards POST used fallback values + # Order: scout_claims (0), cards (1), rewards (2) from helpers.constants import PD_SEASON - reward_call = mock_db_post.call_args_list[1] + reward_call = mock_db_post.call_args_list[2] + assert reward_call[0][0] == "rewards" assert reward_call[1]["payload"]["season"] == PD_SEASON assert reward_call[1]["payload"]["week"] == 1 -- 2.25.1 From 89f80727bd2655ac4eb65553ca119b766bb4674b Mon Sep 17 00:00:00 2001 From: cal Date: Thu, 5 Mar 2026 03:12:20 +0000 Subject: [PATCH 04/12] Update .gitea/workflows/docker-build.yml --- .gitea/workflows/docker-build.yml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index a4a0ceb..f286fc9 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -12,6 +12,7 @@ on: push: branches: - main + - next-release pull_request: branches: - main @@ -39,35 +40,25 @@ jobs: id: calver uses: cal/gitea-actions/calver@main - # Dev build: push with dev + dev-SHA tags (PR/feature branches) - - name: Build Docker image (dev) - if: github.ref != 'refs/heads/main' - uses: https://github.com/docker/build-push-action@v5 + - name: Resolve Docker tags + id: tags + uses: cal/gitea-actions/docker-tags@main with: - context: . - push: true - tags: | - manticorum67/paper-dynasty-discordapp:dev - manticorum67/paper-dynasty-discordapp:dev-${{ steps.calver.outputs.sha_short }} - cache-from: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache - cache-to: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache,mode=max + image: manticorum67/paper-dynasty-discordapp + version: ${{ steps.calver.outputs.version }} + sha_short: ${{ steps.calver.outputs.sha_short }} - # Production build: push with latest + CalVer tags (main only) - - name: Build Docker image (production) - if: github.ref == 'refs/heads/main' + - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v5 with: context: . push: true - tags: | - manticorum67/paper-dynasty-discordapp:latest - manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version }} - manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version_sha }} + tags: ${{ steps.tags.outputs.tags }} cache-from: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache cache-to: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache,mode=max - name: Tag release - if: success() && github.ref == 'refs/heads/main' + if: success() && steps.tags.outputs.channel == 'stable' uses: cal/gitea-actions/gitea-tag@main with: version: ${{ steps.calver.outputs.version }} @@ -96,7 +87,7 @@ jobs: fi - name: Discord Notification - Success - if: success() && github.ref == 'refs/heads/main' + if: success() && steps.tags.outputs.channel != 'dev' uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }} -- 2.25.1 From 75b9968149c7d8a178f3f638ed1239ded5f6e471 Mon Sep 17 00:00:00 2001 From: cal Date: Thu, 5 Mar 2026 03:15:37 +0000 Subject: [PATCH 05/12] Update .gitea/workflows/docker-build.yml --- .gitea/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index f286fc9..f409d19 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -99,7 +99,7 @@ jobs: timestamp: ${{ steps.calver.outputs.timestamp }} - name: Discord Notification - Failure - if: failure() && github.ref == 'refs/heads/main' + if: failure() && steps.tags.outputs.channel != 'dev' uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }} -- 2.25.1 From 0ce0707e3ead65396973a4033e239cd5e9372045 Mon Sep 17 00:00:00 2001 From: cal Date: Thu, 5 Mar 2026 03:16:36 +0000 Subject: [PATCH 06/12] Update .gitea/workflows/docker-build.yml --- .gitea/workflows/docker-build.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index f409d19..9fae8dc 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -68,23 +68,20 @@ jobs: run: | echo "## Docker Build Successful" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY + echo "**Channel:** \`${{ steps.tags.outputs.channel }}\`" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY echo "**Image Tags:**" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/paper-dynasty-discordapp:latest\`" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/paper-dynasty-discordapp:${{ steps.calver.outputs.version_sha }}\`" >> $GITHUB_STEP_SUMMARY + IFS=',' read -ra TAG_ARRAY <<< "${{ steps.tags.outputs.tags }}" + for tag in "${TAG_ARRAY[@]}"; do + echo "- \`${tag}\`" >> $GITHUB_STEP_SUMMARY + done echo "" >> $GITHUB_STEP_SUMMARY echo "**Build Details:**" >> $GITHUB_STEP_SUMMARY echo "- Branch: \`${{ steps.calver.outputs.branch }}\`" >> $GITHUB_STEP_SUMMARY echo "- Commit: \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY echo "- Timestamp: \`${{ steps.calver.outputs.timestamp }}\`" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - if [ "${{ github.ref }}" == "refs/heads/main" ]; then - echo "Pushed to Docker Hub!" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "Pull with: \`docker pull manticorum67/paper-dynasty-discordapp:latest\`" >> $GITHUB_STEP_SUMMARY - else - echo "_PR build - image not pushed to Docker Hub_" >> $GITHUB_STEP_SUMMARY - fi + echo "Pull with: \`docker pull manticorum67/paper-dynasty-discordapp:${{ steps.tags.outputs.primary_tag }}\`" >> $GITHUB_STEP_SUMMARY - name: Discord Notification - Success if: success() && steps.tags.outputs.channel != 'dev' -- 2.25.1 From ed00a97c0d66d44b8f0570dfc1bffd309ccd95f9 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Thu, 5 Mar 2026 15:57:25 -0600 Subject: [PATCH 07/12] fix: update owner_only to use Cal's correct Discord ID Co-Authored-By: Claude Opus 4.6 --- helpers/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/utils.py b/helpers/utils.py index 8b091ab..6b6185f 100644 --- a/helpers/utils.py +++ b/helpers/utils.py @@ -111,7 +111,8 @@ def get_player_url(team, player) -> str: def owner_only(ctx) -> bool: """Check if user is the bot owner.""" # ID for discord User Cal - owners = [287463767924137994, 1087936030899347516] + owners = [258104532423147520] + # owners += [287463767924137994, 1087936030899347516] # Handle both Context (has .author) and Interaction (has .user) objects user = getattr(ctx, "user", None) or getattr(ctx, "author", None) -- 2.25.1 From 77c3f3004c3788531373e4d9c3c66a833369865d Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 13:03:15 -0600 Subject: [PATCH 08/12] fix: align scouting rarity symbols with system colors Co-Authored-By: Claude Opus 4.6 --- helpers/scouting.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/helpers/scouting.py b/helpers/scouting.py index a21b9f9..421ec32 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -23,12 +23,12 @@ SCOUT_WINDOW_SECONDS = 1800 # 30 minutes # Rarity value → display symbol RARITY_SYMBOLS = { - 8: "\U0001f7e1", # HoF — yellow - 5: "\U0001f7e3", # MVP — purple - 3: "\U0001f535", # All-Star — blue - 2: "\U0001f7e2", # Starter — green - 1: "\u26aa", # Reserve — white - 0: "\u26ab", # Replacement — black + 8: "\U0001f7e3", # HoF — purple (#751cea) + 5: "\U0001f535", # MVP — cyan/blue (#56f1fa) + 3: "\U0001f7e1", # All-Star — gold (#FFD700) + 2: "\u26aa", # Starter — silver (#C0C0C0) + 1: "\U0001f7e4", # Reserve — bronze (#CD7F32) + 0: "\u26ab", # Replacement — dark gray (#454545) } -- 2.25.1 From 8e605c2140c5d696a54b9f2ada43860065e3a7df Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 13:22:45 -0600 Subject: [PATCH 09/12] fix: add pack_id to scouted card creation, enhance embed with card links MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Include pack_id in db_post("cards") payload (API requires it) - Player names now link to card image URLs in scout embed - Display format: "🟡 All-Star — [2023 Mike Trout](card_image_url)" Co-Authored-By: Claude Opus 4.6 --- discord_ui/scout_view.py | 1 + helpers/scouting.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 0d5a12f..83712e6 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -221,6 +221,7 @@ class ScoutButton(discord.ui.Button): { "player_id": self.card["player"]["player_id"], "team_id": scouter_team["id"], + "pack_id": self.card["pack"]["id"], } ], }, diff --git a/helpers/scouting.py b/helpers/scouting.py index 421ec32..6666b94 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -52,10 +52,17 @@ def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: player = card["player"] rarity_val = player["rarity"]["value"] symbol = RARITY_SYMBOLS.get(rarity_val, "\u26ab") + desc = player.get("description", "") + image_url = player.get("image", "") + name_display = ( + f"[{desc} {player['p_name']}]({image_url})" + if image_url + else f"{desc} {player['p_name']}" + ) lines.append( ( player["player_id"], - f"{symbol} {player['rarity']['name']} — {player['p_name']}", + f"{symbol} {player['rarity']['name']} — {name_display}", ) ) random.shuffle(lines) -- 2.25.1 From e160be4137794dd43523ae90dfb1b56b76827c71 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 18:47:52 -0600 Subject: [PATCH 10/12] fix: add missing pack, description, image fields to scouting test fixtures Co-Authored-By: Claude Opus 4.6 --- tests/scouting/conftest.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/scouting/conftest.py b/tests/scouting/conftest.py index 523e38f..22164fd 100644 --- a/tests/scouting/conftest.py +++ b/tests/scouting/conftest.py @@ -12,19 +12,29 @@ from discord.ext import commands # --------------------------------------------------------------------------- -def _make_player(player_id, name, rarity_name, rarity_value, headshot=None): +def _make_player( + player_id, + name, + rarity_name, + rarity_value, + headshot=None, + description="2023", + image=None, +): """Build a minimal player dict matching the API shape used by scouting.""" return { "player_id": player_id, "p_name": name, "rarity": {"name": rarity_name, "value": rarity_value, "color": "ffffff"}, "headshot": headshot or "https://example.com/headshot.jpg", + "description": description, + "image": image or f"https://example.com/cards/{player_id}/battingcard.png", } -def _make_card(card_id, player): +def _make_card(card_id, player, pack_id=100): """Wrap a player dict inside a card dict (as returned by the cards API).""" - return {"id": card_id, "player": player} + return {"id": card_id, "player": player, "pack": {"id": pack_id}} @pytest.fixture -- 2.25.1 From da55cbe4d49488540ad9c0b46185a1b38583107f Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 6 Mar 2026 21:12:46 -0600 Subject: [PATCH 11/12] feat: limit scouting to Standard/Premium packs, simplify scout view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add SCOUTABLE_PACK_TYPES env var (default: Standard,Premium) to control which pack types offer scout opportunities - Unify embed construction into build_scout_embed() — removes 3 near-duplicate embed builders across scout_view.py and scouting.py - Replace manual total_scouts counter with derived property from claims dict - Remove redundant db_get("current") API call per scout click — use PD_SEASON - Remove duplicate expiry computation in create_scout_opportunity - Move send_to_channel to top-level import, remove redundant local import - Update tests to match simplified code Co-Authored-By: Claude Opus 4.6 --- discord_ui/scout_view.py | 66 ++++++++----------------- helpers/main.py | 18 ++++--- helpers/scouting.py | 81 ++++++++++++++++++++++--------- tests/scouting/test_scout_view.py | 47 +++++------------- 4 files changed, 99 insertions(+), 113 deletions(-) diff --git a/discord_ui/scout_view.py b/discord_ui/scout_view.py index 83712e6..a5a64ba 100644 --- a/discord_ui/scout_view.py +++ b/discord_ui/scout_view.py @@ -11,15 +11,15 @@ import logging import discord -from api_calls import db_get, db_post +from api_calls import db_post from helpers.main import get_team_by_owner, get_card_embeds from helpers.scouting import ( SCOUT_TOKENS_PER_DAY, - build_scouted_card_list, + build_scout_embed, get_scout_tokens_used, ) from helpers.utils import int_timestamp -from helpers.discord_utils import get_team_embed +from helpers.discord_utils import get_team_embed, send_to_channel from helpers.constants import IMAGES, PD_SEASON logger = logging.getLogger("discord_app") @@ -60,8 +60,6 @@ class ScoutView(discord.ui.View): self.scouted_users: set[int] = set() # Users currently being processed (prevent double-click race) self.processing_users: set[int] = set() - # Total scout count - self.total_scouts = 0 for i, card in enumerate(cards): button = ScoutButton( @@ -71,30 +69,21 @@ class ScoutView(discord.ui.View): ) self.add_item(button) + @property + def total_scouts(self) -> int: + return sum(len(v) for v in self.claims.values()) + async def update_message(self): """Refresh the embed with current claim state.""" if not self.message: return - card_list = build_scouted_card_list(self.card_lines, self.claims) - - title = f"Scout Opportunity! ({self.total_scouts} scouted)" - embed = get_team_embed(title=title, team=self.opener_team) - if self.expires_unix: - time_line = f"Scout window closes ." - else: - time_line = "Scout window closes in **30 minutes**." - - embed.description = ( - f"**{self.opener_team['lname']}**'s pack\n\n" - f"{card_list}\n\n" - f"Pick a card — but which is which?\n" - f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" - f"{time_line}" - ) - embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", - icon_url=IMAGES["logo"], + embed, _ = build_scout_embed( + self.opener_team, + card_lines=self.card_lines, + expires_unix=self.expires_unix, + claims=self.claims, + total_scouts=self.total_scouts, ) try: @@ -109,22 +98,12 @@ class ScoutView(discord.ui.View): if self.message: try: - from helpers.scouting import build_scouted_card_list - - card_list = build_scouted_card_list(self.card_lines, self.claims) - - if self.total_scouts > 0: - title = f"Scout Window Closed ({self.total_scouts} scouted)" - else: - title = "Scout Window Closed" - - embed = get_team_embed(title=title, team=self.opener_team) - embed.description = ( - f"**{self.opener_team['lname']}**'s pack\n\n" f"{card_list}" - ) - embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON}", - icon_url=IMAGES["logo"], + embed, _ = build_scout_embed( + self.opener_team, + card_lines=self.card_lines, + claims=self.claims, + total_scouts=self.total_scouts, + closed=True, ) await self.message.edit(embed=embed, view=self) except Exception as e: @@ -228,14 +207,12 @@ class ScoutButton(discord.ui.Button): ) # Consume a scout token - current = await db_get("current") await db_post( "rewards", payload={ "name": "Scout Token", "team_id": scouter_team["id"], - "season": current["season"] if current else PD_SEASON, - "week": current["week"] if current else 1, + "season": PD_SEASON, "created": int_timestamp(), }, ) @@ -246,7 +223,6 @@ class ScoutButton(discord.ui.Button): view.claims[player_id] = [] view.claims[player_id].append(scouter_team["lname"]) view.scouted_users.add(interaction.user.id) - view.total_scouts += 1 # Update the shared embed await view.update_message() @@ -269,8 +245,6 @@ class ScoutButton(discord.ui.Button): # Notify for shiny scouts (rarity >= 5) if self.card["player"]["rarity"]["value"] >= 5: try: - from helpers.discord_utils import send_to_channel - notif_embed = get_team_embed(title="Rare Scout!", team=scouter_team) notif_embed.description = ( f"**{scouter_team['lname']}** scouted a " diff --git a/helpers/main.py b/helpers/main.py index 4dfc659..0b989a5 100644 --- a/helpers/main.py +++ b/helpers/main.py @@ -1770,15 +1770,17 @@ async def open_st_pr_packs(all_packs: list, team: dict, context): await context.channel.send(content=f"Let's head down to {pack_channel.mention}!") await display_cards(all_cards, team, pack_channel, author, pack_cover=pack_cover) - # Create scout opportunities for each pack - from helpers.scouting import create_scout_opportunity + # Create scout opportunities for each pack (Standard/Premium only) + from helpers.scouting import create_scout_opportunity, SCOUTABLE_PACK_TYPES - for p_id in pack_ids: - pack_cards = [c for c in all_cards if c.get("pack_id") == p_id] - if pack_cards: - await create_scout_opportunity( - pack_cards, team, pack_channel, author, context - ) + pack_type_name = all_packs[0].get("pack_type", {}).get("name") + if pack_type_name in SCOUTABLE_PACK_TYPES: + for p_id in pack_ids: + pack_cards = [c for c in all_cards if c.get("pack_id") == p_id] + if pack_cards: + await create_scout_opportunity( + pack_cards, team, pack_channel, author, context + ) if len(pack_ids) > 1: await asyncio.sleep(2) diff --git a/helpers/scouting.py b/helpers/scouting.py index 6666b94..6c926bb 100644 --- a/helpers/scouting.py +++ b/helpers/scouting.py @@ -7,6 +7,7 @@ and embed formatting for the scouting feature. import datetime import logging +import os import random import discord @@ -20,6 +21,8 @@ logger = logging.getLogger("discord_app") SCOUT_TOKENS_PER_DAY = 2 SCOUT_WINDOW_SECONDS = 1800 # 30 minutes +_scoutable_raw = os.environ.get("SCOUTABLE_PACK_TYPES", "Standard,Premium") +SCOUTABLE_PACK_TYPES = {s.strip() for s in _scoutable_raw.split(",") if s.strip()} # Rarity value → display symbol RARITY_SYMBOLS = { @@ -71,39 +74,70 @@ def _build_card_lines(cards: list[dict]) -> list[tuple[int, str]]: def build_scout_embed( opener_team: dict, - cards: list[dict], + cards: list[dict] = None, card_lines: list[tuple[int, str]] = None, expires_unix: int = None, + claims: dict[int, list[str]] = None, + total_scouts: int = 0, + closed: bool = False, ) -> tuple[discord.Embed, list[tuple[int, str]]]: """Build the embed shown above the scout buttons. Shows a shuffled list of cards (rarity + player name) so scouters know what's in the pack but not which button maps to which card. Returns (embed, card_lines) so the view can store the shuffled order. - """ - embed = get_team_embed(title="Scout Opportunity!", team=opener_team) - if card_lines is None: + Parameters + ---------- + closed : if True, renders the "Scout Window Closed" variant + claims : scouted card tracking dict for build_scouted_card_list + total_scouts : number of scouts so far (for title display) + """ + if card_lines is None and cards is not None: card_lines = _build_card_lines(cards) - card_list = "\n".join(line for _, line in card_lines) - - if expires_unix: - time_line = f"Scout window closes ." + if claims and card_lines: + card_list = build_scouted_card_list(card_lines, claims) + elif card_lines: + card_list = "\n".join(line for _, line in card_lines) else: - time_line = "Scout window closes in **30 minutes**." + card_list = "" - embed.description = ( - f"**{opener_team['lname']}** just opened a pack!\n\n" - f"**Cards in this pack:**\n{card_list}\n\n" - f"Pick a card — but which is which?\n" - f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" - f"{time_line}" - ) - embed.set_footer( - text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", - icon_url=IMAGES["logo"], - ) + if closed: + if total_scouts > 0: + title = f"Scout Window Closed ({total_scouts} scouted)" + else: + title = "Scout Window Closed" + elif total_scouts > 0: + title = f"Scout Opportunity! ({total_scouts} scouted)" + else: + title = "Scout Opportunity!" + + embed = get_team_embed(title=title, team=opener_team) + + if closed: + embed.description = f"**{opener_team['lname']}**'s pack\n\n" f"{card_list}" + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON}", + icon_url=IMAGES["logo"], + ) + else: + if expires_unix: + time_line = f"Scout window closes ." + else: + time_line = "Scout window closes in **30 minutes**." + + embed.description = ( + f"**{opener_team['lname']}**'s pack\n\n" + f"{card_list}\n\n" + f"Pick a card — but which is which?\n" + f"Costs 1 Scout Token (2 per day, resets at midnight Central).\n" + f"{time_line}" + ) + embed.set_footer( + text=f"Paper Dynasty Season {PD_SEASON} \u2022 One scout per player", + icon_url=IMAGES["logo"], + ) return embed, card_lines @@ -163,7 +197,9 @@ async def create_scout_opportunity( return now = datetime.datetime.now() - expires_at = int_timestamp(now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)) + expires_dt = now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS) + expires_at = int_timestamp(expires_dt) + expires_unix = int(expires_dt.timestamp()) created = int_timestamp(now) card_ids = [c["id"] for c in pack_cards] @@ -183,9 +219,6 @@ async def create_scout_opportunity( logger.error(f"Failed to create scout opportunity: {e}") return - expires_unix = int( - (now + datetime.timedelta(seconds=SCOUT_WINDOW_SECONDS)).timestamp() - ) embed, card_lines = build_scout_embed( opener_team, pack_cards, expires_unix=expires_unix ) diff --git a/tests/scouting/test_scout_view.py b/tests/scouting/test_scout_view.py index 906bb97..186c0b1 100644 --- a/tests/scouting/test_scout_view.py +++ b/tests/scouting/test_scout_view.py @@ -210,14 +210,12 @@ class TestScoutButtonSuccess: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_successful_scout_creates_card_copy( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -230,7 +228,6 @@ class TestScoutButtonSuccess: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -369,14 +366,12 @@ class TestMultiScout: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_two_users_can_scout_same_card( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -388,7 +383,6 @@ class TestMultiScout: """Two different users should both be able to scout the same card.""" view = self._make_view_with_message(sample_cards, opener_team, mock_bot) mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -430,14 +424,12 @@ class TestMultiScout: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_same_user_cannot_scout_twice( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -449,7 +441,6 @@ class TestMultiScout: view = self._make_view_with_message(sample_cards, opener_team, mock_bot) mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -579,7 +570,9 @@ class TestScoutViewTimeout: view.card_lines = [ (c["player"]["player_id"], f"Line {i}") for i, c in enumerate(sample_cards) ] - view.total_scouts = 5 + # Set up claims so total_scouts property returns 5 + pid = sample_cards[0]["player"]["player_id"] + view.claims[pid] = ["Team A", "Team B", "Team C", "Team D", "Team E"] view.message = AsyncMock(spec=discord.Message) view.message.edit = AsyncMock() @@ -617,14 +610,12 @@ class TestProcessingUserCleanup: @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_processing_cleared_on_success( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -648,7 +639,6 @@ class TestProcessingUserCleanup: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -744,24 +734,22 @@ class TestProcessingUserCleanup: # --------------------------------------------------------------------------- -# db_get("current") fallback +# Rewards use PD_SEASON constant # --------------------------------------------------------------------------- -class TestCurrentSeasonFallback: - """Tests for the fallback when db_get('current') returns None.""" +class TestRewardsSeason: + """Tests that reward records always use the PD_SEASON constant.""" @pytest.mark.asyncio @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) - async def test_current_returns_none_uses_fallback( + async def test_rewards_use_pd_season( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, sample_cards, @@ -769,7 +757,7 @@ class TestCurrentSeasonFallback: scouter_team, mock_bot, ): - """When db_get('current') returns None, rewards should use PD_SEASON fallback.""" + """Reward records should always use the PD_SEASON constant for season.""" view = ScoutView( scout_opp_id=1, cards=sample_cards, @@ -785,7 +773,6 @@ class TestCurrentSeasonFallback: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = None # db_get("current") returns None mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -803,14 +790,13 @@ class TestCurrentSeasonFallback: assert view.total_scouts == 1 assert 12345 in view.scouted_users - # Verify the rewards POST used fallback values + # Verify the rewards POST uses PD_SEASON # Order: scout_claims (0), cards (1), rewards (2) from helpers.constants import PD_SEASON reward_call = mock_db_post.call_args_list[2] assert reward_call[0][0] == "rewards" assert reward_call[1]["payload"]["season"] == PD_SEASON - assert reward_call[1]["payload"]["week"] == 1 # --------------------------------------------------------------------------- @@ -822,17 +808,15 @@ class TestShinyScoutNotification: """Tests for the rare-card notification path (rarity >= 5).""" @pytest.mark.asyncio - @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.send_to_channel", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_shiny_card_sends_notification( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, mock_send_to_channel, @@ -857,7 +841,6 @@ class TestShinyScoutNotification: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -877,17 +860,15 @@ class TestShinyScoutNotification: assert call_args[0][1] == "pd-network-news" @pytest.mark.asyncio - @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.send_to_channel", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_non_shiny_card_no_notification( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, mock_send_to_channel, @@ -912,7 +893,6 @@ class TestShinyScoutNotification: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] @@ -930,17 +910,15 @@ class TestShinyScoutNotification: mock_send_to_channel.assert_not_called() @pytest.mark.asyncio - @patch("helpers.discord_utils.send_to_channel", new_callable=AsyncMock) + @patch("discord_ui.scout_view.send_to_channel", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_card_embeds", new_callable=AsyncMock) @patch("discord_ui.scout_view.db_post", new_callable=AsyncMock) - @patch("discord_ui.scout_view.db_get", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_scout_tokens_used", new_callable=AsyncMock) @patch("discord_ui.scout_view.get_team_by_owner", new_callable=AsyncMock) async def test_shiny_notification_failure_does_not_crash( self, mock_get_team, mock_get_tokens, - mock_db_get, mock_db_post, mock_card_embeds, mock_send_to_channel, @@ -965,7 +943,6 @@ class TestShinyScoutNotification: mock_get_team.return_value = scouter_team mock_get_tokens.return_value = 0 - mock_db_get.return_value = {"season": 4, "week": 1} # db_get("current") mock_db_post.return_value = {"id": 100} mock_card_embeds.return_value = [Mock(spec=discord.Embed)] mock_send_to_channel.side_effect = Exception("Channel not found") -- 2.25.1 From 7d5b6c642a1bb73b24b663aa77458fe7787c6502 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Thu, 5 Mar 2026 08:32:24 -0600 Subject: [PATCH 12/12] fix: remove top-level helpers.py after migration to helpers/ package (#33) Python resolves `import helpers` and `from helpers import ...` to the helpers/ package (directory with __init__.py), so helpers.py has been unreachable dead code since the package migration. Co-Authored-By: Claude Sonnet 4.6 --- helpers.py | 2153 ---------------------------------------------------- 1 file changed, 2153 deletions(-) delete mode 100644 helpers.py diff --git a/helpers.py b/helpers.py deleted file mode 100644 index 9485437..0000000 --- a/helpers.py +++ /dev/null @@ -1,2153 +0,0 @@ -import asyncio -import datetime -import logging -import math -import os -import random -import traceback - -import discord -import pygsheets -import requests -from discord.ext import commands -from api_calls import * - -from bs4 import BeautifulSoup -from difflib import get_close_matches -from dataclasses import dataclass -from typing import Optional, Literal, Union, List - -from exceptions import log_exception -from in_game.gameplay_models import Team -from constants import * -from discord_ui import * -from random_content import * -from utils import ( - position_name_to_abbrev, - user_has_role, - get_roster_sheet_legacy, - get_roster_sheet, - get_player_url, - owner_only, - get_cal_user, - get_context_user, -) -from search_utils import * -from discord_utils import * - - -async def get_player_photo(player): - search_term = player["bbref_id"] if player["bbref_id"] else player["p_name"] - req_url = ( - f"https://www.thesportsdb.com/api/v1/json/1/searchplayers.php?p={search_term}" - ) - - try: - resp = requests.get(req_url, timeout=0.5) - except Exception as e: - return None - if resp.status_code == 200 and resp.json()["player"]: - if resp.json()["player"][0]["strSport"] == "Baseball": - await db_patch( - "players", - object_id=player["player_id"], - params=[("headshot", resp.json()["player"][0]["strThumb"])], - ) - return resp.json()["player"][0]["strThumb"] - return None - - -async def get_player_headshot(player): - search_term = player["bbref_id"] if player["bbref_id"] else player["p_name"] - req_url = ( - f"https://www.baseball-reference.com/search/search.fcgi?search={search_term}" - ) - - try: - resp = requests.get(req_url, timeout=2).text - soup = BeautifulSoup(resp, "html.parser") - for item in soup.find_all("img"): - if "headshot" in item["src"]: - await db_patch( - "players", - object_id=player["player_id"], - params=[("headshot", item["src"])], - ) - return item["src"] - except: - pass - return await get_player_photo(player) - - -""" -NEW FOR SEASON 4 -""" - - -async def get_team_by_owner(owner_id: int): - team = await db_get("teams", params=[("gm_id", owner_id)]) - - if not team["count"]: - return None - - # Prefer the non-gauntlet team (main team) if multiple teams exist - for t in team["teams"]: - if "gauntlet" not in t["abbrev"].lower(): - return t - - # Fallback to first team if all are gauntlet teams - return team["teams"][0] - - -async def team_role(ctx, team: Team): - return await get_or_create_role(ctx, f"{team.abbrev} - {team.lname}") - - -def get_all_pos(player): - all_pos = [] - - for x in range(1, 8): - if player[f"pos_{x}"]: - all_pos.append(player[f"pos_{x}"]) - - return all_pos - - -async def share_channel(channel, user, read_only=False): - await channel.set_permissions(user, read_messages=True, send_messages=not read_only) - - -async def get_card_embeds(card, include_stats=False) -> list: - embed = discord.Embed( - title=f"{card['player']['p_name']}", - color=int(card["player"]["rarity"]["color"], 16), - ) - # embed.description = card['team']['lname'] - embed.description = ( - f"{card['player']['cardset']['name']} / {card['player']['mlbclub']}" - ) - embed.set_author( - name=card["team"]["lname"], url=IMAGES["logo"], icon_url=card["team"]["logo"] - ) - embed.set_footer( - text=f"Paper Dynasty Season {card['team']['season']}", icon_url=IMAGES["logo"] - ) - - if include_stats: - b_query = await db_get( - "plays/batting", - params=[("player_id", card["player"]["player_id"]), ("season", PD_SEASON)], - ) - p_query = await db_get( - "plays/pitching", - params=[("player_id", card["player"]["player_id"]), ("season", PD_SEASON)], - ) - - embed.add_field(name="Player ID", value=f"{card['player']['player_id']}") - embed.add_field(name="Rarity", value=f"{card['player']['rarity']['name']}") - embed.add_field(name="Cost", value=f"{card['player']['cost']}₼") - - pos_string = ", ".join(get_all_pos(card["player"])) - embed.add_field(name="Positions", value=pos_string) - # all_dex = card['player']['paperdex'] - all_dex = await db_get( - "paperdex", params=[("player_id", card["player"]["player_id"]), ("flat", True)] - ) - count = all_dex["count"] - if card["team"]["lname"] != "Paper Dynasty": - bool_list = [ - True - for elem in all_dex["paperdex"] - if elem["team"] == card["team"].get("id", None) - ] - if any(bool_list): - if count == 1: - coll_string = f"Only you" - else: - coll_string = ( - f"You and {count - 1} other{'s' if count - 1 != 1 else ''}" - ) - elif count: - coll_string = f"{count} other team{'s' if count != 1 else ''}" - else: - coll_string = f"0 teams" - embed.add_field(name="Collected By", value=coll_string) - else: - embed.add_field( - name="Collected By", value=f"{count} team{'s' if count != 1 else ''}" - ) - - # TODO: check for dupes with the included paperdex data - # if card['team']['lname'] != 'Paper Dynasty': - # team_dex = await db_get('cards', params=[("player_id", card["player"]["player_id"]), ('team_id', card['team']['id'])]) - # count = 1 if not team_dex['count'] else team_dex['count'] - # embed.add_field(name='# Dupes', value=f'{count - 1} dupe{"s" if count - 1 != 1 else ""}') - - # embed.add_field(name='Team', value=f'{card["player"]["mlbclub"]}') - if card["player"]["franchise"] != "Pokemon": - player_pages = f"[BBRef](https://www.baseball-reference.com/players/{card['player']['bbref_id'][0]}/{card['player']['bbref_id']}.shtml)" - else: - player_pages = f"[Pkmn]({PKMN_REF_URL}{card['player']['bbref_id']})" - embed.add_field(name="Player Page", value=f"{player_pages}") - embed.set_image(url=card["player"]["image"]) - - headshot = ( - card["player"]["headshot"] - if card["player"]["headshot"] - else await get_player_headshot(card["player"]) - ) - if headshot: - embed.set_thumbnail(url=headshot) - else: - embed.set_thumbnail(url=IMAGES["logo"]) - - if card["player"]["franchise"] == "Pokemon": - if card["player"]["fangr_id"] is not None: - try: - evo_mon = await db_get( - "players", object_id=card["player"]["fangr_id"], none_okay=True - ) - if evo_mon is not None: - embed.add_field(name="Evolves Into", value=f"{evo_mon['p_name']}") - except Exception as e: - logging.error( - "could not pull evolution: {e}", exc_info=True, stack_info=True - ) - if "420420" not in card["player"]["strat_code"]: - try: - evo_mon = await db_get( - "players", object_id=card["player"]["strat_code"], none_okay=True - ) - if evo_mon is not None: - embed.add_field(name="Evolves From", value=f"{evo_mon['p_name']}") - except Exception as e: - logging.error( - "could not pull evolution: {e}", exc_info=True, stack_info=True - ) - - if include_stats: - if b_query["count"] > 0: - b = b_query["stats"][0] - - re24 = f"{b['re24']:.2f}" - batting_string = ( - f"```\n" - f" AVG OBP SLG\n" - f" {b['avg']:.3f} {b['obp']:.3f} {b['slg']:.3f}\n``````\n" - f" OPS wOBA RE24\n" - f" {b['ops']:.3f} {b['woba']:.3f} {re24: ^5}\n``````\n" - f" PA H RBI 2B 3B HR SB\n" - f"{b['pa']: >3} {b['hit']: ^3} {b['rbi']: ^3} {b['double']: >2} {b['triple']: >2} " - f"{b['hr']: >2} {b['sb']: >2}```\n" - ) - embed.add_field(name="Batting Stats", value=batting_string, inline=False) - if p_query["count"] > 0: - p = p_query["stats"][0] - - ip_whole = math.floor(p["outs"] / 3) - ip_denom = p["outs"] % 3 - ips = ip_whole + (ip_denom * 0.1) - - kpbb = f"{p['k/bb']:.1f}" - era = f"{p['era']:.2f}" - whip = f"{p['whip']:.2f}" - re24 = f"{p['re24']:.2f}" - - pitching_string = ( - f"```\n" - f" W-L SV ERA WHIP\n" - f"{p['win']: >2}-{p['loss']: <2} {p['save']: >2} {era: >5} {whip: >4}\n``````\n" - f" IP SO K/BB RE24\n" - f"{ips: >5} {p['so']: ^3} {kpbb: ^4} {re24: ^5}\n```" - ) - embed.add_field(name="Pitching Stats", value=pitching_string, inline=False) - - if not card["player"]["image2"]: - return [embed] - - card_two = discord.Embed(color=int(card["player"]["rarity"]["color"], 16)) - card_two.set_footer( - text=f"Paper Dynasty Season {card['team']['season']}", icon_url=IMAGES["logo"] - ) - card_two.set_image(url=card["player"]["image2"]) - - return [embed, card_two] - - -def image_embed( - image_url: str, - title: str = None, - color: str = None, - desc: str = None, - author_name: str = None, - author_icon: str = None, -): - embed_color = int(SBA_COLOR, 16) - if color is not None: - embed_color = int(color, 16) - - embed = discord.Embed(color=embed_color) - - if title is not None: - embed.title = title - if desc is not None: - embed.description = desc - if author_name is not None: - icon = author_icon if author_icon is not None else IMAGES["logo"] - embed.set_author(name=author_name, icon_url=icon) - embed.set_footer(text=f"Paper Dynasty Season {PD_SEASON}", icon_url=IMAGES["logo"]) - embed.set_image(url=image_url) - return embed - - -def is_shiny(card): - if card["player"]["rarity"]["value"] >= 5: - return True - return False - - -async def display_cards( - cards: list, - team: dict, - channel, - user, - bot=None, - pack_cover: str = None, - cust_message: str = None, - add_roster: bool = True, - pack_name: str = None, -) -> bool: - logger.info( - f"display_cards called with {len(cards)} cards for team {team.get('abbrev', 'Unknown')}" - ) - try: - cards.sort(key=lambda x: x["player"]["rarity"]["value"]) - logger.debug(f"Cards sorted successfully") - - card_embeds = [await get_card_embeds(x) for x in cards] - logger.debug(f"Created {len(card_embeds)} card embeds") - - page_num = 0 if pack_cover is None else -1 - seen_shiny = False - logger.debug( - f"Initial page_num: {page_num}, pack_cover: {pack_cover is not None}" - ) - except Exception as e: - logger.error(f"Error in display_cards initialization: {e}", exc_info=True) - return False - - try: - view = Pagination([user], timeout=10) - # Use simple text arrows instead of emojis to avoid context issues - l_emoji = "←" - r_emoji = "→" - view.left_button.disabled = True - view.left_button.label = f"{l_emoji}Prev: -/{len(card_embeds)}" - view.cancel_button.label = f"Close Pack" - view.right_button.label = f"Next: {page_num + 2}/{len(card_embeds)}{r_emoji}" - if len(cards) == 1: - view.right_button.disabled = True - - logger.debug(f"Pagination view created successfully") - - if pack_cover: - logger.debug(f"Sending pack cover message") - msg = await channel.send( - content=None, - embed=image_embed(pack_cover, title=f"{team['lname']}", desc=pack_name), - view=view, - ) - else: - logger.debug(f"Sending card embed message for page {page_num}") - msg = await channel.send( - content=None, embeds=card_embeds[page_num], view=view - ) - - logger.debug(f"Initial message sent successfully") - except Exception as e: - logger.error( - f"Error creating view or sending initial message: {e}", exc_info=True - ) - return False - - try: - if cust_message: - logger.debug(f"Sending custom message: {cust_message[:50]}...") - follow_up = await channel.send(cust_message) - else: - logger.debug(f"Sending default message for {len(cards)} cards") - follow_up = await channel.send( - f"{user.mention} you've got {len(cards)} cards here" - ) - - logger.debug(f"Follow-up message sent successfully") - except Exception as e: - logger.error(f"Error sending follow-up message: {e}", exc_info=True) - return False - - logger.debug(f"Starting main interaction loop") - while True: - try: - logger.debug(f"Waiting for user interaction on page {page_num}") - await view.wait() - logger.debug(f"User interaction received: {view.value}") - except Exception as e: - logger.error(f"Error in view.wait(): {e}", exc_info=True) - await msg.edit(view=None) - return False - - if view.value: - if view.value == "cancel": - await msg.edit(view=None) - if add_roster: - await follow_up.edit( - content=f"Refresh your cards here: {get_roster_sheet(team)}" - ) - return True - if view.value == "left": - page_num -= 1 if page_num > 0 else 0 - if view.value == "right": - page_num += 1 if page_num < len(card_embeds) - 1 else 0 - else: - if page_num == len(card_embeds) - 1: - await msg.edit(view=None) - if add_roster: - await follow_up.edit( - content=f"Refresh your cards here: {get_roster_sheet(team)}" - ) - return True - else: - page_num += 1 - - view.value = None - - try: - if is_shiny(cards[page_num]) and not seen_shiny: - logger.info( - f"Shiny card detected on page {page_num}: {cards[page_num]['player']['p_name']}" - ) - seen_shiny = True - view = Pagination([user], timeout=300) - view.cancel_button.style = discord.ButtonStyle.success - view.cancel_button.label = "Flip!" - view.left_button.label = "-" - view.right_button.label = "-" - view.left_button.disabled = True - view.right_button.disabled = True - - # Get MVP image safely with fallback - franchise = cards[page_num]["player"]["franchise"] - logger.debug(f"Getting MVP image for franchise: {franchise}") - mvp_image = IMAGES["mvp"].get( - franchise, IMAGES.get("mvp-hype", IMAGES["logo"]) - ) - - await msg.edit( - embed=image_embed( - mvp_image, - color="56f1fa", - author_name=team["lname"], - author_icon=team["logo"], - ), - view=view, - ) - logger.debug(f"MVP display updated successfully") - except Exception as e: - logger.error( - f"Error processing shiny card on page {page_num}: {e}", exc_info=True - ) - # Continue with regular flow instead of crashing - try: - tmp_msg = await channel.send( - content=f"<@&1163537676885033010> we've got an MVP!" - ) - await follow_up.edit( - content=f"<@&1163537676885033010> we've got an MVP!" - ) - await tmp_msg.delete() - except discord.errors.NotFound: - # Role might not exist or message was already deleted - await follow_up.edit(content=f"We've got an MVP!") - except Exception as e: - # Log error but don't crash the function - logger.error(f"Error handling MVP notification: {e}") - await follow_up.edit(content=f"We've got an MVP!") - await view.wait() - - view = Pagination([user], timeout=10) - try: - view.right_button.label = ( - f"Next: {page_num + 2}/{len(card_embeds)}{r_emoji}" - ) - view.cancel_button.label = f"Close Pack" - view.left_button.label = f"{l_emoji}Prev: {page_num}/{len(card_embeds)}" - if page_num == 0: - view.left_button.label = f"{l_emoji}Prev: -/{len(card_embeds)}" - view.left_button.disabled = True - elif page_num == len(card_embeds) - 1: - view.timeout = 600.0 - view.right_button.label = f"Next: -/{len(card_embeds)}{r_emoji}" - view.right_button.disabled = True - - logger.debug(f"Updating message to show page {page_num}/{len(card_embeds)}") - if page_num >= len(card_embeds): - logger.error( - f"Page number {page_num} exceeds card_embeds length {len(card_embeds)}" - ) - page_num = len(card_embeds) - 1 - - await msg.edit(content=None, embeds=card_embeds[page_num], view=view) - logger.debug(f"Message updated successfully to page {page_num}") - except Exception as e: - logger.error( - f"Error updating message on page {page_num}: {e}", exc_info=True - ) - # Try to clean up and return - try: - await msg.edit(view=None) - except: - pass # If this fails too, just give up - return False - - -async def embed_pagination( - all_embeds: list, - channel, - user: discord.Member, - custom_message: str = None, - timeout: int = 10, - start_page: int = 0, -): - if start_page > len(all_embeds) - 1 or start_page < 0: - page_num = 0 - else: - page_num = start_page - - view = Pagination([user], timeout=timeout) - l_emoji = "" - r_emoji = "" - view.right_button.label = f"Next: {page_num + 2}/{len(all_embeds)}{r_emoji}" - view.cancel_button.label = f"Cancel" - view.left_button.label = f"{l_emoji}Prev: {page_num}/{len(all_embeds)}" - if page_num == 0: - view.left_button.label = f"{l_emoji}Prev: -/{len(all_embeds)}" - view.left_button.disabled = True - elif page_num == len(all_embeds) - 1: - view.right_button.label = f"Next: -/{len(all_embeds)}{r_emoji}" - view.right_button.disabled = True - - msg = await channel.send( - content=custom_message, embed=all_embeds[page_num], view=view - ) - - while True: - await view.wait() - - if view.value: - if view.value == "cancel": - await msg.edit(view=None) - return True - if view.value == "left": - page_num -= 1 if page_num > 0 else 0 - if view.value == "right": - page_num += 1 if page_num <= len(all_embeds) else len(all_embeds) - else: - if page_num == len(all_embeds) - 1: - await msg.edit(view=None) - return True - else: - page_num += 1 - - view.value = None - - view = Pagination([user], timeout=timeout) - view.right_button.label = f"Next: {page_num + 2}/{len(all_embeds)}{r_emoji}" - view.cancel_button.label = f"Cancel" - view.left_button.label = f"{l_emoji}Prev: {page_num}/{len(all_embeds)}" - if page_num == 0: - view.left_button.label = f"{l_emoji}Prev: -/{len(all_embeds)}" - view.left_button.disabled = True - elif page_num == len(all_embeds) - 1: - view.timeout = 600.0 - view.right_button.label = f"Next: -/{len(all_embeds)}{r_emoji}" - view.right_button.disabled = True - - await msg.edit(content=None, embed=all_embeds[page_num], view=view) - - -async def get_test_pack(ctx, team): - pull_notifs = [] - this_pack = await db_post( - "packs/one", - payload={ - "team_id": team["id"], - "pack_type_id": 1, - "open_time": int( - datetime.datetime.timestamp(datetime.datetime.now()) * 1000 - ), - }, - ) - ft_query = await db_get("players/random", params=[("max_rarity", 1), ("limit", 3)]) - four_query = await db_get( - "players/random", params=[("min_rarity", 1), ("max_rarity", 3), ("limit", 1)] - ) - five_query = await db_get( - "players/random", params=[("min_rarity", 5), ("max_rarity", 5), ("limit", 1)] - ) - first_three = ft_query["players"] - fourth = four_query["players"] - fifth = five_query["players"] - all_cards = [*first_three, *fourth, *fifth] - - success = await db_post( - "cards", - timeout=10, - payload={ - "cards": [ - { - "player_id": x["player_id"], - "team_id": team["id"], - "pack_id": this_pack["id"], - } - for x in all_cards - ] - }, - ) - if not success: - await ctx.send( - f"I was not able to create these cards {get_emoji(ctx, 'slight_frown')}" - ) - return - - for x in all_cards: - if x["rarity"]["value"] >= 3: - pull_notifs.append(x) - - for pull in pull_notifs: - await db_post( - "notifs", - payload={ - "created": int( - datetime.datetime.timestamp(datetime.datetime.now()) * 1000 - ), - "title": "Rare Pull", - "field_name": f"{player_desc(pull)} ({pull['rarity']['name']})", - "message": f"Pulled by {team['abbrev']}", - "about": f"Player-{pull['player_id']}", - }, - ) - - return [{"player": x, "team": team} for x in all_cards] - - -async def roll_for_cards(all_packs: list, extra_val=None) -> list: - """ - Pack odds are calculated based on the pack type - - Parameters - ---------- - extra_val - all_packs - - Returns - ------- - - """ - all_players = [] - team = all_packs[0]["team"] - pack_ids = [] - for pack in all_packs: - counts = { - "Rep": {"count": 0, "rarity": 0}, - "Res": {"count": 0, "rarity": 1}, - "Sta": {"count": 0, "rarity": 2}, - "All": {"count": 0, "rarity": 3}, - "MVP": {"count": 0, "rarity": 5}, - "HoF": {"count": 0, "rarity": 8}, - } - this_pack_players = [] - if pack["pack_type"]["name"] == "Standard": - # Cards 1 - 2 - for x in range(2): - d_1000 = random.randint(1, 1000) - if d_1000 <= 450: - counts["Rep"]["count"] += 1 - elif d_1000 <= 900: - counts["Res"]["count"] += 1 - else: - counts["Sta"]["count"] += 1 - - # Card 3 - d_1000 = random.randint(1, 1000) - if d_1000 <= 350: - counts["Rep"]["count"] += 1 - elif d_1000 <= 700: - counts["Res"]["count"] += 1 - elif d_1000 <= 950: - counts["Sta"]["count"] += 1 - else: - counts["All"]["count"] += 1 - - # Card 4 - d_1000 = random.randint(1, 1000) - if d_1000 <= 310: - counts["Rep"]["count"] += 1 - elif d_1000 <= 620: - counts["Res"]["count"] += 1 - elif d_1000 <= 940: - counts["Sta"]["count"] += 1 - elif d_1000 <= 990: - counts["All"]["count"] += 1 - else: - counts["MVP"]["count"] += 1 - - # Card 5 - d_1000 = random.randint(1, 1000) - if d_1000 <= 215: - counts["Rep"]["count"] += 1 - elif d_1000 <= 430: - counts["Res"]["count"] += 1 - elif d_1000 <= 930: - counts["Sta"]["count"] += 1 - elif d_1000 <= 980: - counts["All"]["count"] += 1 - elif d_1000 <= 990: - counts["MVP"]["count"] += 1 - else: - counts["HoF"]["count"] += 1 - - elif pack["pack_type"]["name"] == "Premium": - # Card 1 - d_1000 = random.randint(1, 1000) - if d_1000 <= 400: - counts["Rep"]["count"] += 1 - elif d_1000 <= 870: - counts["Res"]["count"] += 1 - elif d_1000 <= 970: - counts["Sta"]["count"] += 1 - elif d_1000 <= 990: - counts["All"]["count"] += 1 - else: - counts["MVP"]["count"] += 1 - - # Card 2 - d_1000 = random.randint(1, 1000) - if d_1000 <= 300: - counts["Rep"]["count"] += 1 - elif d_1000 <= 770: - counts["Res"]["count"] += 1 - elif d_1000 <= 970: - counts["Sta"]["count"] += 1 - elif d_1000 <= 990: - counts["All"]["count"] += 1 - else: - counts["MVP"]["count"] += 1 - - # Card 3 - d_1000 = random.randint(1, 1000) - if d_1000 <= 200: - counts["Rep"]["count"] += 1 - elif d_1000 <= 640: - counts["Res"]["count"] += 1 - elif d_1000 <= 940: - counts["Sta"]["count"] += 1 - elif d_1000 <= 990: - counts["All"]["count"] += 1 - else: - counts["MVP"]["count"] += 1 - - # Card 4 - d_1000 = random.randint(1, 1000) - if d_1000 <= 100: - counts["Rep"]["count"] += 1 - if d_1000 <= 530: - counts["Res"]["count"] += 1 - elif d_1000 <= 930: - counts["Sta"]["count"] += 1 - elif d_1000 <= 980: - counts["All"]["count"] += 1 - elif d_1000 <= 990: - counts["MVP"]["count"] += 1 - else: - counts["HoF"]["count"] += 1 - - # Card 5 - d_1000 = random.randint(1, 1000) - if d_1000 <= 380: - counts["Res"]["count"] += 1 - elif d_1000 <= 880: - counts["Sta"]["count"] += 1 - elif d_1000 <= 980: - counts["All"]["count"] += 1 - elif d_1000 <= 990: - counts["MVP"]["count"] += 1 - else: - counts["HoF"]["count"] += 1 - - elif pack["pack_type"]["name"] == "Check-In Player": - logger.info( - f"Building Check-In Pack // extra_val (type): {extra_val} {type(extra_val)}" - ) - # Single Card - mod = 0 - if isinstance(extra_val, int): - mod = extra_val - d_1000 = random.randint(1, 1000 + mod) - - if d_1000 >= 1100: - counts["All"]["count"] += 1 - elif d_1000 >= 1000: - counts["Sta"]["count"] += 1 - elif d_1000 >= 500: - counts["Res"]["count"] += 1 - else: - counts["Rep"]["count"] += 1 - - else: - raise TypeError(f"Pack type not recognized: {pack['pack_type']['name']}") - - pull_notifs = [] - for key in counts: - mvp_flag = None - - if counts[key]["count"] > 0: - params = [ - ("min_rarity", counts[key]["rarity"]), - ("max_rarity", counts[key]["rarity"]), - ("limit", counts[key]["count"]), - ] - if all_packs[0]["pack_team"] is not None: - params.extend( - [ - ("franchise", all_packs[0]["pack_team"]["lname"]), - ("in_packs", True), - ] - ) - elif all_packs[0]["pack_cardset"] is not None: - params.append(("cardset_id", all_packs[0]["pack_cardset"]["id"])) - else: - params.append(("in_packs", True)) - - pl = await db_get("players/random", params=params) - - if pl["count"] != counts[key]["count"]: - mvp_flag = counts[key]["count"] - pl["count"] - logging.info( - f"Set mvp flag to {mvp_flag} / cardset_id: {all_packs[0]['pack_cardset']['id']}" - ) - - for x in pl["players"]: - this_pack_players.append(x) - all_players.append(x) - - if x["rarity"]["value"] >= 3: - pull_notifs.append(x) - - if mvp_flag and all_packs[0]["pack_cardset"]["id"] not in [23]: - logging.info(f"Adding {mvp_flag} MVPs for missing cards") - pl = await db_get( - "players/random", params=[("min_rarity", 5), ("limit", mvp_flag)] - ) - - for x in pl["players"]: - this_pack_players.append(x) - all_players.append(x) - - # Add dupes of Replacement/Reserve cards - elif mvp_flag: - logging.info(f"Adding {mvp_flag} duplicate pokemon cards") - for count in range(mvp_flag): - logging.info(f"Adding {pl['players'][0]['p_name']} to the pack") - this_pack_players.append(x) - all_players.append(pl["players"][0]) - - success = await db_post( - "cards", - payload={ - "cards": [ - { - "player_id": x["player_id"], - "team_id": pack["team"]["id"], - "pack_id": pack["id"], - } - for x in this_pack_players - ] - }, - timeout=10, - ) - if not success: - raise ConnectionError(f"Failed to create this pack of cards.") - - await db_patch( - "packs", - object_id=pack["id"], - params=[ - ( - "open_time", - int(datetime.datetime.timestamp(datetime.datetime.now()) * 1000), - ) - ], - ) - pack_ids.append(pack["id"]) - - for pull in pull_notifs: - logger.info(f"good pull: {pull}") - await db_post( - "notifs", - payload={ - "created": int( - datetime.datetime.timestamp(datetime.datetime.now()) * 1000 - ), - "title": "Rare Pull", - "field_name": f"{player_desc(pull)} ({pull['rarity']['name']})", - "message": f"Pulled by {team['abbrev']}", - "about": f"Player-{pull['player_id']}", - }, - ) - - return pack_ids - - -async def give_packs(team: dict, num_packs: int, pack_type: dict = None) -> dict: - """ - Parameters - ---------- - pack_type - team - num_packs - - Returns - ------- - { 'count': int, 'packs': [ all team packs ] } - """ - pt_id = pack_type["id"] if pack_type is not None else 1 - await db_post( - "packs", - payload={ - "packs": [ - {"team_id": team["id"], "pack_type_id": pt_id} for x in range(num_packs) - ] - }, - ) - total_packs = await db_get( - "packs", params=[("team_id", team["id"]), ("opened", False)] - ) - - return total_packs - - -def get_sheets(bot): - try: - return bot.get_cog("Gameplay").sheets - except Exception as e: - logger.error(f"Could not grab sheets auth: {e}") - raise ConnectionError( - f"Bot has not authenticated with discord; please try again in 1 minute." - ) - - -def create_team_sheet(team, email: str, current, bot): - sheets = get_sheets(bot) - new_sheet = sheets.drive.copy_file( - f"{current['gsheet_template']}", - f"{team['lname']} Roster Sheet v{current['gsheet_version']}", - "1539D0imTMjlUx2VF3NPMt7Sv85sb2XAJ", - ) - logger.info(f"new_sheet: {new_sheet}") - - this_sheet = sheets.open_by_key(new_sheet["id"]) - this_sheet.share(email, role="writer") - team_data = this_sheet.worksheet_by_title("Team Data") - team_data.update_values( - crange="B1:B2", values=[[f"{team['id']}"], [f"'{team_hash(team)}"]] - ) - logger.debug(f"this_sheet: {this_sheet}") - return this_sheet - - -async def refresh_sheet(team, bot, sheets=None) -> None: - return - if not sheets: - sheets = get_sheets(bot) - - this_sheet = sheets.open_by_key(team["gsheet"]) - my_cards = this_sheet.worksheet_by_title("My Cards") - all_cards = this_sheet.worksheet_by_title("All Cards") - - my_cards.update_value("A2", "FALSE") - all_cards.update_value("A2", "FALSE") - await asyncio.sleep(1) - - my_cards.update_value("A2", "TRUE") - await asyncio.sleep(0.5) - all_cards.update_value("A2", "TRUE") - - -def delete_sheet(team, bot): - sheets = get_sheets(bot) - this_sheet = sheets.open_by_key(team["gsheet"]) - this_sheet.delete() - - -def share_sheet(team, email, bot) -> None: - sheets = get_sheets(bot) - this_sheet = sheets.open_by_key(team["gsheet"]) - this_sheet.share(email, role="writer") - - -def int_timestamp(datetime_obj: datetime.datetime) -> int: - return int(datetime.datetime.timestamp(datetime_obj) * 1000) - - -def get_pos_abbrev(pos_name): - if pos_name == "Catcher": - return "C" - elif pos_name == "First Base": - return "1B" - elif pos_name == "Second Base": - return "2B" - elif pos_name == "Third Base": - return "3B" - elif pos_name == "Shortstop": - return "SS" - elif pos_name == "Left Field": - return "LF" - elif pos_name == "Center Field": - return "CF" - elif pos_name == "Right Field": - return "RF" - elif pos_name == "Pitcher": - return "P" - elif pos_name == "Designated Hitter": - return "DH" - elif pos_name == "Pinch Hitter": - return "PH" - else: - raise KeyError(f"{pos_name} is not a recognized position name") - - -async def cardset_search(cardset: str, cardset_list: list) -> Optional[dict]: - cardset_name = fuzzy_search(cardset, cardset_list) - if not cardset_name: - return None - - c_query = await db_get("cardsets", params=[("name", cardset_name)]) - if c_query["count"] == 0: - return None - return c_query["cardsets"][0] - - -def get_blank_team_card(player): - return { - "player": player, - "team": { - "lname": "Paper Dynasty", - "logo": IMAGES["logo"], - "season": PD_SEASON, - "id": None, - }, - } - - -def get_rosters(team, bot, roster_num: Optional[int] = None) -> list: - sheets = get_sheets(bot) - this_sheet = sheets.open_by_key(team["gsheet"]) - r_sheet = this_sheet.worksheet_by_title(f"My Rosters") - logger.debug(f"this_sheet: {this_sheet} / r_sheet = {r_sheet}") - - all_rosters = [None, None, None] - - # Pull roster 1 - if not roster_num or roster_num == 1: - roster_1 = r_sheet.range("B3:B28") - roster_name = r_sheet.cell("F30").value - logger.info(f"roster_1: {roster_1}") - - if not roster_1[0][0].value == "": - all_rosters[0] = { - "name": roster_name, - "roster_num": 1, - "team_id": team["id"], - "cards": None, - } - all_rosters[0]["cards"] = [int(x[0].value) for x in roster_1] - - # Pull roster 2 - if not roster_num or roster_num == 2: - roster_2 = r_sheet.range("B29:B54") - roster_name = r_sheet.cell("F31").value - logger.info(f"roster_2: {roster_2}") - - if not roster_2[0][0].value == "": - all_rosters[1] = { - "name": roster_name, - "roster_num": 2, - "team_id": team["id"], - "cards": None, - } - all_rosters[1]["cards"] = [int(x[0].value) for x in roster_2] - - # Pull roster 3 - if not roster_num or roster_num == 3: - roster_3 = r_sheet.range("B55:B80") - roster_name = r_sheet.cell("F32").value - logger.info(f"roster_3: {roster_3}") - - if not roster_3[0][0].value == "": - all_rosters[2] = { - "name": roster_name, - "roster_num": 3, - "team_id": team["id"], - "cards": None, - } - all_rosters[2]["cards"] = [int(x[0].value) for x in roster_3] - - return all_rosters - - -def get_roster_lineups(team, bot, roster_num, lineup_num) -> list: - sheets = get_sheets(bot) - logger.debug(f"sheets: {sheets}") - this_sheet = sheets.open_by_key(team["gsheet"]) - logger.debug(f"this_sheet: {this_sheet}") - r_sheet = this_sheet.worksheet_by_title("My Rosters") - logger.debug(f"r_sheet: {r_sheet}") - - if lineup_num == 1: - row_start = 9 - row_end = 17 - else: - row_start = 18 - row_end = 26 - - if roster_num == 1: - l_range = f"H{row_start}:I{row_end}" - elif roster_num == 2: - l_range = f"J{row_start}:K{row_end}" - else: - l_range = f"L{row_start}:M{row_end}" - - logger.debug(f"l_range: {l_range}") - raw_cells = r_sheet.range(l_range) - logger.debug(f"raw_cells: {raw_cells}") - - try: - lineup_cells = [(row[0].value, int(row[1].value)) for row in raw_cells] - except ValueError as e: - logger.error(f"Could not pull roster for {team['abbrev']} due to a ValueError") - raise ValueError( - f"Uh oh. Looks like your roster might not be saved. I am reading blanks when I try to " - f"get the card IDs" - ) - logger.debug(f"lineup_cells: {lineup_cells}") - - return lineup_cells - - -def post_ratings_guide(team, bot, this_sheet=None): - if not this_sheet: - sheets = get_sheets(bot) - this_sheet = sheets.open_by_key(team["gsheet"]) - p_guide = this_sheet.worksheet_by_title("Full Guide - Pitchers") - b_guide = this_sheet.worksheet_by_title("Full Guide - Batters") - - p_guide.update_value("A1", RATINGS_PITCHER_FORMULA) - b_guide.update_value("A1", RATINGS_BATTER_FORMULA) - - -async def legal_channel(ctx): - """Check for prefix commands (commands.Context).""" - bad_channels = ["paper-dynasty-chat", "pd-news-ticker", "pd-network-news"] - - if isinstance(ctx, commands.Context): - if ctx.channel.name in bad_channels: - raise commands.CheckFailure( - f"Slide on down to the {get_channel(ctx, 'pd-bot-hole').mention} ;)" - ) - else: - return True - - elif ctx.channel.name in bad_channels: - # await ctx.message.add_reaction('❌') - # await ctx.send(f'Slide on down to the {get_channel(ctx, "pd-bot-hole").mention} ;)') - # logger.warning(f'{ctx.author.name} posted in illegal channel.') - # return False - raise discord.app_commands.AppCommandError( - f"Slide on down to the {get_channel(ctx, 'pd-bot-hole').mention} ;)" - ) - else: - return True - - -def app_legal_channel(): - """Check for slash commands (app_commands). Use as @app_legal_channel()""" - - async def predicate(interaction: discord.Interaction) -> bool: - bad_channels = ["paper-dynasty-chat", "pd-news-ticker", "pd-network-news"] - if interaction.channel.name in bad_channels: - raise discord.app_commands.CheckFailure( - f"Slide on down to the {get_channel(interaction, 'pd-bot-hole').mention} ;)" - ) - return True - - return discord.app_commands.check(predicate) - - -def is_ephemeral_channel(channel) -> bool: - """Check if channel requires ephemeral responses (chat channels).""" - if not channel or not hasattr(channel, "name"): - return False - return channel.name in ["paper-dynasty-chat", "pd-news-ticker"] - - -def is_restricted_channel(channel) -> bool: - """Check if channel is restricted for certain commands (chat/ticker channels).""" - if not channel or not hasattr(channel, "name"): - return False - return channel.name in ["paper-dynasty-chat", "pd-news-ticker"] - - -def can_send_message(channel) -> bool: - """Check if channel supports sending messages.""" - return channel and hasattr(channel, "send") - - -async def send_safe_message( - source: Union[discord.Interaction, commands.Context], - content: str = None, - *, - embeds: List[discord.Embed] = None, - view: discord.ui.View = None, - ephemeral: bool = False, - delete_after: float = None, -) -> discord.Message: - """ - Safely send a message using the most appropriate method based on context. - - For Interactions: - 1. Try edit_original_response() if deferred - 2. Try followup.send() if response is done - 3. Try channel.send() if channel supports it - - For Context: - 1. Try ctx.send() - 2. Try DM to user with context info if channel send fails - - Args: - source: Discord Interaction or Context object - content: Message content - embeds: List of embeds to send - view: UI view to attach - ephemeral: Whether message should be ephemeral (Interaction only) - delete_after: Seconds after which to delete message - - Returns: - The sent message object - - Raises: - Exception: If all send methods fail - """ - logger = logging.getLogger("discord_app") - - # Prepare message kwargs - kwargs = {} - if content is not None: - kwargs["content"] = content - if embeds is not None: - kwargs["embeds"] = embeds - if view is not None: - kwargs["view"] = view - if delete_after is not None: - kwargs["delete_after"] = delete_after - - # Handle Interaction objects - if isinstance(source, discord.Interaction): - # Add ephemeral parameter for interactions - if ephemeral: - kwargs["ephemeral"] = ephemeral - - # Strategy 1: Try edit_original_response if already deferred - if source.response.is_done(): - try: - # For edit_original_response, we need to handle embeds differently - edit_kwargs = kwargs.copy() - if "embeds" in edit_kwargs: - # edit_original_response expects 'embeds' parameter - pass # Already correct - if "ephemeral" in edit_kwargs: - # Can't change ephemeral status on edit - del edit_kwargs["ephemeral"] - - await source.edit_original_response(**edit_kwargs) - # edit_original_response doesn't return a message object in the same way - # We'll use followup as backup to get a returnable message - if ( - "delete_after" not in kwargs - ): # Don't create extra messages if auto-deleting - return await source.followup.send( - "Message sent", ephemeral=True, delete_after=0.1 - ) - return None # Can't return meaningful message object from edit - except Exception as e: - logger.debug(f"Failed to edit original response: {e}") - - # Strategy 2: Try followup.send() - try: - return await source.followup.send(**kwargs) - except Exception as e: - logger.debug(f"Failed to send followup message: {e}") - - # Strategy 3: Try channel.send() if possible - if can_send_message(source.channel): - try: - # Remove ephemeral for channel send (not supported) - channel_kwargs = kwargs.copy() - if "ephemeral" in channel_kwargs: - del channel_kwargs["ephemeral"] - return await source.channel.send(**channel_kwargs) - except Exception as e: - logger.debug(f"Failed to send channel message: {e}") - - # All interaction methods failed - logger.error( - f"All interaction message send methods failed for user {source.user.id}" - ) - raise RuntimeError( - "Unable to send interaction message through any available method" - ) - - # Handle Context objects - elif isinstance(source, commands.Context): - # Strategy 1: Try ctx.send() directly - try: - # Remove ephemeral (not supported in Context) - ctx_kwargs = kwargs.copy() - if "ephemeral" in ctx_kwargs: - del ctx_kwargs["ephemeral"] - return await source.send(**ctx_kwargs) - except Exception as e: - logger.debug(f"Failed to send context message to channel: {e}") - - # Strategy 2: Try DM to user with context info - try: - # Prepare DM with context information - channel_name = getattr(source.channel, "name", "Unknown Channel") - guild_name = ( - getattr(source.guild, "name", "Unknown Server") - if source.guild - else "DM" - ) - - dm_content = f"[Bot Response from #{channel_name} in {guild_name}]\n\n" - if content: - dm_content += content - - # Send DM with modified content - dm_kwargs = kwargs.copy() - dm_kwargs["content"] = dm_content - if "ephemeral" in dm_kwargs: - del dm_kwargs["ephemeral"] - - return await source.author.send(**dm_kwargs) - except Exception as dm_error: - logger.error( - f"Failed to send DM fallback to user {source.author.id}: {dm_error}" - ) - # Both ctx.send() and DM failed - let the exception bubble up - raise dm_error - - else: - raise TypeError( - f"Source must be discord.Interaction or commands.Context, got {type(source)}" - ) - - -def get_role(ctx, role_name): - return discord.utils.get(ctx.guild.roles, name=role_name) - - -async def team_summary_embed(team, ctx, include_roster: bool = True): - embed = get_team_embed(f"{team['lname']} Overview", team) - - embed.add_field(name="General Manager", value=team["gmname"], inline=False) - embed.add_field(name="Wallet", value=f"{team['wallet']}₼") - # embed.add_field(name='Collection Value', value=team['collection_value']) - - p_query = await db_get("packs", params=[("team_id", team["id"]), ("opened", False)]) - if p_query["count"] > 0: - all_packs = {} - for x in p_query["packs"]: - if x["pack_type"]["name"] not in all_packs: - all_packs[x["pack_type"]["name"]] = 1 - else: - all_packs[x["pack_type"]["name"]] += 1 - - pack_string = "" - for pack_type in all_packs: - pack_string += f"{pack_type.title()}: {all_packs[pack_type]}\n" - else: - pack_string = "None" - embed.add_field(name="Unopened Packs", value=pack_string) - embed.add_field(name="Team Rating", value=f"{team['ranking']}") - - r_query = await db_get(f"results/team/{team['id']}?season={PD_SEASON}") - if r_query: - embed.add_field( - name="Record", - value=f"Ranked: {r_query['ranked_wins']}-{r_query['ranked_losses']}\n" - f"Unlimited: {r_query['casual_wins']}-{r_query['casual_losses']}", - ) - - # try: - # r_query = await db_get('rosters', params=[('team_id', team['id'])]) - # if r_query['count']: - # embed.add_field(name=f'Rosters', value=f'** **', inline=False) - # for roster in r_query['rosters']: - # roster_string = '' - # for i in range(1, 27): - # card = roster[f'card_{i}'] - # roster_string += f'{card["player"]["description"]} ({card["player"]["pos_1"]})\n' - # embed.add_field( - # name=f'{roster["name"]} Roster', - # value=roster_string if len(roster_string) else "Unknown" - # ) - # else: - # embed.add_field( - # name='Rosters', - # value='You can set up to three rosters for quick switching from your team sheet.', - # inline=False - # ) - # except Exception as e: - # logger.error(f'Could not pull rosters for {team["abbrev"]}') - # embed.add_field( - # name='Rosters', - # value='Unable to pull current rosters. `/pullroster` to sync.', - # inline=False - # ) - - if include_roster: - embed.add_field(name="Team Sheet", value=get_roster_sheet(team), inline=False) - - embed.add_field( - name="For Help", - value=f"`/help-pd` has FAQs; feel free to post questions in " - f"{get_channel(ctx, 'paper-dynasty-chat').mention}.", - inline=False, - ) - - return embed - - -async def give_cards_to_team( - team, players: list = None, player_ids: list = None, pack_id=None -): - if not pack_id: - p_query = await db_post( - "packs/one", - payload={ - "team_id": team["id"], - "pack_type_id": 4, - "open_time": datetime.datetime.timestamp(datetime.datetime.now()) - * 1000, - }, - ) - pack_id = p_query["id"] - - if not players and not player_ids: - raise ValueError( - "One of players or player_ids must be provided to distribute cards" - ) - - if players: - await db_post( - "cards", - payload={ - "cards": [ - { - "player_id": x["player_id"], - "team_id": team["id"], - "pack_id": pack_id, - } - for x in players - ] - }, - timeout=10, - ) - elif player_ids: - await db_post( - "cards", - payload={ - "cards": [ - {"player_id": x, "team_id": team["id"], "pack_id": pack_id} - for x in player_ids - ] - }, - timeout=10, - ) - - -def get_ratings_guide(sheets): - this_sheet = sheets.open_by_key(RATINGS_SHEET_KEY) - b_sheet = this_sheet.worksheet_by_title("ratings_Batters") - p_sheet = this_sheet.worksheet_by_title("ratings_Pitchers") - - b_data = b_sheet.range("A2:N") - p_data = p_sheet.range("A2:N") - - try: - batters = [ - { - "player_id": int(x[0].value), - "p_name": x[1].value, - "rating": int(x[2].value), - "contact-r": int(x[3].value), - "contact-l": int(x[4].value), - "power-r": int(x[5].value), - "power-l": int(x[6].value), - "vision": int(x[7].value), - "speed": int(x[8].value), - "stealing": int(x[9].value), - "reaction": int(x[10].value), - "arm": int(x[11].value), - "fielding": int(x[12].value), - "hand": int(x[13].value), - } - for x in b_data - ] - pitchers = [ - { - "player_id": int(x[0].value), - "p_name": x[1].value, - "rating": int(x[2].value), - "control-r": int(x[3].value), - "control-l": int(x[4].value), - "stuff-r": int(x[5].value), - "stuff-l": int(x[6].value), - "stamina": int(x[7].value), - "fielding": int(x[8].value), - "hit-9": int(x[9].value), - "k-9": int(x[10].value), - "bb-9": int(x[11].value), - "hr-9": int(x[12].value), - "hand": int(x[13].value), - } - for x in p_data - ] - except Exception as e: - return {"valid": False} - - return {"valid": True, "batter_ratings": batters, "pitcher_ratings": pitchers} - - -async def paperdex_cardset_embed(team: dict, this_cardset: dict) -> list[discord.Embed]: - all_dex = await db_get( - "paperdex", - params=[ - ("team_id", team["id"]), - ("cardset_id", this_cardset["id"]), - ("flat", True), - ], - ) - dex_player_list = [x["player"] for x in all_dex["paperdex"]] - - hof_embed = get_team_embed(f"{team['lname']} Collection", team=team) - mvp_embed = get_team_embed(f"{team['lname']} Collection", team=team) - as_embed = get_team_embed(f"{team['lname']} Collection", team=team) - sta_embed = get_team_embed(f"{team['lname']} Collection", team=team) - res_embed = get_team_embed(f"{team['lname']} Collection", team=team) - rep_embed = get_team_embed(f"{team['lname']} Collection", team=team) - - coll_data = { - 99: {"name": "Hall of Fame", "owned": 0, "players": [], "embeds": [hof_embed]}, - 1: {"name": "MVP", "owned": 0, "players": [], "embeds": [mvp_embed]}, - 2: {"name": "All-Star", "owned": 0, "players": [], "embeds": [as_embed]}, - 3: {"name": "Starter", "owned": 0, "players": [], "embeds": [sta_embed]}, - 4: {"name": "Reserve", "owned": 0, "players": [], "embeds": [res_embed]}, - 5: {"name": "Replacement", "owned": 0, "players": [], "embeds": [rep_embed]}, - "total_owned": 0, - } - - set_players = await db_get( - "players", - params=[("cardset_id", this_cardset["id"]), ("flat", True), ("inc_dex", False)], - timeout=5, - ) - - for player in set_players["players"]: - if player["player_id"] in dex_player_list: - coll_data[player["rarity"]]["owned"] += 1 - coll_data["total_owned"] += 1 - player["owned"] = True - else: - player["owned"] = False - - logger.debug(f"player: {player} / type: {type(player)}") - coll_data[player["rarity"]]["players"].append(player) - - cover_embed = get_team_embed(f"{team['lname']} Collection", team=team) - cover_embed.description = this_cardset["name"] - cover_embed.add_field(name="# Total Cards", value=f"{set_players['count']}") - cover_embed.add_field(name="# Collected", value=f"{coll_data['total_owned']}") - display_embeds = [cover_embed] - - for rarity_id in coll_data: - if rarity_id != "total_owned": - if coll_data[rarity_id]["players"]: - coll_data[rarity_id]["embeds"][ - 0 - ].description = f"Rarity: {coll_data[rarity_id]['name']}" - coll_data[rarity_id]["embeds"][0].add_field( - name="# Collected / # Total Cards", - value=f"{coll_data[rarity_id]['owned']} / {len(coll_data[rarity_id]['players'])}", - inline=False, - ) - - chunk_string = "" - for index, this_player in enumerate(coll_data[rarity_id]["players"]): - logger.debug(f"this_player: {this_player}") - chunk_string += "☑ " if this_player["owned"] else "⬜ " - chunk_string += f"{this_player['p_name']}\n" - - if (index + 1) == len(coll_data[rarity_id]["players"]): - coll_data[rarity_id]["embeds"][0].add_field( - name=f"Group {math.ceil((index + 1) / 20)} / " - f"{math.ceil(len(coll_data[rarity_id]['players']) / 20)}", - value=chunk_string, - ) - - elif (index + 1) % 20 == 0: - coll_data[rarity_id]["embeds"][0].add_field( - name=f"Group {math.floor((index + 1) / 20)} / " - f"{math.ceil(len(coll_data[rarity_id]['players']) / 20)}", - value=chunk_string, - ) - chunk_string = "" - - display_embeds.append(coll_data[rarity_id]["embeds"][0]) - - return display_embeds - - -async def paperdex_team_embed(team: dict, mlb_team: dict) -> list[discord.Embed]: - all_dex = await db_get( - "paperdex", - params=[ - ("team_id", team["id"]), - ("franchise", mlb_team["lname"]), - ("flat", True), - ], - ) - dex_player_list = [x["player"] for x in all_dex["paperdex"]] - - c_query = await db_get("cardsets") - coll_data = {"total_owned": 0} - - total_players = 0 - for x in c_query["cardsets"]: - set_players = await db_get( - "players", - params=[ - ("cardset_id", x["id"]), - ("franchise", mlb_team["lname"]), - ("flat", True), - ("inc_dex", False), - ], - ) - if set_players is not None: - coll_data[x["id"]] = { - "name": x["name"], - "owned": 0, - "players": [], - "embeds": [get_team_embed(f"{team['lname']} Collection", team=team)], - } - total_players += set_players["count"] - - for player in set_players["players"]: - if player["player_id"] in dex_player_list: - coll_data[x["id"]]["owned"] += 1 - coll_data["total_owned"] += 1 - player["owned"] = True - else: - player["owned"] = False - - logger.debug(f"player: {player} / type: {type(player)}") - coll_data[x["id"]]["players"].append(player) - - cover_embed = get_team_embed(f"{team['lname']} Collection", team=team) - cover_embed.description = mlb_team["lname"] - cover_embed.add_field(name="# Total Cards", value=f"{total_players}") - cover_embed.add_field(name="# Collected", value=f"{coll_data['total_owned']}") - display_embeds = [cover_embed] - - for cardset_id in coll_data: - if cardset_id != "total_owned": - if coll_data[cardset_id]["players"]: - coll_data[cardset_id]["embeds"][0].description = ( - f"{mlb_team['lname']} / {coll_data[cardset_id]['name']}" - ) - coll_data[cardset_id]["embeds"][0].add_field( - name="# Collected / # Total Cards", - value=f"{coll_data[cardset_id]['owned']} / {len(coll_data[cardset_id]['players'])}", - inline=False, - ) - - chunk_string = "" - for index, this_player in enumerate(coll_data[cardset_id]["players"]): - logger.debug(f"this_player: {this_player}") - chunk_string += "☑ " if this_player["owned"] else "⬜ " - chunk_string += f"{this_player['p_name']}\n" - - if (index + 1) == len(coll_data[cardset_id]["players"]): - coll_data[cardset_id]["embeds"][0].add_field( - name=f"Group {math.ceil((index + 1) / 20)} / " - f"{math.ceil(len(coll_data[cardset_id]['players']) / 20)}", - value=chunk_string, - ) - - elif (index + 1) % 20 == 0: - coll_data[cardset_id]["embeds"][0].add_field( - name=f"Group {math.floor((index + 1) / 20)} / " - f"{math.ceil(len(coll_data[cardset_id]['players']) / 20)}", - value=chunk_string, - ) - chunk_string = "" - - display_embeds.append(coll_data[cardset_id]["embeds"][0]) - - return display_embeds - - -def get_pack_cover(pack): - if pack["pack_cardset"] is not None and pack["pack_cardset"] == 23: - return IMAGES["pack-pkmnbs"] - elif pack["pack_type"]["name"] in ["Premium", "MVP"]: - return IMAGES["pack-pre"] - elif pack["pack_type"]["name"] == "Standard": - return IMAGES["pack-sta"] - elif pack["pack_type"]["name"] == "Mario": - return IMAGES["pack-mar"] - else: - return None - - -async def open_st_pr_packs(all_packs: list, team: dict, context): - pack_channel = get_channel(context, "pack-openings") - pack_cover = get_pack_cover(all_packs[0]) - - if pack_cover is None: - pack_channel = context.channel - - if not pack_channel: - raise ValueError( - f"I cannot find the pack-openings channel. {get_cal_user(context).mention} - halp?" - ) - - pack_ids = await roll_for_cards(all_packs) - if not pack_ids: - logger.error(f"open_packs - unable to roll_for_cards for packs: {all_packs}") - raise ValueError(f"I was not able to unpack these cards") - - all_cards = [] - for p_id in pack_ids: - new_cards = await db_get("cards", params=[("pack_id", p_id)]) - all_cards.extend(new_cards["cards"]) - - if not all_cards: - logger.error(f"open_packs - unable to get cards for packs: {pack_ids}") - raise ValueError(f"I was not able to display these cards") - - # Present cards to opening channel - if type(context) == commands.Context: - author = context.author - else: - author = context.user - - await context.channel.send(content=f"Let's head down to {pack_channel.mention}!") - await display_cards(all_cards, team, pack_channel, author, pack_cover=pack_cover) - - -async def get_choice_from_cards( - interaction: discord.Interaction, - all_players: list = None, - cover_title: str = None, - cover_desc: str = None, - cover_image_url: str = None, - callback=None, - temp_message: str = None, - conf_message: str = None, - delete_message: bool = False, -): - # Display them with pagination, prev/next/select - card_embeds = [ - await get_card_embeds( - { - "player": x, - "team": { - "lname": "Paper Dynasty", - "season": PD_SEASON, - "logo": IMAGES["logo"], - }, - } - ) - for x in all_players - ] - logger.debug(f"card embeds: {card_embeds}") - - if cover_title is not None and cover_image_url is not None: - page_num = 0 - - view = Pagination([interaction.user], timeout=30) - view.left_button.disabled = True - view.left_button.label = f"Prev: -/{len(card_embeds)}" - view.cancel_button.label = f"Take This Card" - view.cancel_button.style = discord.ButtonStyle.success - view.cancel_button.disabled = True - view.right_button.label = f"Next: 1/{len(card_embeds)}" - - msg = await interaction.channel.send( - content=None, - embed=image_embed( - image_url=cover_image_url, title=cover_title, desc=cover_desc - ), - view=view, - ) - else: - page_num = 1 - - view = Pagination([interaction.user], timeout=30) - view.left_button.label = f"Prev: -/{len(card_embeds)}" - view.left_button.disabled = True - view.cancel_button.label = f"Take This Card" - view.cancel_button.style = discord.ButtonStyle.success - view.right_button.label = f"Next: {page_num + 1}/{len(card_embeds)}" - - msg = await interaction.channel.send( - content=None, embeds=card_embeds[page_num - 1], view=view - ) - - if temp_message is not None: - temp_msg = await interaction.channel.send(content=temp_message) - else: - temp_msg = None - - while True: - await view.wait() - - if view.value: - if view.value == "cancel": - await msg.edit(view=None) - - if callback is not None: - callback(all_players[page_num - 1]) - - if conf_message is not None: - if temp_msg is not None: - await temp_msg.edit(content=conf_message) - else: - await interaction.channel.send(content=conf_message) - break - if view.value == "left": - page_num -= 1 if page_num > 1 else len(card_embeds) - if view.value == "right": - page_num += 1 if page_num < len(card_embeds) else 1 - else: - if page_num == len(card_embeds): - page_num = 1 - else: - page_num += 1 - - view.value = None - - view = Pagination([interaction.user], timeout=30) - view.left_button.label = f"Prev: {page_num - 1}/{len(card_embeds)}" - view.cancel_button.label = f"Take This Card" - view.cancel_button.style = discord.ButtonStyle.success - view.right_button.label = f"Next: {page_num + 1}/{len(card_embeds)}" - if page_num == 1: - view.left_button.label = f"Prev: -/{len(card_embeds)}" - view.left_button.disabled = True - elif page_num == len(card_embeds): - view.right_button.label = f"Next: -/{len(card_embeds)}" - view.right_button.disabled = True - - await msg.edit(content=None, embeds=card_embeds[page_num - 1], view=view) - - if delete_message: - await msg.delete() - return all_players[page_num - 1] - - -async def open_choice_pack( - this_pack, team: dict, context, cardset_id: Optional[int] = None -): - pack_channel = get_channel(context, "pack-openings") - pack_cover = get_pack_cover(this_pack) - pack_type = this_pack["pack_type"]["name"] - - players = [] - - if pack_type == "Mario": - d1000 = random.randint(1, 1000) - if d1000 > 800: - rarity_id = 5 - elif d1000 > 550: - rarity_id = 3 - else: - rarity_id = 2 - pl = await db_get( - "players/random", - params=[ - ("cardset_id", 8), - ("min_rarity", rarity_id), - ("max_rarity", rarity_id), - ("limit", 4), - ], - ) - players = pl["players"] - elif pack_type == "Team Choice": - if this_pack["pack_team"] is None: - raise KeyError(f"Team not listed for Team Choice pack") - - d1000 = random.randint(1, 1000) - pack_cover = this_pack["pack_team"]["logo"] - if d1000 > 800: - rarity_id = 5 - pack_cover = IMAGES["mvp"][this_pack["pack_team"]["lname"]] - elif d1000 > 550: - rarity_id = 3 - else: - rarity_id = 2 - - # # HAX FOR SOCC TO GET HIS MVP PACK - # if (team['abbrev'] in ['KSK', 'NJY']) and (datetime.datetime.today().day == 24): - # rarity_id = 5 - - min_rarity = rarity_id - while len(players) < 4 and rarity_id < 10: - params = [ - ("min_rarity", min_rarity), - ("max_rarity", rarity_id), - ("limit", 4 - len(players)), - ("franchise", this_pack["pack_team"]["lname"]), - ] - if this_pack["pack_team"]["abbrev"] not in ["MSS"]: - params.append(("in_packs", True)) - if cardset_id is not None: - params.append(("cardset_id", cardset_id)) - pl = await db_get("players/random", params=params) - if pl["count"] >= 0: - for x in pl["players"]: - if x not in players: - players.append(x) - if len(players) < 4: - min_rarity += 1 - rarity_id += 1 - elif pack_type == "Promo Choice": - if this_pack["pack_cardset"] is None: - raise KeyError(f"Cardset not listed for Promo Choice pack") - - d1000 = random.randint(1, 1000) - pack_cover = IMAGES["mvp-hype"] - cardset_id = this_pack["pack_cardset"]["id"] - rarity_id = 5 - if d1000 > 800: - rarity_id = 8 - - while len(players) < 4 and rarity_id < 10: - pl = await db_get( - "players/random", - params=[ - ("cardset_id", cardset_id), - ("min_rarity", rarity_id), - ("max_rarity", rarity_id), - ("limit", 8), - ], - ) - if pl["count"] >= 0: - for x in pl["players"]: - if len(players) >= 4: - break - if x not in players: - players.append(x) - if len(players) < 4: - cardset_id = LIVE_CARDSET_ID - else: - # Get 4 MVP cards - rarity_id = 5 - if pack_type == "HoF": - rarity_id = 8 - elif pack_type == "All Star": - rarity_id = 3 - - min_rarity = rarity_id - while len(players) < 4 and rarity_id < 10: - params = [ - ("min_rarity", min_rarity), - ("max_rarity", rarity_id), - ("limit", 4), - ("in_packs", True), - ] - if this_pack["pack_team"] is not None: - params.append(("franchise", this_pack["pack_team"]["lname"])) - if cardset_id is not None: - params.append(("cardset_id", cardset_id)) - pl = await db_get("players/random", params=params) - - if pl["count"] > 0: - players.extend(pl["players"]) - if len(players) < 4: - rarity_id += 3 - - if len(players) == 0: - logger.error(f"Could not create choice pack") - raise ConnectionError(f"Could not create choice pack") - - if type(context) == commands.Context: - author = context.author - else: - author = context.user - - logger.info(f"helpers - open_choice_pack - players: {players}") - - # Display them with pagination, prev/next/select - card_embeds = [ - await get_card_embeds( - # {'player': x, 'team': {'lname': 'Paper Dynasty', 'season': PD_SEASON, 'logo': IMAGES['logo']}} - {"player": x, "team": team} # Show team and dupe info - ) - for x in players - ] - logger.debug(f"card embeds: {card_embeds}") - page_num = 0 - - view = Pagination([author], timeout=30) - view.left_button.disabled = True - view.left_button.label = f"Prev: -/{len(card_embeds)}" - view.cancel_button.label = f"Take This Card" - view.cancel_button.style = discord.ButtonStyle.success - view.cancel_button.disabled = True - view.right_button.label = f"Next: 1/{len(card_embeds)}" - - # React to selection - await context.channel.send(f"Let's head down to {pack_channel.mention}!") - msg = await pack_channel.send( - content=None, - embed=image_embed( - pack_cover, - title=f"{team['lname']}", - desc=f"{pack_type} Pack - Choose 1 of 4 {pack_type}s!", - ), - view=view, - ) - if rarity_id >= 5: - tmp_msg = await pack_channel.send( - content=f"<@&1163537676885033010> we've got an MVP!" - ) - else: - tmp_msg = await pack_channel.send(content=f"We've got a choice pack here!") - - while True: - await view.wait() - - if view.value: - if view.value == "cancel": - await msg.edit(view=None) - - try: - await give_cards_to_team( - team, players=[players[page_num - 1]], pack_id=this_pack["id"] - ) - except Exception as e: - logger.error(f"failed to create cards: {e}") - raise ConnectionError(f"Failed to distribute these cards.") - - await db_patch( - "packs", - object_id=this_pack["id"], - params=[ - ( - "open_time", - int( - datetime.datetime.timestamp(datetime.datetime.now()) - * 1000 - ), - ) - ], - ) - await tmp_msg.edit( - content=f"{players[page_num - 1]['p_name']} has been added to the " - f"**{team['sname']}** binder!" - ) - break - if view.value == "left": - page_num -= 1 if page_num > 1 else len(card_embeds) - if view.value == "right": - page_num += 1 if page_num < len(card_embeds) else 1 - else: - if page_num == len(card_embeds): - page_num = 1 - else: - page_num += 1 - - view.value = None - - view = Pagination([author], timeout=30) - view.left_button.label = f"Prev: {page_num - 1}/{len(card_embeds)}" - view.cancel_button.label = f"Take This Card" - view.cancel_button.style = discord.ButtonStyle.success - view.right_button.label = f"Next: {page_num + 1}/{len(card_embeds)}" - if page_num == 1: - view.left_button.label = f"Prev: -/{len(card_embeds)}" - view.left_button.disabled = True - elif page_num == len(card_embeds): - view.right_button.label = f"Next: -/{len(card_embeds)}" - view.right_button.disabled = True - - await msg.edit(content=None, embeds=card_embeds[page_num - 1], view=view) - - -async def confirm_pack_purchase( - interaction, owner_team, num_packs, total_cost, pack_embed -): - view = Confirm(responders=[interaction.user], timeout=30) - await interaction.channel.send(content=None, embed=pack_embed) - question = await interaction.channel.send( - content=f"Your Wallet: {owner_team['wallet']}₼\n" - f"Pack{'s' if num_packs > 1 else ''} Price: {total_cost}₼\n" - f"After Purchase: {owner_team['wallet'] - total_cost}₼\n\n" - f"Would you like to make this purchase?", - view=view, - ) - await view.wait() - - if not view.value: - await question.edit(content="Saving that money. Smart.", view=None) - return None - else: - return question - - -def player_desc(this_player) -> str: - if this_player["p_name"] in this_player["description"]: - return this_player["description"] - return f"{this_player['description']} {this_player['p_name']}" - - -def player_pcard(this_player): - if this_player["image"] is not None and "pitching" in this_player["image"]: - return this_player["image"] - elif this_player["image2"] is not None and "pitching" in this_player["image2"]: - return this_player["image2"] - else: - return this_player["image"] - - -def player_bcard(this_player): - if this_player["image"] is not None and "batting" in this_player["image"]: - return this_player["image"] - elif this_player["image2"] is not None and "batting" in this_player["image2"]: - return this_player["image2"] - # elif this_player['image'] is not None and 'pitching' in this_player['image']: - # return PITCHER_BATTING_CARD - else: - return this_player["image"] -- 2.25.1