From 2fe73cf2b2c27386419e776fc4d6f09a68986d8c Mon Sep 17 00:00:00 2001 From: shokollm <270575765+shokollm@users.noreply.github.com> Date: Sat, 4 Apr 2026 07:23:50 +0000 Subject: [PATCH] Revert "Merge pull request 'feat: human-readable date format with timezone awareness' (#68) from fix/issue-54 into main" This reverts commit 922858a81a55e8c33fb267f174635f98c4556025, reversing changes made to 015df15bd59f942bb574d84cbdad19df7b8ba648. --- apps/telegram-bot/commands.py | 45 ++++------------------------------- 1 file changed, 5 insertions(+), 40 deletions(-) diff --git a/apps/telegram-bot/commands.py b/apps/telegram-bot/commands.py index 62ccafa..2f608ad 100644 --- a/apps/telegram-bot/commands.py +++ b/apps/telegram-bot/commands.py @@ -1,7 +1,6 @@ """Telegram command handlers for JIGAIDO - Thin wrappers around core services.""" import time -from datetime import datetime from functools import wraps from typing import Optional from zoneinfo import ZoneInfo, ZoneInfoNotFoundError @@ -21,34 +20,6 @@ TRACKING_SERVICE = TrackingService(TRACKING_STORAGE, ROOM_STORAGE) TELEGRAM_BOT_USERNAME = "your_bot_username" -def format_due_date(due_date_ts: int | None, timezone_str: str) -> str: - """Format due date as human-readable with timezone. - - Examples: - No due date: (none shown) - Date only: 4 April 2026 - Date + time: 4 April 2026 14:30 - With timezone: 4 April 2026 14:30 (Asia/Jakarta) - """ - if not due_date_ts: - return "" - - try: - tz = ZoneInfo(timezone_str) - except (KeyError, ZoneInfoNotFoundError): - tz = ZoneInfo("UTC") - - dt = datetime.fromtimestamp(due_date_ts, tz=tz) - - date_str = dt.strftime("%-d %B %Y") - - if dt.hour != 0 or dt.minute != 0: - date_str += f" {dt.strftime('%H:%M')}" - date_str += f" ({timezone_str})" - - return date_str - - def extract_args(text: str) -> list[str]: if not text: return [] @@ -78,7 +49,7 @@ def parse_args(args: list[str]) -> tuple[Optional[str], Optional[str], Optional[ return text, link, due_date_ts -def format_bounty(b, show_id: bool = True, room_id: int | None = None) -> str: +def format_bounty(b, show_id: bool = True) -> str: parts = [] if show_id: parts.append(f"[#{b.id}]") @@ -87,11 +58,7 @@ def format_bounty(b, show_id: bool = True, room_id: int | None = None) -> str: if b.link: parts.append(f"🔗 {b.link}") if b.due_date_ts: - timezone_str = "UTC" - if room_id is not None: - timezone_str = BOUNTY_SERVICE.get_timezone(room_id) - - due_str = format_due_date(b.due_date_ts, timezone_str) + due_str = time.strftime("%Y-%m-%d", time.localtime(b.due_date_ts)) days_left = (b.due_date_ts - int(time.time())) // 86400 if days_left < 0: parts.append(f"⏰ {due_str} (OVERDUE)") @@ -135,7 +102,7 @@ async def cmd_bounty(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None: await update.message.reply_text("No bounties yet.") return - lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties] + lines = [format_bounty(b, show_id=True) for b in bounties] await update.message.reply_text("\n".join(lines), disable_web_page_preview=True) @@ -145,7 +112,6 @@ async def cmd_my(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None: if is_group(update): group_id = get_group_id(update) bounties = TRACKING_SERVICE.get_tracked_bounties(group_id, user_id) - room_id = group_id else: room_id = get_room_id(update) bounties = BOUNTY_SERVICE.list_bounties(room_id) @@ -159,7 +125,7 @@ async def cmd_my(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None: await update.message.reply_text(msg) return - lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties] + lines = [format_bounty(b, show_id=True) for b in bounties] await update.message.reply_text("\n".join(lines), disable_web_page_preview=True) @@ -190,8 +156,7 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None: due_str = "" if due_date_ts: - timezone_str = BOUNTY_SERVICE.get_timezone(room_id) - due_str = f" | Due: {format_due_date(due_date_ts, timezone_str)}" + due_str = f" | Due: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}" await update.message.reply_text( f"✅ Bounty added (#{bounty.id}){due_str}",