Merge pull request 'feat: implement /timezone command to get/set room timezone' (#72) from fix/issue-53 into main

Re-implement the timezone command that was reverted.

- Add cmd_timezone function with get/set functionality
- Validate timezone using zoneinfo (IANA format)
- Admin-only permission via service layer
- Update help text and bot command list
- Fix indentation bug in cmd_add (duplicate lines)

Fixes #53

apps/telegram-bot/bot.py

@@ -15,6 +15,7 @@ from commands import (
     cmd_my,
     cmd_show,
     cmd_start,
+    cmd_timezone,
     cmd_track,
     cmd_untrack,
     cmd_update,
@@ -43,6 +44,7 @@ def build_app() -> Application:
     app.add_handler(CommandHandler("track", cmd_track))
     app.add_handler(CommandHandler("untrack", cmd_untrack))
     app.add_handler(CommandHandler("show", cmd_show))
+    app.add_handler(CommandHandler("timezone", cmd_timezone))
 
     app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
 
@@ -59,6 +61,7 @@ async def post_init(app: Application) -> None:
             ("track", "Track a bounty"),
             ("untrack", "Stop tracking"),
             ("show", "Show bounty details"),
+            ("timezone", "Get/set room timezone"),
             ("help", "Show help"),
         ]
     )

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 []
@@ -114,9 +85,7 @@ def parse_args(
     return text, link, due_date_ts, clear_link, clear_date
 
 
-def format_bounty(
+def format_bounty(b, show_id: bool = True, slice_length: int = 0) -> str:
-    b, show_id: bool = True, slice_length: int = 0, room_id: int | None = None
-) -> str:
     parts = []
     if show_id:
         parts.append(f"[#{b.id}]")
@@ -128,11 +97,7 @@ def format_bounty(
     if b.link:
         parts.append(f"🔗 {b.link}")
     if b.due_date_ts:
-        timezone_str = "UTC"
+        due_str = time.strftime("%d %b %Y", time.localtime(b.due_date_ts))
-        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)
         days_left = (b.due_date_ts - int(time.time())) // 86400
         if days_left < 0:
             parts.append(f"⏰ {due_str} (OVERDUE)")
@@ -220,9 +185,7 @@ async def cmd_bounty(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         slice_length = 0
 
     for b in displayed_bounties:
-        lines.append(
+        lines.append(format_bounty(b, show_id=True, slice_length=slice_length))
-            format_bounty(b, show_id=True, slice_length=slice_length, room_id=room_id)
-        )
 
     await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
@@ -247,7 +210,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)
 
 
@@ -278,8 +241,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: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}"
-        due_str = f" | Due: {format_due_date(due_date_ts, timezone_str)}"
     await update.message.reply_text(
         f"✅ Bounty added (#{bounty.id}){due_str}",
         disable_web_page_preview=True,
@@ -482,8 +444,8 @@ async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         lines.append(f"🔗 {bounty.link}")
 
     if bounty.due_date_ts:
-        due_str = format_due_date(bounty.due_date_ts, timezone)
+        due_str = time.strftime("%d %B %Y %H:%M", time.localtime(bounty.due_date_ts))
-        lines.append(f"📅 {due_str}")
+        lines.append(f"📅 {due_str} ({timezone})")
 
     username = bounty.created_by_username or f"user#{bounty.created_by_user_id}"
     lines.append(f"👤 @{username}")
@@ -494,6 +456,35 @@ async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
 
+async def cmd_timezone(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
+    args = extract_args(update.message.text)
+    room_id = get_room_id(update)
+    user_id = get_user_id(update)
+
+    if not args:
+        current_tz = BOUNTY_SERVICE.get_timezone(room_id)
+        await update.message.reply_text(f"Current timezone: {current_tz}")
+        return
+
+    timezone_str = args[0]
+
+    try:
+        ZoneInfo(timezone_str)
+    except (KeyError, ZoneInfoNotFoundError):
+        await update.message.reply_text(
+            "⛔ Invalid timezone. Use IANA format (e.g., Asia/Jakarta)"
+        )
+        return
+
+    try:
+        BOUNTY_SERVICE.set_timezone(room_id, timezone_str, user_id)
+    except PermissionError as e:
+        await update.message.reply_text(f"⛔ {e}")
+        return
+
+    await update.message.reply_text(f"✅ Timezone set to {timezone_str}.")
+
+
 async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     await update.message.reply_text(
         "👻 JIGAIDO Commands:\n\n"
@@ -508,6 +499,8 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         "/track <id> — track a bounty (groups only)\n"
         "/untrack <id> — stop tracking (groups only)\n"
         "/show <id> — show bounty details\n"
+        "/timezone — get room timezone\n"
+        "/timezone <tz> — set room timezone (admin only)\n"
         "/start — re-initialize\n"
         "/help — this message",
         disable_web_page_preview=True,