Compare commits
1 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e9ec3a5ec |
@@ -14,7 +14,6 @@ from commands import (
|
|||||||
cmd_edit,
|
cmd_edit,
|
||||||
cmd_help,
|
cmd_help,
|
||||||
cmd_my,
|
cmd_my,
|
||||||
cmd_recover,
|
|
||||||
cmd_show,
|
cmd_show,
|
||||||
cmd_start,
|
cmd_start,
|
||||||
cmd_timezone,
|
cmd_timezone,
|
||||||
@@ -48,7 +47,6 @@ def build_app() -> Application:
|
|||||||
app.add_handler(CommandHandler("show", cmd_show))
|
app.add_handler(CommandHandler("show", cmd_show))
|
||||||
app.add_handler(CommandHandler("timezone", cmd_timezone))
|
app.add_handler(CommandHandler("timezone", cmd_timezone))
|
||||||
app.add_handler(CommandHandler("admin", cmd_admin))
|
app.add_handler(CommandHandler("admin", cmd_admin))
|
||||||
app.add_handler(CommandHandler("recover", cmd_recover))
|
|
||||||
|
|
||||||
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
||||||
|
|
||||||
@@ -67,7 +65,6 @@ async def post_init(app: Application) -> None:
|
|||||||
("show", "Show bounty details"),
|
("show", "Show bounty details"),
|
||||||
("timezone", "Get/set room timezone"),
|
("timezone", "Get/set room timezone"),
|
||||||
("admin", "Manage admins"),
|
("admin", "Manage admins"),
|
||||||
("recover", "Recover deleted bounties"),
|
|
||||||
("help", "Show help"),
|
("help", "Show help"),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -346,68 +346,6 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
await update.message.reply_text("Bounty not found.")
|
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:
|
async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
if not is_group(update):
|
if not is_group(update):
|
||||||
await update.message.reply_text("⛔ /track is only available in groups.")
|
await update.message.reply_text("⛔ /track is only available in groups.")
|
||||||
@@ -564,11 +502,42 @@ 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"
|
||||||
)
|
)
|
||||||
@@ -627,6 +596,9 @@ 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,33 +210,6 @@ class BountyService:
|
|||||||
self._storage.update_bounty(room_id, bounty)
|
self._storage.update_bounty(room_id, bounty)
|
||||||
return True
|
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:
|
class TrackingService:
|
||||||
"""Service for tracking bounty operations."""
|
"""Service for tracking bounty operations."""
|
||||||
|
|||||||
Reference in New Issue
Block a user