Compare commits
1 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
780cba6301 |
@@ -13,8 +13,8 @@ from commands import (
|
||||
cmd_edit,
|
||||
cmd_help,
|
||||
cmd_my,
|
||||
cmd_show,
|
||||
cmd_start,
|
||||
cmd_timezone,
|
||||
cmd_track,
|
||||
cmd_untrack,
|
||||
cmd_update,
|
||||
@@ -42,7 +42,7 @@ def build_app() -> Application:
|
||||
app.add_handler(CommandHandler("delete", cmd_delete))
|
||||
app.add_handler(CommandHandler("track", cmd_track))
|
||||
app.add_handler(CommandHandler("untrack", cmd_untrack))
|
||||
app.add_handler(CommandHandler("timezone", cmd_timezone))
|
||||
app.add_handler(CommandHandler("show", cmd_show))
|
||||
|
||||
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
||||
|
||||
@@ -58,7 +58,7 @@ async def post_init(app: Application) -> None:
|
||||
("edit", "Edit a bounty"),
|
||||
("track", "Track a bounty"),
|
||||
("untrack", "Stop tracking"),
|
||||
("timezone", "Get/set room timezone"),
|
||||
("show", "Show bounty details"),
|
||||
("help", "Show help"),
|
||||
]
|
||||
)
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
"""Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
|
||||
|
||||
import time
|
||||
from datetime import datetime
|
||||
from functools import wraps
|
||||
from typing import Optional
|
||||
from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
|
||||
|
||||
import dateparser
|
||||
from telegram import Update
|
||||
@@ -21,34 +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 []
|
||||
@@ -62,53 +32,23 @@ def parse_args(args: list[str]) -> tuple[Optional[str], Optional[str], Optional[
|
||||
due_date_ts = None
|
||||
|
||||
remaining = []
|
||||
i = 0
|
||||
while i < len(args):
|
||||
arg = args[i]
|
||||
for arg in args:
|
||||
if not link and (arg.startswith("http://") or arg.startswith("https://")):
|
||||
link = arg
|
||||
elif due_date_ts is None:
|
||||
parsed = dateparser.parse(arg)
|
||||
if parsed:
|
||||
due_date_ts = int(parsed.timestamp())
|
||||
if i + 1 < len(args) and _is_time_format(args[i + 1]):
|
||||
time_str = args[i + 1]
|
||||
hour, minute = map(int, time_str.split(":"))
|
||||
due_date_ts = _set_time_on_timestamp(due_date_ts, hour, minute)
|
||||
i += 1
|
||||
else:
|
||||
remaining.append(arg)
|
||||
else:
|
||||
remaining.append(arg)
|
||||
i += 1
|
||||
|
||||
text = " ".join(remaining) if remaining else None
|
||||
return text, link, due_date_ts
|
||||
|
||||
|
||||
def _is_time_format(s: str) -> bool:
|
||||
"""Check if string matches HH:MM format."""
|
||||
if not s or len(s) != 5:
|
||||
return False
|
||||
if s[2] != ":":
|
||||
return False
|
||||
try:
|
||||
h, m = map(int, s.split(":"))
|
||||
return 0 <= h <= 23 and 0 <= m <= 59
|
||||
except ValueError:
|
||||
return False
|
||||
|
||||
|
||||
def _set_time_on_timestamp(ts: int, hour: int, minute: int) -> int:
|
||||
"""Set time (hour:minute) on a Unix timestamp, keeping the date."""
|
||||
import datetime
|
||||
|
||||
dt = datetime.datetime.fromtimestamp(ts)
|
||||
dt = dt.replace(hour=hour, minute=minute, second=0, microsecond=0)
|
||||
return int(dt.timestamp())
|
||||
|
||||
|
||||
def format_bounty(b, show_id: bool = True, room_id: int | None = None) -> str:
|
||||
def format_bounty(b, show_id: bool = True) -> str:
|
||||
parts = []
|
||||
if show_id:
|
||||
parts.append(f"[#{b.id}]")
|
||||
@@ -117,11 +57,7 @@ def format_bounty(b, show_id: bool = True, room_id: int | None = None) -> str:
|
||||
if b.link:
|
||||
parts.append(f"🔗 {b.link}")
|
||||
if b.due_date_ts:
|
||||
timezone_str = "UTC"
|
||||
if room_id is not None:
|
||||
timezone_str = BOUNTY_SERVICE.get_timezone(room_id)
|
||||
|
||||
due_str = format_due_date(b.due_date_ts, timezone_str)
|
||||
due_str = time.strftime("%Y-%m-%d", time.localtime(b.due_date_ts))
|
||||
days_left = (b.due_date_ts - int(time.time())) // 86400
|
||||
if days_left < 0:
|
||||
parts.append(f"⏰ {due_str} (OVERDUE)")
|
||||
@@ -165,7 +101,7 @@ async def cmd_bounty(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
await update.message.reply_text("No bounties yet.")
|
||||
return
|
||||
|
||||
lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties]
|
||||
lines = [format_bounty(b, show_id=True) for b in bounties]
|
||||
await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
|
||||
|
||||
|
||||
@@ -175,7 +111,6 @@ async def cmd_my(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
if is_group(update):
|
||||
group_id = get_group_id(update)
|
||||
bounties = TRACKING_SERVICE.get_tracked_bounties(group_id, user_id)
|
||||
room_id = group_id
|
||||
else:
|
||||
room_id = get_room_id(update)
|
||||
bounties = BOUNTY_SERVICE.list_bounties(room_id)
|
||||
@@ -189,7 +124,7 @@ async def cmd_my(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
await update.message.reply_text(msg)
|
||||
return
|
||||
|
||||
lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties]
|
||||
lines = [format_bounty(b, show_id=True) for b in bounties]
|
||||
await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
|
||||
|
||||
|
||||
@@ -197,8 +132,8 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
args = extract_args(update.message.text)
|
||||
if not args:
|
||||
await update.message.reply_text(
|
||||
"Usage: /add <text> [link] [date] [time]\n"
|
||||
"Example: /add Fix bug https://github.com/foo/bar april 15 14:30"
|
||||
"Usage: /add <text> [link] [due_date]\n"
|
||||
"Example: /add Fix the bug https://github.com/foo/bar tomorrow"
|
||||
)
|
||||
return
|
||||
|
||||
@@ -210,25 +145,17 @@ 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,
|
||||
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
|
||||
bounty = BOUNTY_SERVICE.add_bounty(
|
||||
room_id=room_id,
|
||||
user_id=user_id,
|
||||
text=text,
|
||||
link=link,
|
||||
due_date_ts=due_date_ts,
|
||||
)
|
||||
|
||||
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}",
|
||||
@@ -384,47 +311,60 @@ async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
)
|
||||
|
||||
|
||||
async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
args = extract_args(update.message.text)
|
||||
if not args:
|
||||
await update.message.reply_text("Usage: /show <bounty_id>")
|
||||
return
|
||||
|
||||
try:
|
||||
bounty_id = int(args[0])
|
||||
except ValueError:
|
||||
await update.message.reply_text("Invalid bounty ID.")
|
||||
return
|
||||
|
||||
room_id = get_room_id(update)
|
||||
bounty = BOUNTY_SERVICE.get_bounty(room_id, bounty_id)
|
||||
|
||||
if not bounty:
|
||||
await update.message.reply_text("Bounty not found.")
|
||||
return
|
||||
|
||||
timezone = BOUNTY_SERVICE.get_timezone(room_id)
|
||||
|
||||
lines = []
|
||||
|
||||
title = bounty.text or "(no text)"
|
||||
lines.append(f"[#{bounty.id}] {title}")
|
||||
|
||||
if bounty.link:
|
||||
lines.append(f"🔗 {bounty.link}")
|
||||
|
||||
if bounty.due_date_ts:
|
||||
due_str = time.strftime("%d %B %Y %H:%M", time.localtime(bounty.due_date_ts))
|
||||
lines.append(f"📅 {due_str} ({timezone})")
|
||||
|
||||
username = bounty.created_by_username or f"user#{bounty.created_by_user_id}"
|
||||
lines.append(f"👤 @{username}")
|
||||
|
||||
created_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(bounty.created_at))
|
||||
lines.append(f"📌 Created: {created_str}")
|
||||
|
||||
await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
|
||||
|
||||
|
||||
async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||
await update.message.reply_text(
|
||||
"👻 JIGAIDO Commands:\n\n"
|
||||
"/bounty — list all bounties\n"
|
||||
"/my — bounties you're tracking\n"
|
||||
"/add <text> [link] [date] [time] — add bounty (admin only)\n"
|
||||
"/update <id> [text] [link] [due] — update bounty (admin only)\n"
|
||||
"/delete <id> — delete bounty (admin only)\n"
|
||||
"/add <text> [link] [due] — add bounty\n"
|
||||
"/update <id> [text> [link] [due] — update bounty\n"
|
||||
"/delete <id> — delete bounty\n"
|
||||
"/track <id> — track a bounty (groups only)\n"
|
||||
"/untrack <id> — stop tracking (groups only)\n"
|
||||
"/timezone [tz] — get/set room timezone (admin only)\n"
|
||||
"/show <id> — show bounty details\n"
|
||||
"/start — re-initialize\n"
|
||||
"/help — this message",
|
||||
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}.")
|
||||
|
||||
@@ -96,24 +96,21 @@ class BountyService:
|
||||
|
||||
def check_link_unique(
|
||||
self, room_id: int, link: str | None, exclude_bounty_id: int | None = None
|
||||
) -> int | None:
|
||||
"""Check if a link is unique within a room (not used by another bounty).
|
||||
|
||||
Returns the conflicting bounty ID if found, or None if unique/allowed.
|
||||
"""
|
||||
) -> bool:
|
||||
"""Check if a link is unique within a room (not used by another bounty)."""
|
||||
if not link:
|
||||
return None
|
||||
return True
|
||||
|
||||
room_data = self._storage.load(room_id)
|
||||
if room_data is None:
|
||||
return None
|
||||
return True
|
||||
|
||||
for bounty in room_data.bounties:
|
||||
if bounty.deleted_at is not None:
|
||||
continue
|
||||
if bounty.link == link and bounty.id != exclude_bounty_id:
|
||||
return bounty.id
|
||||
return None
|
||||
return False
|
||||
return True
|
||||
|
||||
def add_bounty(
|
||||
self,
|
||||
@@ -127,11 +124,8 @@ class BountyService:
|
||||
if not self.is_admin(room_id, user_id):
|
||||
raise PermissionError("Only admins can add bounties.")
|
||||
|
||||
conflicting_id = self.check_link_unique(room_id, link)
|
||||
if conflicting_id is not None:
|
||||
raise ValueError(
|
||||
f"A bounty with this link already exists: #{conflicting_id}"
|
||||
)
|
||||
if not self.check_link_unique(room_id, link):
|
||||
raise ValueError("A bounty with this link already exists in this room.")
|
||||
|
||||
room_data = self._storage.load(room_id)
|
||||
if room_data is None:
|
||||
@@ -184,10 +178,8 @@ class BountyService:
|
||||
if not self.is_admin(room_id, user_id):
|
||||
raise PermissionError("Only admins can edit bounties.")
|
||||
|
||||
if (
|
||||
link
|
||||
and self.check_link_unique(room_id, link, exclude_bounty_id=bounty_id)
|
||||
is not None
|
||||
if link and not self.check_link_unique(
|
||||
room_id, link, exclude_bounty_id=bounty_id
|
||||
):
|
||||
raise ValueError("A bounty with this link already exists in this room.")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user