Compare commits
1 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
350ecbf867 |
@@ -1,6 +1,8 @@
|
||||
"""Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
|
||||
|
||||
import time
|
||||
from datetime import datetime, timezone
|
||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||
from functools import wraps
|
||||
from typing import Optional
|
||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||
@@ -20,6 +22,36 @@ TRACKING_SERVICE = TrackingService(TRACKING_STORAGE, ROOM_STORAGE)
|
||||
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]:
|
||||
if not text:
|
||||
return []
|
||||
@@ -229,7 +261,6 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
user_id = get_user_id(update)
|
||||
room_id = get_room_id(update)
|
||||
|
||||
try:
|
||||
bounty = BOUNTY_SERVICE.add_bounty(
|
||||
room_id=room_id,
|
||||
user_id=user_id,
|
||||
@@ -237,16 +268,11 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
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:
|
||||
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(
|
||||
f"✅ Bounty added (#{bounty.id}){due_str}",
|
||||
disable_web_page_preview=True,
|
||||
@@ -502,42 +528,11 @@ 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)
|
||||
|
||||
# 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"):
|
||||
if not args or 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"
|
||||
)
|
||||
@@ -596,9 +591,6 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
"/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,
|
||||
|
||||
Reference in New Issue
Block a user