diff --git a/cogs/draft.py b/cogs/draft.py index 7a07c3b..e4439c0 100644 --- a/cogs/draft.py +++ b/cogs/draft.py @@ -346,7 +346,7 @@ class Draft(commands.Cog): ]] logger.info(f'sending pick to sheets') - sheets.open_by_key(SBA_SEASON9_DRAFT_KEY).worksheet_by_title('Ordered List').update_values( + sheets.open_by_key(DRAFT_KEY[draft_pick['season']]).worksheet_by_title('Ordered List').update_values( crange=f'D{draft_pick["overall"] + 1}', values=this_pick ) @@ -517,21 +517,25 @@ class Draft(commands.Cog): current = await db_get('current') team = await get_team_by_owner(current['season'], ctx.author.id) if not team: - if ctx.author.id == 403294362550796299: - team = await get_team_by_abbrev('HAM', current['season']) - else: - await ctx.message.add_reaction('❌') - await ctx.send('I don\'t know youuuuuuuuu') - self.pick_lock = False - return + # if ctx.author.id == 403294362550796299: + # team = await get_team_by_abbrev('HAM', current['season']) + # else: + await ctx.message.add_reaction('❌') + await ctx.send('I don\'t know youuuuuuuuu') + self.pick_lock = False + return draft_data = await db_get('draftdata') + if draft_data is None: + logger.error(f'Cannot find draft_data') + await send_to_channel(self.bot, 'commissioners-office', f'Failed to GET draftdata') + raise LookupError('Cannot find draftdata, send help') # draft_pick = await get_one_draftpick_byoverall(current['season'], draft_data['currentpick']) p_query = await db_get('draftpicks', params=[ ('season', current['season']), ('overall', draft_data['currentpick']), ('short_output', False) ]) if p_query['count'] == 0: - raise ValueError(f'No pick found for overall #{draft_data["currentpick"]}') + raise LookupError(f'No pick found for overall #{draft_data["currentpick"]}') draft_pick = p_query['picks'][0] alt_pick_flag = False @@ -547,7 +551,7 @@ class Draft(commands.Cog): ('round_end', math.ceil(draft_pick['overall'] / 16)), ('sort', 'overall-asc'), ('short_output', False) ]) if p_query['count'] == 0: - raise ValueError(f'Draft picks for {team["abbrev"]} not found') + raise LookupError(f'Draft picks for {team["abbrev"]} not found') new_pick = None for x in p_query['picks']: @@ -577,8 +581,18 @@ class Draft(commands.Cog): return player_cog = self.bot.get_cog('Players') - player_name = await fuzzy_player_search(ctx, ctx.channel, self.bot, name, player_cog.player_list.keys()) + try: + player_name = await fuzzy_player_search(ctx, ctx.channel, self.bot, name, player_cog.player_list.keys()) + except ValueError as e: + logger.error(e) + await ctx.send(f'{name} not found') + return player = await get_player_by_name(current['season'], player_name) + if player is None: + e_msg = f'Could not find {player_name} after matching the name' + logger.error(e_msg) + await ctx.send(e_msg) + return the_pick = await self.draft_player(current, draft_data, draft_pick, player) self.pick_lock = False diff --git a/helpers.py b/helpers.py index c7ff93b..6426aae 100644 --- a/helpers.py +++ b/helpers.py @@ -35,6 +35,9 @@ SBA_SEASON6_DRAFT_KEY = '13_xWG1wQy7G4UJvohD8JIUBE-7yuWT9lVta1rkAlHQE' SBA_SEASON7_DRAFT_KEY = '1BgySsUlQf9K21_uOjQOY7O0GrRfF6zt1BBaEFlvBokY' SBA_SEASON8_DRAFT_KEY = '1FG4cAs8OeTdrreRqu8D-APxibjB3RiEzn34KTTBLLDk' SBA_SEASON9_DRAFT_KEY = '1eyHqaVU9rtmhG1p0ZktOrz7FMDp3c_unCcFyMMYceLc' +DRAFT_KEY = { + 11: '1Fz3GcTb7b9tLe8vkpyn59wRwC6P2QzxnLKtp7371sUc' +} SBA_STANDINGS_URL = f'{SBA_BASE_URL}/standings' SBA_SCHEDULE_URL = f'{SBA_BASE_URL}/schedule' SBA_IMAGE_URL = f'{SBA_BASE_URL}/images'