|
|
|
|
@@ -3,6 +3,7 @@
|
|
|
|
|
import time
|
|
|
|
|
from functools import wraps
|
|
|
|
|
from typing import Optional
|
|
|
|
|
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
|
|
|
|
|
|
|
|
|
import dateparser
|
|
|
|
|
from telegram import Update
|
|
|
|
|
@@ -104,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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -230,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:
|
|
|
|
|
@@ -455,6 +461,35 @@ async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|
|
|
|
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:
|
|
|
|
|
"""Find user_id by username from bounty creators in the room."""
|
|
|
|
|
bounties = BOUNTY_SERVICE.list_bounties(room_id)
|
|
|
|
|
@@ -467,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"
|
|
|
|
|
)
|
|
|
|
|
@@ -528,6 +594,11 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|
|
|
|
"/track <id> — track a bounty (groups only)\n"
|
|
|
|
|
"/untrack <id> — stop tracking (groups only)\n"
|
|
|
|
|
"/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,
|
|
|
|
|
|