From c729e4a122e378a9fd0d242ec2e68189be29f514 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Sun, 4 Feb 2024 10:29:32 -0600 Subject: [PATCH] Update transactions.py Cleanup weekly_loop --- cogs/transactions.py | 67 ++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/cogs/transactions.py b/cogs/transactions.py index e373627..f9df939 100644 --- a/cogs/transactions.py +++ b/cogs/transactions.py @@ -332,58 +332,47 @@ class Transactions(commands.Cog): @tasks.loop(minutes=1) async def weekly_loop(self): + if OFFSEASON_FLAG: + return + current = await db_get('current') now = datetime.datetime.now() - logging.info(f'Datetime: {now} / weekday: {now.weekday()}') + logging.debug(f'Datetime: {now} / weekday: {now.weekday()}') # Begin Freeze # if now.weekday() == 0 and now.hour == 5 and not current['freeze']: # Spring/Summer if now.weekday() == 0 and now.hour == 0 and not current['freeze']: # Fall/Winter current['week'] += 1 - if OFFSEASON_FLAG: - pass - # if not self.trade_season: - # await db_patch('current', object_id=current['id'], params=[('week', current['week'])]) - # await self.run_transactions(current) - # stars = f'{"":*<26}' - # freeze_message = f'```\n' \ - # f'{stars}\n' \ - # f' IT\'S TRADE SZN BITCHES\n' \ - # f'{stars}\n```' - # logging.info(f'Freeze string:\n\n{freeze_message}') - # await send_to_channel(self.bot, 'sba-network-news', freeze_message) - # self.trade_season = True - else: - await db_patch('current', object_id=current['id'], params=[('week', current['week']), ('freeze', True)]) - await self.run_transactions(current) + await db_patch('current', object_id=current['id'], params=[('week', current['week']), ('freeze', True)]) + await self.run_transactions(current) - logging.info(f'Building freeze string') - week_num = f'Week {current["week"]}' - stars = f'{"":*<32}' - freeze_message = f'```\n' \ - f'{stars}\n'\ - f'{week_num: >9} Freeze Period Begins\n' \ - f'{stars}\n```' - logging.info(f'Freeze string:\n\n{freeze_message}') - await send_to_channel(self.bot, 'transaction-log', freeze_message) - if current['week'] > 0 and current['week'] <= 18: - await self.post_weekly_info(current) + logging.debug(f'Building freeze string') + week_num = f'Week {current["week"]}' + stars = f'{"":*<32}' + freeze_message = f'```\n' \ + f'{stars}\n'\ + f'{week_num: >9} Freeze Period Begins\n' \ + f'{stars}\n```' + logging.debug(f'Freeze string:\n\n{freeze_message}') + await send_to_channel(self.bot, 'transaction-log', freeze_message) + + if current['week'] > 0 and current['week'] <= 18: + await self.post_weekly_info(current) # End Freeze # elif now.weekday() == 5 and now.hour == 5 and current['freeze']: # Spring/Summer elif now.weekday() == 5 and now.hour == 0 and current['freeze']: # Fall/Winter - if not OFFSEASON_FLAG: - await db_patch('current', object_id=current['id'], params=[('freeze', False)]) + await db_patch('current', object_id=current['id'], params=[('freeze', False)]) - week_num = f'Week {current["week"]}' - stars = f'{"":*<30}' - freeze_message = f'```\n' \ - f'{stars}\n'\ - f'{week_num: >9} Freeze Period Ends\n' \ - f'{stars}\n```' - await self.process_freeze_moves(current) - await send_to_channel(self.bot, 'transaction-log', freeze_message) - self.trade_season = False + week_num = f'Week {current["week"]}' + stars = f'{"":*<30}' + freeze_message = f'```\n' \ + f'{stars}\n'\ + f'{week_num: >9} Freeze Period Ends\n' \ + f'{stars}\n```' + await self.process_freeze_moves(current) + await send_to_channel(self.bot, 'transaction-log', freeze_message) + self.trade_season = False @weekly_loop.before_loop async def before_notif_check(self):