|
|
|
|
@@ -1,11 +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
|
|
|
|
|
|
|
|
|
|
import dateparser
|
|
|
|
|
from telegram import Update
|
|
|
|
|
@@ -22,36 +19,6 @@ 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 []
|
|
|
|
|
@@ -137,6 +104,8 @@ 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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -271,8 +240,7 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|
|
|
|
|
|
|
|
|
due_str = ""
|
|
|
|
|
if due_date_ts:
|
|
|
|
|
timezone_str = BOUNTY_SERVICE.get_timezone(room_id)
|
|
|
|
|
due_str = f" | Due: {format_due_date(due_date_ts, timezone_str)}"
|
|
|
|
|
due_str = f" | Due: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}"
|
|
|
|
|
await update.message.reply_text(
|
|
|
|
|
f"✅ Bounty added (#{bounty.id}){due_str}",
|
|
|
|
|
disable_web_page_preview=True,
|
|
|
|
|
@@ -487,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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
|
@@ -589,8 +528,6 @@ 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"
|
|
|
|
|
"/start — re-initialize\n"
|
|
|
|
|
"/help — this message",
|
|
|
|
|
disable_web_page_preview=True,
|
|
|
|
|
|