Compare commits
8 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e937cc85b9 | ||
| 003c570cfb | |||
|
|
bac6830fc3 | ||
| 2dd11a8b48 | |||
|
|
2617d17e28 | ||
| b091153f10 | |||
|
|
ce864d9fdc | ||
| e805a6428a |
@@ -8,11 +8,13 @@ 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_recover,
|
||||
cmd_show,
|
||||
cmd_start,
|
||||
cmd_timezone,
|
||||
@@ -45,6 +47,8 @@ def build_app() -> Application:
|
||||
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("recover", cmd_recover))
|
||||
|
||||
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
||||
|
||||
@@ -62,6 +66,8 @@ async def post_init(app: Application) -> None:
|
||||
("untrack", "Stop tracking"),
|
||||
("show", "Show bounty details"),
|
||||
("timezone", "Get/set room timezone"),
|
||||
("admin", "Manage admins"),
|
||||
("recover", "Recover deleted bounties"),
|
||||
("help", "Show help"),
|
||||
]
|
||||
)
|
||||
|
||||
@@ -105,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)
|
||||
|
||||
|
||||
@@ -231,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:
|
||||
@@ -341,6 +346,68 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
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:
|
||||
if not is_group(update):
|
||||
await update.message.reply_text("⛔ /track is only available in groups.")
|
||||
@@ -485,6 +552,65 @@ async def cmd_timezone(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
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"
|
||||
|
||||
@@ -210,6 +210,33 @@ class BountyService:
|
||||
self._storage.update_bounty(room_id, bounty)
|
||||
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:
|
||||
"""Service for tracking bounty operations."""
|
||||
|
||||
Reference in New Issue
Block a user