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

This reverts commit 015df15bd5, reversing
changes made to bd2627efe9.

apps/telegram-bot/bot.py

@@ -8,15 +8,12 @@ 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,
@@ -44,10 +41,6 @@ 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(CommandHandler("admin", cmd_admin))
-    app.add_handler(CommandHandler("admin", cmd_admin))
 
     app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
 
@@ -63,9 +56,6 @@ 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"),
-            ("admin", "Manage admins"),
             ("help", "Show help"),
         ]
     )

apps/telegram-bot/commands.py

@@ -1,11 +1,9 @@
 """Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
 
 import time
-from datetime import datetime, timezone
-from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
+from datetime import datetime
 from functools import wraps
 from typing import Optional
-from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 import dateparser
 from telegram import Update
@@ -50,8 +48,6 @@ def format_due_date(due_date_ts: int | None, timezone_str: str) -> str:
     return date_str
 
 
-
-
 def extract_args(text: str) -> list[str]:
     if not text:
         return []
@@ -59,84 +55,51 @@ 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], bool, bool]:
+def parse_args(args: list[str]) -> tuple[Optional[str], Optional[str], Optional[int]]:
     text = None
     link = None
     due_date_ts = None
-    clear_link = False
-    clear_date = False
 
-    i = 0
-    while i < len(args):
-        arg = args[i]
-
-        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://")):
+    remaining = []
+    for arg in args:
+        if 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())
-                i += 1
             else:
-                i += 1
-                if text is None:
-                    text = arg
+                remaining.append(arg)
         else:
-                    text = text + " " + arg
-        else:
-            i += 1
-            if text is None:
-                text = arg
-            else:
-                text = text + " " + arg
+            remaining.append(arg)
 
-    return text, link, due_date_ts, clear_link, clear_date
+    text = " ".join(remaining) if remaining else None
+    return text, link, due_date_ts
 
 
-def format_bounty(b, show_id: bool = True, slice_length: int = 0) -> str:
+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:
-        text = b.text
-        if slice_length > 0 and len(text) > slice_length:
-            text = text[:slice_length] + "..."
-        parts.append(text)
+        parts.append(b.text)
     if b.link:
         parts.append(f"🔗 {b.link}")
     if b.due_date_ts:
-        due_str = time.strftime("%d %b %Y", time.localtime(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)
         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"⏰ Today (OVERDUE)")
+            parts.append(f"⏰ {due_str} (TODAY)")
         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)
 
 
@@ -165,58 +128,13 @@ def get_room_id(update: Update) -> int:
 
 async def cmd_bounty(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     room_id = get_room_id(update)
-    args = extract_args(update.message.text)
+    bounties = BOUNTY_SERVICE.list_bounties(room_id)
 
-    show_all = "all" in args
-    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:
+    if not bounties:
         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 = []
-    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))
-
+    lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties]
     await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
 
@@ -240,7 +158,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) for b in bounties]
+    lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties]
     await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
 
@@ -253,7 +171,7 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         )
         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
@@ -261,7 +179,6 @@ 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(
         room_id=room_id,
         user_id=user_id,
@@ -269,17 +186,12 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         link=link,
         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: {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,
@@ -290,14 +202,7 @@ 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]\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"
+            "Usage: /update <bounty_id> [text] [link] [due_date]"
         )
         return
 
@@ -307,14 +212,8 @@ 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, clear_link, clear_date = parse_args(args[1:])
-    if (
-        not text
-        and not link
-        and due_date_ts is None
-        and not clear_link
-        and not clear_date
-    ):
+    text, link, due_date_ts = parse_args(args[1:])
+    if not text and not link and due_date_ts is None:
         await update.message.reply_text("Nothing to update.")
         return
 
@@ -329,15 +228,10 @@ 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.")
@@ -357,32 +251,28 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     try:
         bounty_ids = [int(arg) for arg in args]
     except ValueError:
-        await update.message.reply_text("Invalid bounty ID.")
+        await update.message.reply_text("Invalid bounty ID(s).")
         return
 
     user_id = get_user_id(update)
     room_id = get_room_id(update)
 
-    try:
     results = BOUNTY_SERVICE.delete_bounties(
         room_id=room_id,
         bounty_ids=bounty_ids,
         user_id=user_id,
     )
-    except PermissionError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
 
-    response_lines = []
+    lines = []
     for bounty_id, result in results.items():
         if result == "deleted":
-            response_lines.append(f"✅ Bounty #{bounty_id} deleted.")
+            lines.append(f"✅ Bounty #{bounty_id} deleted.")
         elif result == "not_found":
-            response_lines.append(f"⛔ Bounty #{bounty_id} not found.")
+            lines.append(f"⛔ Bounty #{bounty_id} not found.")
         elif result == "permission_denied":
-            response_lines.append(f"⛔ Bounty #{bounty_id} permission denied.")
+            lines.append(f"⛔ Bounty #{bounty_id} - only admins can delete.")
 
-    await update.message.reply_text("\n".join(response_lines))
+    await update.message.reply_text("\n".join(lines))
 
 
 async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
@@ -438,101 +328,6 @@ async def cmd_untrack(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Not tracking bounty #{bounty_id}.")
 
 
-async def cmd_admin(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    args = extract_args(update.message.text)
-    if not args:
-        await update.message.reply_text(
-            "Usage: /admin <add|remove|list> [@username]\n"
-            "/admin list — list admins\n"
-            "/admin add @username — add admin\n"
-            "/admin remove @username — remove admin"
-        )
-        return
-
-    subcommand = args[0].lower()
-    username = args[1] if len(args) > 1 else None
-
-    requesting_user_id = get_user_id(update)
-    room_id = get_room_id(update)
-
-    if subcommand == "list":
-        admins = BOUNTY_SERVICE.list_admins(room_id)
-        if not admins:
-            await update.message.reply_text("No admins in this room.")
-            return
-        admin_mentions = " ".join(f"admin_id:{uid}" for uid in admins)
-        await update.message.reply_text(f"Admins: {admin_mentions}")
-        return
-
-    if subcommand == "remove":
-        if not username:
-            await update.message.reply_text("Usage: /admin remove @username")
-            return
-
-        if not username.startswith("@"):
-            await update.message.reply_text(
-                f"⛔ {username} is not a valid username (must start with @)."
-            )
-            return
-
-        target_username = username[1:]
-        try:
-            chat = await ctx.bot.get_chat(target_username)
-            target_user_id = chat.id
-        except Exception:
-            await update.message.reply_text(
-                f"⛔ Could not find user @{target_username}."
-            )
-            return
-
-        try:
-            BOUNTY_SERVICE.remove_admin(room_id, target_user_id, requesting_user_id)
-            await update.message.reply_text(
-                f"✅ @{target_username} is no longer an admin."
-            )
-        except PermissionError as e:
-            await update.message.reply_text(f"⛔ {e}")
-        except ValueError:
-            await update.message.reply_text(f"⛔ @{target_username} is not an admin.")
-        return
-
-    if subcommand == "add":
-        if not username:
-            await update.message.reply_text("Usage: /admin add @username")
-            return
-
-        if not username.startswith("@"):
-            await update.message.reply_text(
-                f"⛔ {username} is not a valid username (must start with @)."
-            )
-            return
-
-        target_username = username[1:]
-        try:
-            chat = await ctx.bot.get_chat(target_username)
-            target_user_id = chat.id
-        except Exception:
-            await update.message.reply_text(
-                f"⛔ Could not find user @{target_username}."
-            )
-            return
-
-        try:
-            BOUNTY_SERVICE.add_admin(room_id, target_user_id, requesting_user_id)
-            await update.message.reply_text(f"✅ @{target_username} is now an admin.")
-        except PermissionError as e:
-            await update.message.reply_text(f"⛔ {e}")
-        except ValueError:
-            await update.message.reply_text(
-                f"⛔ @{target_username} is already an admin."
-            )
-        return
-
-    await update.message.reply_text(
-        "Unknown subcommand. Use: /admin <add|remove|list> [@username]"
-    )
-
-
 async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     if is_group(update):
         await update.message.reply_text(
@@ -553,152 +348,16 @@ 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)
-
-
-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)
-    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"
         "/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"
+        "/update <id> [text> [link] [due] — update bounty\n"
+        "/delete <id> — delete bounty\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

@@ -213,9 +213,12 @@ class BountyService:
     def delete_bounties(
         self, room_id: int, bounty_ids: list[int], user_id: int
     ) -> dict[int, str]:
-        """Soft delete multiple bounties. Returns dict of bounty_id -> result.
+        """Soft delete multiple bounties. Only admins can delete.
 
-        Results can be: 'deleted', 'not_found', 'permission_denied'
+        Returns a dict mapping bounty_id to result:
+        - "deleted": Successfully soft-deleted
+        - "not_found": Bounty does not exist
+        - "permission_denied": User is not admin
         """
         results = {}
         for bounty_id in bounty_ids:

tests/test_services.py

@@ -210,45 +210,52 @@ class TestBountyService:
         result = self.service.delete_bounty(-1001, 999, self.admin_user_id)
         assert result is False
 
-    def test_delete_bounties_multi_id_success(self):
-        """Test delete_bounties returns individual results for multiple bounties."""
-        bounty1 = self.service.add_bounty(
-            room_id=-1001, user_id=self.admin_user_id, text="To delete 1"
+    def test_delete_bounties_multiple_success(self):
+        """Test delete_bounties soft deletes multiple bounties."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="First"
         )
-        bounty2 = self.service.add_bounty(
-            room_id=-1001, user_id=self.admin_user_id, text="To delete 2"
+        b2 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
+        )
+        b3 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Third"
         )
         results = self.service.delete_bounties(
-            -1001, [bounty1.id, bounty2.id], self.admin_user_id
+            -1001, [b1.id, b2.id, b3.id], self.admin_user_id
         )
-        assert results == {bounty1.id: "deleted", bounty2.id: "deleted"}
-        # Verify both are soft deleted
-        assert self.service.get_bounty(-1001, bounty1.id) is None
-        assert self.service.get_bounty(-1001, bounty2.id) is None
+        assert results == {b1.id: "deleted", b2.id: "deleted", b3.id: "deleted"}
+        assert self.service.get_bounty(-1001, b1.id) is None
+        assert self.service.get_bounty(-1001, b2.id) is None
+        assert self.service.get_bounty(-1001, b3.id) is None
 
     def test_delete_bounties_mixed_results(self):
-        """Test delete_bounties returns not_found for non-existent bounties."""
-        bounty = self.service.add_bounty(
-            room_id=-1001, user_id=self.admin_user_id, text="To delete"
+        """Test delete_bounties returns individual results per ID."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Exists"
         )
         results = self.service.delete_bounties(
-            -1001, [bounty.id, 999, 888], self.admin_user_id
+            -1001, [b1.id, 999, 888], self.admin_user_id
         )
-        assert results == {bounty.id: "deleted", 999: "not_found", 888: "not_found"}
+        assert results == {b1.id: "deleted", 999: "not_found", 888: "not_found"}
 
     def test_delete_bounties_permission_denied(self):
-        """Test delete_bounties returns permission_denied for non-admin users."""
-        bounty = self.service.add_bounty(
-            room_id=-1001, user_id=self.admin_user_id, text="To delete"
+        """Test delete_bounties returns permission_denied for non-admin."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="First"
+        )
+        b2 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
         )
         results = self.service.delete_bounties(
             -1001,
-            [bounty.id],
+            [b1.id, b2.id],
             999,  # non-admin user
         )
-        assert results == {bounty.id: "permission_denied"}
-        # Verify bounty was NOT deleted
-        assert self.service.get_bounty(-1001, bounty.id) is not None
+        assert results == {b1.id: "permission_denied", b2.id: "permission_denied"}
+        # Bounties should not be deleted
+        assert self.service.get_bounty(-1001, b1.id) is not None
+        assert self.service.get_bounty(-1001, b2.id) is not None
 
 
 class TestTrackingService: