feat: human-readable date format with timezone awareness

Add format_due_date() for human-readable dates like "4 April 2026".
Update cmd_add to use timezone-aware date formatting.

Fixes #54

apps/telegram-bot/bot.py

@@ -14,7 +14,6 @@ from commands import (
     cmd_edit,
     cmd_help,
     cmd_my,
-    cmd_recover,
     cmd_show,
     cmd_start,
     cmd_timezone,
@@ -48,7 +47,6 @@ def build_app() -> Application:
     app.add_handler(CommandHandler("show", cmd_show))
     app.add_handler(CommandHandler("timezone", cmd_timezone))
     app.add_handler(CommandHandler("admin", cmd_admin))
-    app.add_handler(CommandHandler("recover", cmd_recover))
 
     app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
 
@@ -67,7 +65,6 @@ async def post_init(app: Application) -> None:
             ("show", "Show bounty details"),
             ("timezone", "Get/set room timezone"),
             ("admin", "Manage admins"),
-            ("recover", "Recover deleted bounties"),
             ("help", "Show help"),
         ]
     )

apps/telegram-bot/commands.py

@@ -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,
@@ -346,68 +372,6 @@ async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Bounty not found.")
 
 
-async def cmd_recover(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)
-
-    try:
-        if not BOUNTY_SERVICE.is_admin(room_id, user_id):
-            await update.message.reply_text("⛔ Only admins can recover bounties.")
-            return
-    except PermissionError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
-
-    if not args:
-        deleted_bounties = BOUNTY_SERVICE.list_deleted_bounties(room_id)
-        if not deleted_bounties:
-            await update.message.reply_text("No recoverable bounties.")
-            return
-
-        deleted_bounties.sort(key=lambda b: b.deleted_at or 0, reverse=True)
-
-        lines = ["Recoverable bounties:"]
-        for b in deleted_bounties:
-            deleted_str = time.strftime("%d %b %Y", time.localtime(b.deleted_at))
-            text_part = (
-                b.text[:40] + "..."
-                if b.text and len(b.text) > 40
-                else (b.text or "(no text)")
-            )
-            lines.append(f"[#{b.id}] {text_part} | 🗑️ Deleted {deleted_str}")
-
-        await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
-        return
-
-    bounty_ids = []
-    for arg in args:
-        try:
-            bounty_ids.append(int(arg))
-        except ValueError:
-            await update.message.reply_text(f"Invalid bounty ID: {arg}")
-            return
-
-    results = []
-    for bounty_id in bounty_ids:
-        try:
-            success, message = BOUNTY_SERVICE.recover_bounty(
-                room_id=room_id,
-                bounty_id=bounty_id,
-                user_id=user_id,
-            )
-        except PermissionError as e:
-            results.append(f"⛔ {e}")
-            continue
-
-        if success:
-            results.append(f"✅ {message}")
-        else:
-            results.append(f"⛔ {message}")
-
-    await update.message.reply_text("\n".join(results))
-
-
 async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     if not is_group(update):
         await update.message.reply_text("⛔ /track is only available in groups.")

core/services.py

@@ -210,33 +210,6 @@ class BountyService:
         self._storage.update_bounty(room_id, bounty)
         return True
 
-    def recover_bounty(
-        self, room_id: int, bounty_id: int, user_id: int
-    ) -> tuple[bool, str]:
-        """Recover a soft-deleted bounty. Only admins can recover.
-
-        Returns (success, message) tuple.
-        """
-        if not self.is_admin(room_id, user_id):
-            raise PermissionError("Only admins can recover bounties.")
-
-        all_bounties = self._storage.list_all_bounties(room_id, include_deleted=True)
-        bounty = None
-        for b in all_bounties:
-            if b.id == bounty_id:
-                bounty = b
-                break
-
-        if not bounty:
-            return False, f"Bounty #{bounty_id} not found."
-
-        if bounty.deleted_at is None:
-            return False, f"Bounty #{bounty_id} is not deleted."
-
-        bounty.deleted_at = None
-        self._storage.update_bounty(room_id, bounty)
-        return True, f"Recovered bounty #{bounty_id}."
-
 
 class TrackingService:
     """Service for tracking bounty operations."""