Compare commits
9 Commits
5dee75d7d0
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
90b0b564c2 | ||
| 003c570cfb | |||
|
|
bac6830fc3 | ||
| 2dd11a8b48 | |||
|
|
2617d17e28 | ||
| b091153f10 | |||
|
|
ce864d9fdc | ||
| e805a6428a | |||
|
|
6da16e752b |
@@ -16,6 +16,7 @@ from commands import (
|
||||
cmd_my,
|
||||
cmd_show,
|
||||
cmd_start,
|
||||
cmd_timezone,
|
||||
cmd_track,
|
||||
cmd_untrack,
|
||||
cmd_update,
|
||||
@@ -44,6 +45,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(MessageHandler(filters.COMMAND, cmd_help))
|
||||
@@ -61,6 +63,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"),
|
||||
("help", "Show help"),
|
||||
]
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import time
|
||||
from functools import wraps
|
||||
from typing import Optional
|
||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||
|
||||
import dateparser
|
||||
from telegram import Update
|
||||
@@ -104,8 +105,6 @@ 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)
|
||||
|
||||
|
||||
@@ -230,13 +229,20 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
user_id = get_user_id(update)
|
||||
room_id = get_room_id(update)
|
||||
|
||||
bounty = BOUNTY_SERVICE.add_bounty(
|
||||
room_id=room_id,
|
||||
user_id=user_id,
|
||||
text=text,
|
||||
link=link,
|
||||
due_date_ts=due_date_ts,
|
||||
)
|
||||
try:
|
||||
bounty = BOUNTY_SERVICE.add_bounty(
|
||||
room_id=room_id,
|
||||
user_id=user_id,
|
||||
text=text,
|
||||
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:
|
||||
@@ -312,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>")
|
||||
await update.message.reply_text("Usage: /delete <bounty_id> [bounty_id ...]")
|
||||
return
|
||||
|
||||
try:
|
||||
bounty_id = int(args[0])
|
||||
bounty_ids = [int(arg) for arg in args]
|
||||
except ValueError:
|
||||
await update.message.reply_text("Invalid bounty ID.")
|
||||
return
|
||||
@@ -325,19 +331,25 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
room_id = get_room_id(update)
|
||||
|
||||
try:
|
||||
success = BOUNTY_SERVICE.delete_bounty(
|
||||
results = BOUNTY_SERVICE.delete_bounties(
|
||||
room_id=room_id,
|
||||
bounty_id=bounty_id,
|
||||
bounty_ids=bounty_ids,
|
||||
user_id=user_id,
|
||||
)
|
||||
except PermissionError as e:
|
||||
await update.message.reply_text(f"⛔ {e}")
|
||||
return
|
||||
|
||||
if success:
|
||||
await update.message.reply_text(f"✅ Bounty #{bounty_id} deleted.")
|
||||
else:
|
||||
await update.message.reply_text("Bounty not found.")
|
||||
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))
|
||||
|
||||
|
||||
async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
@@ -455,6 +467,35 @@ 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)
|
||||
@@ -528,6 +569,8 @@ 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,
|
||||
|
||||
@@ -210,6 +210,28 @@ 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,6 +210,46 @@ 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