johnnygear/gear-orders
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix exception when no orders given

Browse source 
Message on Telegram when no orders given
This commit is contained in:
Johnny Gear 2025-11-13 22:03:20 -06:00
parent 16af4ab110
commit cec2a56ec0
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
orders.py
View file

@ -12,22 +12,28 @@ from util import timezone
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
async def order_mastodon_post(session, orders_str, repeats, due_at): async def order_mastodon_post(session, orders_str, repeats, due_at):
m_post = "Here are today's orders for @%s -\n\n" % MASTODON_USERNAME post = "Here are today's orders for @%s -\n\n" % MASTODON_USERNAME
m_post += orders_str + "\n\n" post += orders_str + "\n\n"
if repeats > 1: if repeats > 1:
m_post += f"These are the same orders from the last {repeats} days\n\n" post += f"These are the same orders from the last {repeats} days\n\n"
m_post += "Proof of compliance is due by " + due_at.strftime("%H:%M %p") post += "Proof of compliance is due by " + due_at.strftime("%H:%M %p")
m = Mastodon(session) m = Mastodon(session)
return await m.statusPost(m_post) return await m.statusPost(post)
async def order_telegram_post(session, orders_str, repeats, due_at, m_url): async def order_telegram_post(session, orders_str, repeats, due_at, m_url):
t_post = "Here are your orders -\n\n" post = "Here are your orders -\n\n"
t_post += orders_str + "\n\n" post += orders_str + "\n\n"
if repeats > 1: if repeats > 1:
t_post += f"These are the same orders from the last {repeats} days\n\n" post += f"These are the same orders from the last {repeats} days\n\n"
t_post += "Proof of compliance is due by " + due_at.strftime("%H:%M %p") + "\n\n" post += "Proof of compliance is due by " + due_at.strftime("%H:%M %p") + "\n\n"
t_post += m_url post += m_url
t = Telegram(session)
await t.message_send(post)
async def order_telegram_post_none(session):
t_post = "No orders for today"
t = Telegram(session) t = Telegram(session)
await t.message_send(t_post) await t.message_send(t_post)
@ -36,8 +42,9 @@ async def order_issue():
async with make_session() as session: async with make_session() as session:
orders_info = generate_order() orders_info = generate_order()
if 'orders' not in orders_info: if 'orders' not in orders_info or True:
logger.info("No orders for today") logger.info("No orders for today")
await order_telegram_post_none(session)
return return
orders_str = "\n".join(orders_info['orders']) orders_str = "\n".join(orders_info['orders'])

1
scheduling.py
View file

@ -54,6 +54,7 @@ class OrderScheduler():
due_at = await order_issue() due_at = await order_issue()
if due_at is not None:
# Schedule check # Schedule check
self.scheduler.once( self.scheduler.once(
due_at + GRACE_PERIOD, due_at + GRACE_PERIOD,