Compare commits
1 Commits
8db5ba0ba4
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
350ecbf867 |
@@ -47,7 +47,6 @@ def build_app() -> Application:
|
|||||||
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("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))
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
"""Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
|
"""Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
|
||||||
|
|
||||||
import time
|
import time
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||||
@@ -20,6 +22,36 @@ TRACKING_SERVICE = TrackingService(TRACKING_STORAGE, ROOM_STORAGE)
|
|||||||
TELEGRAM_BOT_USERNAME = "your_bot_username"
|
TELEGRAM_BOT_USERNAME = "your_bot_username"
|
||||||
|
|
||||||
|
|
||||||
|
def format_due_date(due_date_ts: int | None, timezone_str: str) -> str:
|
||||||
|
"""Format due date as human-readable with timezone.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
No due date: (none shown)
|
||||||
|
Date only: 4 April 2026
|
||||||
|
Date + time: 4 April 2026 14:30
|
||||||
|
With timezone: 4 April 2026 14:30 (Asia/Jakarta)
|
||||||
|
"""
|
||||||
|
if not due_date_ts:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
try:
|
||||||
|
tz = ZoneInfo(timezone_str)
|
||||||
|
except (KeyError, ZoneInfoNotFoundError):
|
||||||
|
tz = ZoneInfo("UTC")
|
||||||
|
|
||||||
|
dt = datetime.fromtimestamp(due_date_ts, tz=tz)
|
||||||
|
|
||||||
|
date_str = dt.strftime("%-d %B %Y")
|
||||||
|
|
||||||
|
if dt.hour != 0 or dt.minute != 0:
|
||||||
|
date_str += f" {dt.strftime('%H:%M')}"
|
||||||
|
date_str += f" ({timezone_str})"
|
||||||
|
|
||||||
|
return date_str
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def extract_args(text: str) -> list[str]:
|
def extract_args(text: str) -> list[str]:
|
||||||
if not text:
|
if not text:
|
||||||
return []
|
return []
|
||||||
@@ -239,7 +271,8 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
|
|
||||||
due_str = ""
|
due_str = ""
|
||||||
if due_date_ts:
|
if due_date_ts:
|
||||||
due_str = f" | Due: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}"
|
timezone_str = BOUNTY_SERVICE.get_timezone(room_id)
|
||||||
|
due_str = f" | Due: {format_due_date(due_date_ts, timezone_str)}"
|
||||||
await update.message.reply_text(
|
await update.message.reply_text(
|
||||||
f"✅ Bounty added (#{bounty.id}){due_str}",
|
f"✅ Bounty added (#{bounty.id}){due_str}",
|
||||||
disable_web_page_preview=True,
|
disable_web_page_preview=True,
|
||||||
@@ -392,101 +425,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(
|
||||||
|
|||||||
Reference in New Issue
Block a user