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

@@ -14,10 +14,8 @@ from commands import (
     cmd_edit,
     cmd_help,
     cmd_my,
-    cmd_recover,
     cmd_show,
     cmd_start,
-    cmd_timezone,
     cmd_track,
     cmd_untrack,
     cmd_update,
@@ -46,9 +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(CommandHandler("admin", cmd_admin))
-    app.add_handler(CommandHandler("recover", cmd_recover))
 
     app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
 
@@ -65,9 +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"),
             ("admin", "Manage admins"),
-            ("recover", "Recover deleted bounties"),
             ("help", "Show help"),
         ]
     )

apps/telegram-bot/commands.py

@@ -3,7 +3,6 @@
 import time
 from functools import wraps
 from typing import Optional
-from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 import dateparser
 from telegram import Update
@@ -105,6 +104,8 @@ def format_bounty(b, show_id: bool = True, slice_length: int = 0) -> str:
             parts.append(f"⏰ Today (OVERDUE)")
         else:
             parts.append(f"⏰ {due_str} ({days_left}d)")
+    if b.created_by_user_id:
+        parts.append(f"by {b.created_by_user_id}")
     return " | ".join(parts)
 
 
@@ -229,20 +230,13 @@ 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:
@@ -346,68 +340,6 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Bounty not found.")
 
 
-async def cmd_recover(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)
-
-    try:
-        if not BOUNTY_SERVICE.is_admin(room_id, user_id):
-            await update.message.reply_text("⛔ Only admins can recover bounties.")
-            return
-    except PermissionError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
-
-    if not args:
-        deleted_bounties = BOUNTY_SERVICE.list_deleted_bounties(room_id)
-        if not deleted_bounties:
-            await update.message.reply_text("No recoverable bounties.")
-            return
-
-        deleted_bounties.sort(key=lambda b: b.deleted_at or 0, reverse=True)
-
-        lines = ["Recoverable bounties:"]
-        for b in deleted_bounties:
-            deleted_str = time.strftime("%d %b %Y", time.localtime(b.deleted_at))
-            text_part = (
-                b.text[:40] + "..."
-                if b.text and len(b.text) > 40
-                else (b.text or "(no text)")
-            )
-            lines.append(f"[#{b.id}] {text_part} | 🗑️ Deleted {deleted_str}")
-
-        await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
-        return
-
-    bounty_ids = []
-    for arg in args:
-        try:
-            bounty_ids.append(int(arg))
-        except ValueError:
-            await update.message.reply_text(f"Invalid bounty ID: {arg}")
-            return
-
-    results = []
-    for bounty_id in bounty_ids:
-        try:
-            success, message = BOUNTY_SERVICE.recover_bounty(
-                room_id=room_id,
-                bounty_id=bounty_id,
-                user_id=user_id,
-            )
-        except PermissionError as e:
-            results.append(f"⛔ {e}")
-            continue
-
-        if success:
-            results.append(f"✅ {message}")
-        else:
-            results.append(f"⛔ {message}")
-
-    await update.message.reply_text("\n".join(results))
-
-
 async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     if not is_group(update):
         await update.message.reply_text("⛔ /track is only available in groups.")
@@ -523,35 +455,6 @@ 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}.")
-
-
 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)
@@ -625,8 +528,6 @@ 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,

core/services.py

@@ -210,33 +210,6 @@ class BountyService:
         self._storage.update_bounty(room_id, bounty)
         return True
 
-    def recover_bounty(
-        self, room_id: int, bounty_id: int, user_id: int
-    ) -> tuple[bool, str]:
-        """Recover a soft-deleted bounty. Only admins can recover.
-
-        Returns (success, message) tuple.
-        """
-        if not self.is_admin(room_id, user_id):
-            raise PermissionError("Only admins can recover bounties.")
-
-        all_bounties = self._storage.list_all_bounties(room_id, include_deleted=True)
-        bounty = None
-        for b in all_bounties:
-            if b.id == bounty_id:
-                bounty = b
-                break
-
-        if not bounty:
-            return False, f"Bounty #{bounty_id} not found."
-
-        if bounty.deleted_at is None:
-            return False, f"Bounty #{bounty_id} is not deleted."
-
-        bounty.deleted_at = None
-        self._storage.update_bounty(room_id, bounty)
-        return True, f"Recovered bounty #{bounty_id}."
-
 
 class TrackingService:
     """Service for tracking bounty operations."""