From 8467f2e48363458381ceb27e8559e64ebfe3e326 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Fri, 25 Aug 2023 13:42:11 -0500 Subject: [PATCH] Player command update --- cogs/players.py | 11 +++++----- helpers.py | 53 +++++++++++++++++++++++++------------------------ 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/cogs/players.py b/cogs/players.py index 3267481..9a7c9ee 100644 --- a/cogs/players.py +++ b/cogs/players.py @@ -499,11 +499,12 @@ class Players(commands.Cog): p_query2 = await db_get('players', params=[('season', season), ('name', p_name)]) player = p_query2['players'][0] - embeds = [await get_player_embed(player, current, ctx, season)] - if player['image2']: - embed = get_team_embed(f'{player["name"]}', player["team"], thumbnail=False) - embed.set_image(url=player['image2']) - embeds.append(embed) + async with ctx.typing(): + embeds = [await get_player_embed(player, current, ctx, season)] + if player['image2']: + embed = get_team_embed(f'{player["name"]}', player["team"], thumbnail=False) + embed.set_image(url=player['image2']) + embeds.append(embed) await ctx.send(content=None, embeds=embeds) diff --git a/helpers.py b/helpers.py index 3db1fba..1e85b51 100644 --- a/helpers.py +++ b/helpers.py @@ -809,7 +809,8 @@ async def get_player_embed(player, current, ctx=None, season=None): player_name = f'{await get_emoji(ctx, "WeenieHut", False)}{player_name}' embed = get_team_embed(f'{player_name}', player["team"]) embed.set_footer(text=f'SBa Season {current["season"]}', icon_url=LOGO) - embed.add_field(name='Current Team', value=player['team']['sname']) + embed.add_field(name='Player ID', value=f'{player["id"]}') + embed.set_image(url=player['image']) # embed.description = f'Player ID {player["id"]}' if player['headshot']: @@ -828,30 +829,18 @@ async def get_player_embed(player, current, ctx=None, season=None): d_query = await db_get('draftpicks', params=[ ('season', current['season']), ('player_id', player['id']) ]) - for x in t_query['transactions']: - if x['week'] == current['week']: - embed.add_field(name='Last Week', value=f'{x["oldteam"]["sname"]}') - if x['week'] == current['week'] + 1: - embed.add_field(name='Next Week', value=f'To {x["newteam"]["sname"]}') - embed.add_field(name='sWAR', value=player['wara']) - embed.set_image(url=player['image']) - - player_pages = f'[SBa]({get_player_url(player)}) / ' \ - f'[BBRef]({get_player_url(player, "bbref")})' - embed.add_field(name='Player Page', value=player_pages) positions = get_player_positions(player) if len(positions) > 0: embed.add_field(name=f'Position{"s" if len(positions) > 1 else ""}', value=",".join(positions)) - if player['team']['abbrev'][-3:].lower() == 'mil': - major_team = await get_team_by_abbrev(player['team']['abbrev'][:-3], season=player['season']) - embed.add_field(name='SBa Affiliate', value=major_team['sname']) - if player['last_game']: - embed.add_field(name='Last G', value=player['last_game']) - if player['last_game2']: - embed.add_field(name='Last G-2', value=player['last_game2']) - if player['il_return']: - embed.add_field(name='IL Return', value=player['il_return']) + embed.add_field(name='sWAR', value=player['wara']) + player_pages = f'[SBa]({get_player_url(player)}) / ' \ + f'[BBRef]({get_player_url(player, "bbref")})' + embed.add_field(name='Player Page', value=player_pages) + # if player['last_game']: + # embed.add_field(name='Last G', value=player['last_game']) + # if player['last_game2']: + # embed.add_field(name='Last G-2', value=player['last_game2']) if player['injury_rating'] is not None: inj_string = f'{player["injury_rating"]}' if player['pos_1'] in ['SP', 'RP']: @@ -863,16 +852,28 @@ async def get_player_embed(player, current, ctx=None, season=None): embed.add_field(name='P Injury', value=f'{player["pitcher_injury"]} (6-{13 - player["pitcher_injury"]})') else: embed.add_field(name='P Injury', value=f'{player["pitcher_injury"]} (---)') - if player['demotion_week'] is not None: - if player['demotion_week'] > current['week']: - embed.add_field(name='Dem Week', value=player["demotion_week"]) if d_query['count'] > 0: pick = d_query['picks'][0] num = pick["overall"] % 16 if num == 0: num = 16 embed.add_field(name='Draft Pick', value=f'{pick["round"]}.{num} ({pick["owner"]["abbrev"]})') - embed.add_field(name='Player ID', value=f'{player["id"]}') + else: + embed.add_field(name='Draft Pick', value=f'None') + embed.add_field(name='Current Team', value=player['team']['sname']) + if player['team']['abbrev'][-3:].lower() == 'mil': + major_team = await get_team_by_abbrev(player['team']['abbrev'][:-3], season=player['season']) + embed.add_field(name='SBa Affiliate', value=major_team['sname']) + if player['demotion_week'] is not None: + if player['demotion_week'] > current['week']: + embed.add_field(name='Dem Week', value=player["demotion_week"]) + if player['il_return']: + embed.add_field(name='IL Return', value=player['il_return']) + for x in t_query['transactions']: + if x['week'] == current['week']: + embed.add_field(name='Last Week', value=f'{x["oldteam"]["sname"]}') + if x['week'] == current['week'] + 1: + embed.add_field(name='Next Week', value=f'To {x["newteam"]["sname"]}') if player['season'] < 8: b, p = None, None @@ -996,7 +997,7 @@ def get_player_url(player, which="sba"): else: return f'https://www.baseball-reference.com/search/search.fcgi?search={stub_name}' else: - return f'https://sombaseball.ddns.net/players?name={stub_name}' + return f'{SBA_BASE_URL}/players/{player["season"]}/{stub_name}' def get_channel(ctx, name):