Compare commits
1 Commits
28241eaf61
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e9ec3a5ec |
@@ -47,7 +47,6 @@ def build_app() -> Application:
|
||||
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))
|
||||
|
||||
|
||||
@@ -318,11 +318,11 @@ cmd_edit = cmd_update
|
||||
async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
args = extract_args(update.message.text)
|
||||
if not args:
|
||||
await update.message.reply_text("Usage: /delete <bounty_id> [bounty_id ...]")
|
||||
await update.message.reply_text("Usage: /delete <bounty_id>")
|
||||
return
|
||||
|
||||
try:
|
||||
bounty_ids = [int(arg) for arg in args]
|
||||
bounty_id = int(args[0])
|
||||
except ValueError:
|
||||
await update.message.reply_text("Invalid bounty ID.")
|
||||
return
|
||||
@@ -331,25 +331,19 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
room_id = get_room_id(update)
|
||||
|
||||
try:
|
||||
results = BOUNTY_SERVICE.delete_bounties(
|
||||
success = BOUNTY_SERVICE.delete_bounty(
|
||||
room_id=room_id,
|
||||
bounty_ids=bounty_ids,
|
||||
bounty_id=bounty_id,
|
||||
user_id=user_id,
|
||||
)
|
||||
except PermissionError as e:
|
||||
await update.message.reply_text(f"⛔ {e}")
|
||||
return
|
||||
|
||||
response_lines = []
|
||||
for bounty_id, result in results.items():
|
||||
if result == "deleted":
|
||||
response_lines.append(f"✅ Bounty #{bounty_id} deleted.")
|
||||
elif result == "not_found":
|
||||
response_lines.append(f"⛔ Bounty #{bounty_id} not found.")
|
||||
elif result == "permission_denied":
|
||||
response_lines.append(f"⛔ Bounty #{bounty_id} permission denied.")
|
||||
|
||||
await update.message.reply_text("\n".join(response_lines))
|
||||
if success:
|
||||
await update.message.reply_text(f"✅ Bounty #{bounty_id} deleted.")
|
||||
else:
|
||||
await update.message.reply_text("Bounty not found.")
|
||||
|
||||
|
||||
async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
@@ -405,101 +399,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(
|
||||
@@ -603,11 +502,42 @@ def _find_user_id_by_username(room_id: int, username: str) -> int | None:
|
||||
return None
|
||||
|
||||
|
||||
def _find_username_by_user_id(room_id: int, user_id: int) -> str | None:
|
||||
"""Find username by user_id from bounty creators in the room."""
|
||||
bounties = BOUNTY_SERVICE.list_bounties(room_id)
|
||||
for bounty in bounties:
|
||||
if bounty.created_by_user_id == user_id:
|
||||
return bounty.created_by_username
|
||||
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"):
|
||||
|
||||
# Handle /admin with no subcommand (list admins)
|
||||
if not args or args[0] == "list":
|
||||
room_id = get_room_id(update)
|
||||
admin_ids = BOUNTY_SERVICE.list_admins(room_id)
|
||||
|
||||
if not admin_ids:
|
||||
await update.message.reply_text("No admins configured for this room.")
|
||||
return
|
||||
|
||||
lines = ["Room Admins:"]
|
||||
for admin_id in admin_ids:
|
||||
username = _find_username_by_user_id(room_id, admin_id)
|
||||
if username:
|
||||
lines.append(f"- @{username}")
|
||||
else:
|
||||
lines.append(f"- user#{admin_id}")
|
||||
|
||||
await update.message.reply_text("\n".join(lines))
|
||||
return
|
||||
|
||||
if args[0] not in ("add", "remove"):
|
||||
await update.message.reply_text(
|
||||
"Usage:\n"
|
||||
"/admin — list admins\n"
|
||||
"/admin add @username — add admin\n"
|
||||
"/admin remove @username — remove admin"
|
||||
)
|
||||
@@ -666,6 +596,9 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
"/show <id> — show bounty details\n"
|
||||
"/timezone — get room timezone\n"
|
||||
"/timezone <tz> — set room timezone (admin only)\n"
|
||||
"/admin — list room admins\n"
|
||||
"/admin add @username — add admin (admin only)\n"
|
||||
"/admin remove @username — remove admin (admin only)\n"
|
||||
"/start — re-initialize\n"
|
||||
"/help — this message",
|
||||
disable_web_page_preview=True,
|
||||
|
||||
@@ -210,28 +210,6 @@ class BountyService:
|
||||
self._storage.update_bounty(room_id, bounty)
|
||||
return True
|
||||
|
||||
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.
|
||||
|
||||
Results can be: 'deleted', 'not_found', 'permission_denied'
|
||||
"""
|
||||
results = {}
|
||||
for bounty_id in bounty_ids:
|
||||
bounty = self._storage.get_bounty(room_id, bounty_id)
|
||||
if not bounty:
|
||||
results[bounty_id] = "not_found"
|
||||
continue
|
||||
if not self.is_admin(room_id, user_id):
|
||||
results[bounty_id] = "permission_denied"
|
||||
continue
|
||||
|
||||
bounty.deleted_at = int(time.time())
|
||||
self._storage.update_bounty(room_id, bounty)
|
||||
results[bounty_id] = "deleted"
|
||||
return results
|
||||
|
||||
|
||||
class TrackingService:
|
||||
"""Service for tracking bounty operations."""
|
||||
|
||||
@@ -210,46 +210,6 @@ 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"
|
||||
)
|
||||
bounty2 = self.service.add_bounty(
|
||||
room_id=-1001, user_id=self.admin_user_id, text="To delete 2"
|
||||
)
|
||||
results = self.service.delete_bounties(
|
||||
-1001, [bounty1.id, bounty2.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
|
||||
|
||||
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"
|
||||
)
|
||||
results = self.service.delete_bounties(
|
||||
-1001, [bounty.id, 999, 888], self.admin_user_id
|
||||
)
|
||||
assert results == {bounty.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"
|
||||
)
|
||||
results = self.service.delete_bounties(
|
||||
-1001,
|
||||
[bounty.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
|
||||
|
||||
|
||||
class TestTrackingService:
|
||||
"""Unit tests for TrackingService."""
|
||||
|
||||
Reference in New Issue
Block a user