Compare commits
1 Commits
dfaf633707
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
780cba6301 |
@@ -8,12 +8,12 @@ from telegram.ext import Application, CommandHandler, MessageHandler, filters
|
|||||||
|
|
||||||
from commands import (
|
from commands import (
|
||||||
cmd_add,
|
cmd_add,
|
||||||
cmd_admin,
|
|
||||||
cmd_bounty,
|
cmd_bounty,
|
||||||
cmd_delete,
|
cmd_delete,
|
||||||
cmd_edit,
|
cmd_edit,
|
||||||
cmd_help,
|
cmd_help,
|
||||||
cmd_my,
|
cmd_my,
|
||||||
|
cmd_show,
|
||||||
cmd_start,
|
cmd_start,
|
||||||
cmd_track,
|
cmd_track,
|
||||||
cmd_untrack,
|
cmd_untrack,
|
||||||
@@ -42,7 +42,7 @@ def build_app() -> Application:
|
|||||||
app.add_handler(CommandHandler("delete", cmd_delete))
|
app.add_handler(CommandHandler("delete", cmd_delete))
|
||||||
app.add_handler(CommandHandler("track", cmd_track))
|
app.add_handler(CommandHandler("track", cmd_track))
|
||||||
app.add_handler(CommandHandler("untrack", cmd_untrack))
|
app.add_handler(CommandHandler("untrack", cmd_untrack))
|
||||||
app.add_handler(CommandHandler("admin", cmd_admin))
|
app.add_handler(CommandHandler("show", cmd_show))
|
||||||
|
|
||||||
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
||||||
|
|
||||||
@@ -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", "Admin management"),
|
("show", "Show bounty details"),
|
||||||
("help", "Show help"),
|
("help", "Show help"),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -291,101 +291,6 @@ 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(
|
||||||
@@ -406,6 +311,48 @@ async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
|
args = extract_args(update.message.text)
|
||||||
|
if not args:
|
||||||
|
await update.message.reply_text("Usage: /show <bounty_id>")
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
bounty_id = int(args[0])
|
||||||
|
except ValueError:
|
||||||
|
await update.message.reply_text("Invalid bounty ID.")
|
||||||
|
return
|
||||||
|
|
||||||
|
room_id = get_room_id(update)
|
||||||
|
bounty = BOUNTY_SERVICE.get_bounty(room_id, bounty_id)
|
||||||
|
|
||||||
|
if not bounty:
|
||||||
|
await update.message.reply_text("Bounty not found.")
|
||||||
|
return
|
||||||
|
|
||||||
|
timezone = BOUNTY_SERVICE.get_timezone(room_id)
|
||||||
|
|
||||||
|
lines = []
|
||||||
|
|
||||||
|
title = bounty.text or "(no text)"
|
||||||
|
lines.append(f"[#{bounty.id}] {title}")
|
||||||
|
|
||||||
|
if bounty.link:
|
||||||
|
lines.append(f"🔗 {bounty.link}")
|
||||||
|
|
||||||
|
if bounty.due_date_ts:
|
||||||
|
due_str = time.strftime("%d %B %Y %H:%M", time.localtime(bounty.due_date_ts))
|
||||||
|
lines.append(f"📅 {due_str} ({timezone})")
|
||||||
|
|
||||||
|
username = bounty.created_by_username or f"user#{bounty.created_by_user_id}"
|
||||||
|
lines.append(f"👤 @{username}")
|
||||||
|
|
||||||
|
created_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(bounty.created_at))
|
||||||
|
lines.append(f"📌 Created: {created_str}")
|
||||||
|
|
||||||
|
await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
|
||||||
|
|
||||||
|
|
||||||
async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
await update.message.reply_text(
|
await update.message.reply_text(
|
||||||
"👻 JIGAIDO Commands:\n\n"
|
"👻 JIGAIDO Commands:\n\n"
|
||||||
@@ -416,6 +363,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"
|
||||||
|
"/show <id> — show bounty details\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,
|
||||||
|
|||||||
Reference in New Issue
Block a user