|
|
|
|
@@ -229,6 +229,7 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|
|
|
|
user_id = get_user_id(update)
|
|
|
|
|
room_id = get_room_id(update)
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
bounty = BOUNTY_SERVICE.add_bounty(
|
|
|
|
|
room_id=room_id,
|
|
|
|
|
user_id=user_id,
|
|
|
|
|
@@ -236,6 +237,12 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|
|
|
|
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:
|
|
|
|
|
@@ -392,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(
|
|
|
|
|
@@ -590,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"
|
|
|
|
|
)
|
|
|
|
|
@@ -653,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,
|
|
|
|
|
|