Compare commits
1 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90b0b564c2 |
@@ -318,11 +318,11 @@ cmd_edit = cmd_update
|
|||||||
async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
args = extract_args(update.message.text)
|
args = extract_args(update.message.text)
|
||||||
if not args:
|
if not args:
|
||||||
await update.message.reply_text("Usage: /delete <bounty_id>")
|
await update.message.reply_text("Usage: /delete <bounty_id> [bounty_id ...]")
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
bounty_id = int(args[0])
|
bounty_ids = [int(arg) for arg in args]
|
||||||
except ValueError:
|
except ValueError:
|
||||||
await update.message.reply_text("Invalid bounty ID.")
|
await update.message.reply_text("Invalid bounty ID.")
|
||||||
return
|
return
|
||||||
@@ -331,19 +331,25 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
room_id = get_room_id(update)
|
room_id = get_room_id(update)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
success = BOUNTY_SERVICE.delete_bounty(
|
results = BOUNTY_SERVICE.delete_bounties(
|
||||||
room_id=room_id,
|
room_id=room_id,
|
||||||
bounty_id=bounty_id,
|
bounty_ids=bounty_ids,
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
)
|
)
|
||||||
except PermissionError as e:
|
except PermissionError as e:
|
||||||
await update.message.reply_text(f"⛔ {e}")
|
await update.message.reply_text(f"⛔ {e}")
|
||||||
return
|
return
|
||||||
|
|
||||||
if success:
|
response_lines = []
|
||||||
await update.message.reply_text(f"✅ Bounty #{bounty_id} deleted.")
|
for bounty_id, result in results.items():
|
||||||
else:
|
if result == "deleted":
|
||||||
await update.message.reply_text("Bounty not found.")
|
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))
|
||||||
|
|
||||||
|
|
||||||
async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
@@ -502,42 +508,11 @@ def _find_user_id_by_username(room_id: int, username: str) -> int | None:
|
|||||||
return 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:
|
async def cmd_admin(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
args = extract_args(update.message.text)
|
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(
|
await update.message.reply_text(
|
||||||
"Usage:\n"
|
"Usage:\n"
|
||||||
"/admin — list admins\n"
|
|
||||||
"/admin add @username — add admin\n"
|
"/admin add @username — add admin\n"
|
||||||
"/admin remove @username — remove admin"
|
"/admin remove @username — remove admin"
|
||||||
)
|
)
|
||||||
@@ -596,9 +571,6 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
"/show <id> — show bounty details\n"
|
"/show <id> — show bounty details\n"
|
||||||
"/timezone — get room timezone\n"
|
"/timezone — get room timezone\n"
|
||||||
"/timezone <tz> — set room timezone (admin only)\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"
|
"/start — re-initialize\n"
|
||||||
"/help — this message",
|
"/help — this message",
|
||||||
disable_web_page_preview=True,
|
disable_web_page_preview=True,
|
||||||
|
|||||||
@@ -210,6 +210,28 @@ class BountyService:
|
|||||||
self._storage.update_bounty(room_id, bounty)
|
self._storage.update_bounty(room_id, bounty)
|
||||||
return True
|
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:
|
class TrackingService:
|
||||||
"""Service for tracking bounty operations."""
|
"""Service for tracking bounty operations."""
|
||||||
|
|||||||
@@ -210,6 +210,46 @@ class TestBountyService:
|
|||||||
result = self.service.delete_bounty(-1001, 999, self.admin_user_id)
|
result = self.service.delete_bounty(-1001, 999, self.admin_user_id)
|
||||||
assert result is False
|
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:
|
class TestTrackingService:
|
||||||
"""Unit tests for TrackingService."""
|
"""Unit tests for TrackingService."""
|
||||||
|
|||||||
Reference in New Issue
Block a user