fix: daily check-in interaction migration + paperdex dupe detection
All checks were successful
Build Docker Image / build (pull_request) Successful in 1m23s
All checks were successful
Build Docker Image / build (pull_request) Successful in 1m23s
Fix 1 (closes #19): Complete the migration of daily_checkin to discord.Interaction. Remove greeting = assignments and TODO comment; replace await greeting.edit(...) with await interaction.edit_original_response(...). Fix 2 (closes #23): Implement paperdex dupe detection in get_card_embeds(). Query cards API by player_id + team_id and display a 'Dupes' field on the embed showing how many duplicate copies the team owns. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
6b375e62af
commit
9d71c5a2d1
@ -555,12 +555,11 @@ class Economy(commands.Cog):
|
||||
|
||||
check_count = check_ins['count'] % 5
|
||||
|
||||
# TODO: complete the migration to an interaction
|
||||
# 2nd, 4th, and 5th check-ins
|
||||
if check_count == 0 or check_count % 2 == 0:
|
||||
# Every fifth check-in
|
||||
if check_count == 0:
|
||||
greeting = await interaction.edit_original_response(
|
||||
await interaction.edit_original_response(
|
||||
content=f'Hey, you just earned a Standard pack of cards!'
|
||||
)
|
||||
pack_channel = get_channel(interaction, 'pack-openings')
|
||||
@ -575,7 +574,7 @@ class Economy(commands.Cog):
|
||||
|
||||
# Every second and fourth check-in
|
||||
else:
|
||||
greeting = await interaction.edit_original_response(
|
||||
await interaction.edit_original_response(
|
||||
content=f'Hey, you just earned a player card!'
|
||||
)
|
||||
pack_channel = interaction.channel
|
||||
@ -600,7 +599,7 @@ class Economy(commands.Cog):
|
||||
|
||||
pack_ids = await roll_for_cards(p_query['packs'], extra_val=check_ins['count'])
|
||||
if not pack_ids:
|
||||
await greeting.edit(
|
||||
await interaction.edit_original_response(
|
||||
content=f'I was not able to create these cards {await get_emoji(interaction, "slight_frown")}'
|
||||
)
|
||||
return
|
||||
|
||||
@ -181,11 +181,11 @@ async def get_card_embeds(card, include_stats=False) -> list:
|
||||
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 ""}')
|
||||
if card['team']['lname'] != 'Paper Dynasty':
|
||||
team_dex = await db_get('cards', params=[("player_id", card["player"]["player_id"]), ('team_id', card['team']['id'])])
|
||||
copy_count = team_dex['count'] if team_dex['count'] else 1
|
||||
dupe_count = copy_count - 1
|
||||
embed.add_field(name='Dupes', value=f'{dupe_count} dupe{"s" if dupe_count != 1 else ""}')
|
||||
|
||||
# embed.add_field(name='Team', value=f'{card["player"]["mlbclub"]}')
|
||||
if card["player"]["franchise"] != "Pokemon":
|
||||
|
||||
Loading…
Reference in New Issue
Block a user