Compare commits
1 Commits
fix/issue-
...
5dee75d7d0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5dee75d7d0 |
@@ -16,7 +16,6 @@ from commands import (
|
|||||||
cmd_my,
|
cmd_my,
|
||||||
cmd_show,
|
cmd_show,
|
||||||
cmd_start,
|
cmd_start,
|
||||||
cmd_timezone,
|
|
||||||
cmd_track,
|
cmd_track,
|
||||||
cmd_untrack,
|
cmd_untrack,
|
||||||
cmd_update,
|
cmd_update,
|
||||||
@@ -45,8 +44,6 @@ def build_app() -> Application:
|
|||||||
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("show", cmd_show))
|
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("admin", cmd_admin))
|
app.add_handler(CommandHandler("admin", cmd_admin))
|
||||||
|
|
||||||
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
||||||
@@ -64,7 +61,6 @@ async def post_init(app: Application) -> None:
|
|||||||
("track", "Track a bounty"),
|
("track", "Track a bounty"),
|
||||||
("untrack", "Stop tracking"),
|
("untrack", "Stop tracking"),
|
||||||
("show", "Show bounty details"),
|
("show", "Show bounty details"),
|
||||||
("timezone", "Get/set room timezone"),
|
|
||||||
("admin", "Manage admins"),
|
("admin", "Manage admins"),
|
||||||
("help", "Show help"),
|
("help", "Show help"),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
import time
|
import time
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
|
||||||
|
|
||||||
import dateparser
|
import dateparser
|
||||||
from telegram import Update
|
from telegram import Update
|
||||||
@@ -105,6 +104,8 @@ def format_bounty(b, show_id: bool = True, slice_length: int = 0) -> str:
|
|||||||
parts.append(f"⏰ Today (OVERDUE)")
|
parts.append(f"⏰ Today (OVERDUE)")
|
||||||
else:
|
else:
|
||||||
parts.append(f"⏰ {due_str} ({days_left}d)")
|
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)
|
return " | ".join(parts)
|
||||||
|
|
||||||
|
|
||||||
@@ -392,101 +393,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(
|
||||||
@@ -549,35 +455,6 @@ async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
|
await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
|
||||||
|
|
||||||
|
|
||||||
async def cmd_timezone(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)
|
|
||||||
|
|
||||||
if not args:
|
|
||||||
current_tz = BOUNTY_SERVICE.get_timezone(room_id)
|
|
||||||
await update.message.reply_text(f"Current timezone: {current_tz}")
|
|
||||||
return
|
|
||||||
|
|
||||||
timezone_str = args[0]
|
|
||||||
|
|
||||||
try:
|
|
||||||
ZoneInfo(timezone_str)
|
|
||||||
except (KeyError, ZoneInfoNotFoundError):
|
|
||||||
await update.message.reply_text(
|
|
||||||
"⛔ Invalid timezone. Use IANA format (e.g., Asia/Jakarta)"
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
BOUNTY_SERVICE.set_timezone(room_id, timezone_str, user_id)
|
|
||||||
except PermissionError as e:
|
|
||||||
await update.message.reply_text(f"⛔ {e}")
|
|
||||||
return
|
|
||||||
|
|
||||||
await update.message.reply_text(f"✅ Timezone set to {timezone_str}.")
|
|
||||||
|
|
||||||
|
|
||||||
def _find_user_id_by_username(room_id: int, username: str) -> int | None:
|
def _find_user_id_by_username(room_id: int, username: str) -> int | None:
|
||||||
"""Find user_id by username from bounty creators in the room."""
|
"""Find user_id by username from bounty creators in the room."""
|
||||||
bounties = BOUNTY_SERVICE.list_bounties(room_id)
|
bounties = BOUNTY_SERVICE.list_bounties(room_id)
|
||||||
@@ -651,8 +528,6 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
"/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"
|
"/show <id> — show bounty details\n"
|
||||||
"/timezone — get room timezone\n"
|
|
||||||
"/timezone <tz> — set room timezone (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,
|
||||||
|
|||||||
Reference in New Issue
Block a user