feat: implement /admin add @username command

- Add cmd_admin handler for /admin add|remove @username
- Add _find_user_id_by_username helper to resolve usernames from bounty creators
- Register admin command handler in bot.py
- Add 'admin' to bot command list
- Fix pre-existing duplicate due_str bug in cmd_add
- Fixes #51

apps/telegram-bot/bot.py

@@ -8,13 +8,14 @@ from telegram.ext import Application, CommandHandler, MessageHandler, filters
 
 from commands import (
     cmd_add,
+    cmd_admin,
     cmd_bounty,
     cmd_delete,
     cmd_edit,
     cmd_help,
     cmd_my,
+    cmd_show,
     cmd_start,
-    cmd_timezone,
     cmd_track,
     cmd_untrack,
     cmd_update,
@@ -42,7 +43,8 @@ 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("timezone", cmd_timezone))
+    app.add_handler(CommandHandler("show", cmd_show))
+    app.add_handler(CommandHandler("admin", cmd_admin))
 
     app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
 
@@ -58,7 +60,8 @@ async def post_init(app: Application) -> None:
             ("edit", "Edit a bounty"),
             ("track", "Track a bounty"),
             ("untrack", "Stop tracking"),
-            ("timezone", "Get/set room timezone"),
+            ("show", "Show bounty details"),
+            ("admin", "Manage admins"),
             ("help", "Show help"),
         ]
     )

apps/telegram-bot/commands.py

@@ -1,10 +1,8 @@
 """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
 
 import dateparser
 from telegram import Update
@@ -21,34 +19,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,25 +84,24 @@ def parse_args(
     return text, link, due_date_ts, clear_link, clear_date
 
 
-def format_bounty(b, show_id: bool = True, room_id: int | None = None) -> str:
+def format_bounty(b, show_id: bool = True, slice_length: int = 0) -> 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:
@@ -165,13 +134,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)
 
 
@@ -195,7 +209,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)
 
 
@@ -226,9 +240,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,
@@ -401,6 +413,107 @@ async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         )
 
 
+async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
+    args = extract_args(update.message.text)
+    if not args:
+        await update.message.reply_text("Usage: /show <bounty_id>")
+        return
+
+    try:
+        bounty_id = int(args[0])
+    except ValueError:
+        await update.message.reply_text("Invalid bounty ID.")
+        return
+
+    room_id = get_room_id(update)
+    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)
+
+
+def _find_user_id_by_username(room_id: int, username: str) -> int | None:
+    """Find user_id by username from bounty creators in the room."""
+    bounties = BOUNTY_SERVICE.list_bounties(room_id)
+    for bounty in bounties:
+        if (
+            bounty.created_by_username
+            and bounty.created_by_username.lower() == username.lower()
+        ):
+            return bounty.created_by_user_id
+    return None
+
+
+async def cmd_admin(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
+    args = extract_args(update.message.text)
+    if not args or args[0] not in ("add", "remove"):
+        await update.message.reply_text(
+            "Usage:\n"
+            "/admin add @username — add admin\n"
+            "/admin remove @username — remove admin"
+        )
+        return
+
+    subcommand = args[0]
+
+    if len(args) < 2:
+        await update.message.reply_text(f"Usage: /admin {subcommand} @username")
+        return
+
+    raw_username = args[1]
+    if not raw_username.startswith("@"):
+        await update.message.reply_text(f"Usage: /admin {subcommand} @username")
+        return
+
+    username = raw_username[1:]
+
+    user_id = get_user_id(update)
+    room_id = get_room_id(update)
+
+    if not BOUNTY_SERVICE.is_admin(room_id, user_id):
+        await update.message.reply_text("⛔ Only admins can perform this action.")
+        return
+
+    target_user_id = _find_user_id_by_username(room_id, username)
+
+    if target_user_id is None:
+        await update.message.reply_text(f"⛔ User @{username} not found.")
+        return
+
+    try:
+        if subcommand == "add":
+            BOUNTY_SERVICE.add_admin(room_id, target_user_id, user_id)
+            await update.message.reply_text(f"✅ @{username} is now an admin.")
+        elif subcommand == "remove":
+            BOUNTY_SERVICE.remove_admin(room_id, target_user_id, user_id)
+            await update.message.reply_text(f"✅ @{username} is no longer an admin.")
+    except PermissionError as e:
+        await update.message.reply_text(f"⛔ {e}")
+
+
 async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     await update.message.reply_text(
         "👻 JIGAIDO Commands:\n\n"
@@ -414,37 +527,8 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         "/delete <id> — delete bounty (admin only)\n"
         "/track <id> — track a bounty (groups only)\n"
         "/untrack <id> — stop tracking (groups only)\n"
-        "/timezone [tz] — get/set room timezone (admin only)\n"
+        "/show <id> — show bounty details\n"
         "/start — re-initialize\n"
         "/help — this message",
         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}.")