feat: implement /timezone command to get/set room timezone

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

@@ -13,6 +13,7 @@ from commands import (
     cmd_edit,
     cmd_help,
     cmd_my,
+    cmd_show,
     cmd_start,
     cmd_timezone,
     cmd_track,
@@ -42,6 +43,7 @@ def build_app() -> Application:
     app.add_handler(CommandHandler("delete", cmd_delete))
     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))
@@ -58,6 +60,7 @@ async def post_init(app: Application) -> None:
             ("edit", "Edit a bounty"),
             ("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 []
@@ -56,77 +27,82 @@ def extract_args(text: str) -> list[str]:
     return tokens[1:] if len(tokens) > 1 else []
 
 
-def parse_args(args: list[str]) -> tuple[Optional[str], Optional[str], Optional[int]]:
+def parse_args(
+    args: list[str],
+) -> tuple[Optional[str], Optional[str], Optional[int], bool, bool]:
     text = None
     link = None
     due_date_ts = None
+    clear_link = False
+    clear_date = False
 
-    remaining = []
     i = 0
     while i < len(args):
         arg = args[i]
-        if not link and (arg.startswith("http://") or arg.startswith("https://")):
+
+        if arg == "-link":
+            if i + 1 < len(args) and (
+                args[i + 1].startswith("http://") or args[i + 1].startswith("https://")
+            ):
+                link = args[i + 1]
+                i += 2
+            else:
+                clear_link = True
+                i += 1
+        elif arg == "-date":
+            if i + 1 < len(args):
+                parsed = dateparser.parse(args[i + 1])
+                if parsed:
+                    due_date_ts = int(parsed.timestamp())
+                    i += 2
+                else:
+                    clear_date = True
+                    i += 1
+            else:
+                clear_date = True
+                i += 1
+        elif not link and (arg.startswith("http://") or arg.startswith("https://")):
             link = arg
+            i += 1
         elif due_date_ts is None:
             parsed = dateparser.parse(arg)
             if parsed:
                 due_date_ts = int(parsed.timestamp())
-                if i + 1 < len(args) and _is_time_format(args[i + 1]):
+                i += 1
-                    time_str = args[i + 1]
-                    hour, minute = map(int, time_str.split(":"))
-                    due_date_ts = _set_time_on_timestamp(due_date_ts, hour, minute)
-                    i += 1
             else:
-                remaining.append(arg)
+                i += 1
+                if text is None:
+                    text = arg
+                else:
+                    text = text + " " + arg
         else:
-            remaining.append(arg)
+            i += 1
-        i += 1
+            if text is None:
+                text = arg
+            else:
+                text = text + " " + arg
 
-    text = " ".join(remaining) if remaining else None
+    return text, link, due_date_ts, clear_link, clear_date
-    return text, link, due_date_ts
 
 
-def _is_time_format(s: str) -> bool:
+def format_bounty(b, show_id: bool = True, slice_length: int = 0) -> str:
-    """Check if string matches HH:MM format."""
-    if not s or len(s) != 5:
-        return False
-    if s[2] != ":":
-        return False
-    try:
-        h, m = map(int, s.split(":"))
-        return 0 <= h <= 23 and 0 <= m <= 59
-    except ValueError:
-        return False
-
-
-def _set_time_on_timestamp(ts: int, hour: int, minute: int) -> int:
-    """Set time (hour:minute) on a Unix timestamp, keeping the date."""
-    import datetime
-
-    dt = datetime.datetime.fromtimestamp(ts)
-    dt = dt.replace(hour=hour, minute=minute, second=0, microsecond=0)
-    return int(dt.timestamp())
-
-
-def format_bounty(b, show_id: bool = True, room_id: int | None = None) -> str:
     parts = []
     if show_id:
         parts.append(f"[#{b.id}]")
     if b.text:
-        parts.append(b.text)
+        text = b.text
+        if slice_length > 0 and len(text) > slice_length:
+            text = text[:slice_length] + "..."
+        parts.append(text)
     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)")
         elif days_left == 0:
-            parts.append(f"⏰ {due_str} (TODAY)")
+            parts.append(f"⏰ Today (OVERDUE)")
         else:
             parts.append(f"⏰ {due_str} ({days_left}d)")
     if b.created_by_user_id:
@@ -159,13 +135,58 @@ def get_room_id(update: Update) -> int:
 
 async def cmd_bounty(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     room_id = get_room_id(update)
-    bounties = BOUNTY_SERVICE.list_bounties(room_id)
+    args = extract_args(update.message.text)
 
-    if not bounties:
+    show_all = "all" in args
-        await update.message.reply_text("No bounties yet.")
+    args = [a for a in args if a != "all"]
+
+    try:
+        limit = int(args[0]) if args else 5
+    except (ValueError, IndexError):
+        limit = 5
+
+    now = int(time.time())
+    cutoff_24h = now - 86400
+
+    all_bounties = BOUNTY_SERVICE.list_bounties(room_id)
+
+    def is_expired(b) -> bool:
+        return b.due_date_ts is not None and b.due_date_ts < cutoff_24h
+
+    def sort_key(b):
+        if b.due_date_ts is not None:
+            return (0, b.due_date_ts)
+        return (1, b.created_at)
+
+    filtered_bounties = [b for b in all_bounties if not is_expired(b) or show_all]
+    filtered_bounties.sort(key=sort_key)
+
+    total_count = len(filtered_bounties)
+    displayed_bounties = filtered_bounties[:limit]
+
+    if not displayed_bounties:
+        if show_all:
+            await update.message.reply_text("No bounties yet.")
+        else:
+            await update.message.reply_text(
+                "No active bounties. Use /bounty all to show expired."
+            )
         return
 
-    lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties]
+    lines = []
+    if limit < total_count:
+        lines.append(f"Showing {limit} of {total_count} bounties:")
+        slice_length = 40
+    elif show_all and total_count > limit:
+        lines.append(f"Showing {limit} of {total_count} bounties (including expired):")
+        slice_length = 40
+    else:
+        lines.append(f"Showing {total_count} bounties:")
+        slice_length = 0
+
+    for b in displayed_bounties:
+        lines.append(format_bounty(b, show_id=True, slice_length=slice_length))
+
     await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
 
@@ -189,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)
 
 
@@ -197,12 +218,12 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     args = extract_args(update.message.text)
     if not args:
         await update.message.reply_text(
-            "Usage: /add <text> [link] [date] [time]\n"
+            "Usage: /add <text> [link] [due_date]\n"
-            "Example: /add Fix bug https://github.com/foo/bar april 15 14:30"
+            "Example: /add Fix the bug https://github.com/foo/bar tomorrow"
         )
         return
 
-    text, link, due_date_ts = parse_args(args)
+    text, link, due_date_ts, _, _ = parse_args(args)
     if not text and not link:
         await update.message.reply_text("A bounty needs at least text or a link.")
         return
@@ -210,26 +231,17 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     user_id = get_user_id(update)
     room_id = get_room_id(update)
 
-    try:
+    bounty = BOUNTY_SERVICE.add_bounty(
-        bounty = BOUNTY_SERVICE.add_bounty(
+        room_id=room_id,
-            room_id=room_id,
+        user_id=user_id,
-            user_id=user_id,
+        text=text,
-            text=text,
+        link=link,
-            link=link,
+        due_date_ts=due_date_ts,
-            due_date_ts=due_date_ts,
+    )
-        )
-    except PermissionError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
-    except ValueError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
 
     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,
@@ -240,7 +252,14 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     args = extract_args(update.message.text)
     if len(args) < 1:
         await update.message.reply_text(
-            "Usage: /update <bounty_id> [text] [link] [due_date]"
+            "Usage: /update <bounty_id> [text] [link] [due_date]\n"
+            "       /update <bounty_id> -link [<url>]   - clear or set link\n"
+            "       /update <bounty_id> -date [<date>]   - clear or set date\n"
+            "Examples:\n"
+            "  /update 1 new text           - update text only\n"
+            "  /update 1 -link              - clear link\n"
+            "  /update 1 -link https://...  - set link\n"
+            "  /update 1 -link -date        - clear both link and date"
         )
         return
 
@@ -250,8 +269,14 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Invalid bounty ID.")
         return
 
-    text, link, due_date_ts = parse_args(args[1:])
+    text, link, due_date_ts, clear_link, clear_date = parse_args(args[1:])
-    if not text and not link and due_date_ts is None:
+    if (
+        not text
+        and not link
+        and due_date_ts is None
+        and not clear_link
+        and not clear_date
+    ):
         await update.message.reply_text("Nothing to update.")
         return
 
@@ -266,10 +291,15 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
             text=text,
             link=link,
             due_date_ts=due_date_ts,
+            clear_link=clear_link,
+            clear_due=clear_date,
         )
     except PermissionError as e:
         await update.message.reply_text(f"⛔ {e}")
         return
+    except ValueError as e:
+        await update.message.reply_text(f"⛔ {e}")
+        return
 
     if success:
         await update.message.reply_text(f"✅ Bounty #{bounty_id} updated.")
@@ -384,21 +414,46 @@ async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         )
 
 
-async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
+async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    await update.message.reply_text(
+    args = extract_args(update.message.text)
-        "👻 JIGAIDO Commands:\n\n"
+    if not args:
-        "/bounty — list all bounties\n"
+        await update.message.reply_text("Usage: /show <bounty_id>")
-        "/my — bounties you're tracking\n"
+        return
-        "/add <text> [link] [date] [time] — add bounty (admin only)\n"
+
-        "/update <id> [text] [link] [due] — update bounty (admin only)\n"
+    try:
-        "/delete <id> — delete bounty (admin only)\n"
+        bounty_id = int(args[0])
-        "/track <id> — track a bounty (groups only)\n"
+    except ValueError:
-        "/untrack <id> — stop tracking (groups only)\n"
+        await update.message.reply_text("Invalid bounty ID.")
-        "/timezone [tz] — get/set room timezone (admin only)\n"
+        return
-        "/start — re-initialize\n"
+
-        "/help — this message",
+    room_id = get_room_id(update)
-        disable_web_page_preview=True,
+    bounty = BOUNTY_SERVICE.get_bounty(room_id, bounty_id)
-    )
+
+    if not bounty:
+        await update.message.reply_text("Bounty not found.")
+        return
+
+    timezone = BOUNTY_SERVICE.get_timezone(room_id)
+
+    lines = []
+
+    title = bounty.text or "(no text)"
+    lines.append(f"[#{bounty.id}] {title}")
+
+    if bounty.link:
+        lines.append(f"🔗 {bounty.link}")
+
+    if bounty.due_date_ts:
+        due_str = time.strftime("%d %B %Y %H:%M", time.localtime(bounty.due_date_ts))
+        lines.append(f"📅 {due_str} ({timezone})")
+
+    username = bounty.created_by_username or f"user#{bounty.created_by_user_id}"
+    lines.append(f"👤 @{username}")
+
+    created_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(bounty.created_at))
+    lines.append(f"📌 Created: {created_str}")
+
+    await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
 
 async def cmd_timezone(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
@@ -428,3 +483,25 @@ async def cmd_timezone(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         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"
+        "/bounty — list all bounties\n"
+        "/my — bounties you're tracking\n"
+        "/add <text> [link] [due] — add bounty\n"
+        "/update <id> [text] [link] [due] — update bounty\n"
+        "/edit <id> [text] [link] [due] — edit bounty (same as update)\n"
+        "  /edit <id> -link [<url>]  — clear or set link\n"
+        "  /edit <id> -date [<date>] — clear or set date\n"
+        "/delete <id> — delete bounty (admin only)\n"
+        "/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,
+    )

core/services.py

@@ -96,24 +96,21 @@ class BountyService:
 
     def check_link_unique(
         self, room_id: int, link: str | None, exclude_bounty_id: int | None = None
-    ) -> int | None:
+    ) -> bool:
-        """Check if a link is unique within a room (not used by another bounty).
+        """Check if a link is unique within a room (not used by another bounty)."""
-
-        Returns the conflicting bounty ID if found, or None if unique/allowed.
-        """
         if not link:
-            return None
+            return True
 
         room_data = self._storage.load(room_id)
         if room_data is None:
-            return None
+            return True
 
         for bounty in room_data.bounties:
             if bounty.deleted_at is not None:
                 continue
             if bounty.link == link and bounty.id != exclude_bounty_id:
-                return bounty.id
+                return False
-        return None
+        return True
 
     def add_bounty(
         self,
@@ -127,11 +124,8 @@ class BountyService:
         if not self.is_admin(room_id, user_id):
             raise PermissionError("Only admins can add bounties.")
 
-        conflicting_id = self.check_link_unique(room_id, link)
+        if not self.check_link_unique(room_id, link):
-        if conflicting_id is not None:
+            raise ValueError("A bounty with this link already exists in this room.")
-            raise ValueError(
-                f"A bounty with this link already exists: #{conflicting_id}"
-            )
 
         room_data = self._storage.load(room_id)
         if room_data is None:
@@ -184,10 +178,8 @@ class BountyService:
         if not self.is_admin(room_id, user_id):
             raise PermissionError("Only admins can edit bounties.")
 
-        if (
+        if link and not self.check_link_unique(
-            link
+            room_id, link, exclude_bounty_id=bounty_id
-            and self.check_link_unique(room_id, link, exclude_bounty_id=bounty_id)
-            is not None
         ):
             raise ValueError("A bounty with this link already exists in this room.")