Compare commits
1 Commits
feat/issue
...
dfaf633707
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dfaf633707 |
@@ -58,7 +58,7 @@ async def post_init(app: Application) -> None:
|
|||||||
("edit", "Edit a bounty"),
|
("edit", "Edit a bounty"),
|
||||||
("track", "Track a bounty"),
|
("track", "Track a bounty"),
|
||||||
("untrack", "Stop tracking"),
|
("untrack", "Stop tracking"),
|
||||||
("admin", "List room admins"),
|
("admin", "Admin management"),
|
||||||
("help", "Show help"),
|
("help", "Show help"),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -291,6 +291,101 @@ async def cmd_untrack(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
await update.message.reply_text("Not tracking bounty #{bounty_id}.")
|
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:
|
async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
if is_group(update):
|
if is_group(update):
|
||||||
await update.message.reply_text(
|
await update.message.reply_text(
|
||||||
@@ -321,23 +416,7 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
"/delete <id> — delete bounty\n"
|
"/delete <id> — delete bounty\n"
|
||||||
"/track <id> — track a bounty (groups only)\n"
|
"/track <id> — track a bounty (groups only)\n"
|
||||||
"/untrack <id> — stop tracking (groups only)\n"
|
"/untrack <id> — stop tracking (groups only)\n"
|
||||||
"/admin — list room admins\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,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def cmd_admin(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|
||||||
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 = [f"Room Admins:"]
|
|
||||||
for admin_id in admin_ids:
|
|
||||||
lines.append(f"- @{admin_id}")
|
|
||||||
|
|
||||||
await update.message.reply_text("\n".join(lines))
|
|
||||||
|
|||||||
Reference in New Issue
Block a user