Revert "Merge pull request 'feat: human-readable date format with timezone awareness' (#68) from fix/issue-54 into main"

This reverts commit 922858a81a, reversing
changes made to 015df15bd5.

apps/telegram-bot/commands.py

@@ -1,7 +1,6 @@
 """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
@@ -21,34 +20,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 []
@@ -56,65 +27,29 @@ def extract_args(text: str) -> list[str]:
     return tokens[1:] if len(tokens) > 1 else []
 
 
-def parse_args(
-    args: list[str],
-) -> tuple[Optional[str], Optional[str], Optional[int], bool, bool]:
+def parse_args(args: list[str]) -> tuple[Optional[str], Optional[str], Optional[int]]:
     text = None
     link = None
     due_date_ts = None
-    clear_link = False
-    clear_date = False
 
-    i = 0
-    while i < len(args):
-        arg = args[i]
-
-        if arg == "-link":
-            if i + 1 < len(args) and (
-                args[i + 1].startswith("http://") or args[i + 1].startswith("https://")
-            ):
-                link = args[i + 1]
-                i += 2
-            else:
-                clear_link = True
-                i += 1
-        elif arg == "-date":
-            if i + 1 < len(args):
-                parsed = dateparser.parse(args[i + 1])
-                if parsed:
-                    due_date_ts = int(parsed.timestamp())
-                    i += 2
-                else:
-                    clear_date = True
-                    i += 1
-            else:
-                clear_date = True
-                i += 1
-        elif not link and (arg.startswith("http://") or arg.startswith("https://")):
+    remaining = []
+    for arg in args:
+        if not link and (arg.startswith("http://") or arg.startswith("https://")):
             link = arg
-            i += 1
         elif due_date_ts is None:
             parsed = dateparser.parse(arg)
             if parsed:
                 due_date_ts = int(parsed.timestamp())
-                i += 1
             else:
-                i += 1
-                if text is None:
-                    text = arg
+                remaining.append(arg)
         else:
-                    text = text + " " + arg
-        else:
-            i += 1
-            if text is None:
-                text = arg
-            else:
-                text = text + " " + arg
+            remaining.append(arg)
 
-    return text, link, due_date_ts, clear_link, clear_date
+    text = " ".join(remaining) if remaining else None
+    return text, link, due_date_ts
 
 
-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}]")
@@ -123,11 +58,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)")
@@ -171,7 +102,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)
 
 
@@ -181,7 +112,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)
@@ -195,7 +125,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)
 
 
@@ -208,7 +138,7 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         )
         return
 
-    text, link, due_date_ts, _, _ = parse_args(args)
+    text, link, due_date_ts = parse_args(args)
     if not text and not link:
         await update.message.reply_text("A bounty needs at least text or a link.")
         return
@@ -226,8 +156,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}",
@@ -239,14 +168,7 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     args = extract_args(update.message.text)
     if len(args) < 1:
         await update.message.reply_text(
-            "Usage: /update <bounty_id> [text] [link] [due_date]\n"
-            "       /update <bounty_id> -link [<url>]   - clear or set link\n"
-            "       /update <bounty_id> -date [<date>]   - clear or set date\n"
-            "Examples:\n"
-            "  /update 1 new text           - update text only\n"
-            "  /update 1 -link              - clear link\n"
-            "  /update 1 -link https://...  - set link\n"
-            "  /update 1 -link -date        - clear both link and date"
+            "Usage: /update <bounty_id> [text] [link] [due_date]"
         )
         return
 
@@ -256,14 +178,8 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Invalid bounty ID.")
         return
 
-    text, link, due_date_ts, clear_link, clear_date = parse_args(args[1:])
-    if (
-        not text
-        and not link
-        and due_date_ts is None
-        and not clear_link
-        and not clear_date
-    ):
+    text, link, due_date_ts = parse_args(args[1:])
+    if not text and not link and due_date_ts is None:
         await update.message.reply_text("Nothing to update.")
         return
 
@@ -278,15 +194,10 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
             text=text,
             link=link,
             due_date_ts=due_date_ts,
-            clear_link=clear_link,
-            clear_due=clear_date,
         )
     except PermissionError as e:
         await update.message.reply_text(f"⛔ {e}")
         return
-    except ValueError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
 
     if success:
         await update.message.reply_text(f"✅ Bounty #{bounty_id} updated.")
@@ -300,32 +211,34 @@ cmd_edit = cmd_update
 async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     args = extract_args(update.message.text)
     if not args:
-        await update.message.reply_text("Usage: /delete <bounty_id>")
+        await update.message.reply_text("Usage: /delete <bounty_id> [bounty_id ...]")
         return
 
     try:
-        bounty_id = int(args[0])
+        bounty_ids = [int(arg) for arg in args]
     except ValueError:
-        await update.message.reply_text("Invalid bounty ID.")
+        await update.message.reply_text("Invalid bounty ID(s).")
         return
 
     user_id = get_user_id(update)
     room_id = get_room_id(update)
 
-    try:
-        success = BOUNTY_SERVICE.delete_bounty(
+    results = BOUNTY_SERVICE.delete_bounties(
         room_id=room_id,
-            bounty_id=bounty_id,
+        bounty_ids=bounty_ids,
         user_id=user_id,
     )
-    except PermissionError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
 
-    if success:
-        await update.message.reply_text(f"✅ Bounty #{bounty_id} deleted.")
-    else:
-        await update.message.reply_text("Bounty not found.")
+    lines = []
+    for bounty_id, result in results.items():
+        if result == "deleted":
+            lines.append(f"✅ Bounty #{bounty_id} deleted.")
+        elif result == "not_found":
+            lines.append(f"⛔ Bounty #{bounty_id} not found.")
+        elif result == "permission_denied":
+            lines.append(f"⛔ Bounty #{bounty_id} - only admins can delete.")
+
+    await update.message.reply_text("\n".join(lines))
 
 
 async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
@@ -407,11 +320,8 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         "/bounty — list all bounties\n"
         "/my — bounties you're tracking\n"
         "/add <text> [link] [due] — add bounty\n"
-        "/update <id> [text] [link] [due] — update bounty\n"
-        "/edit <id> [text] [link] [due] — edit bounty (same as update)\n"
-        "  /edit <id> -link [<url>]  — clear or set link\n"
-        "  /edit <id> -date [<date>] — clear or set date\n"
-        "/delete <id> — delete bounty (admin only)\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"

core/services.py

@@ -210,6 +210,31 @@ class BountyService:
         self._storage.update_bounty(room_id, bounty)
         return True
 
+    def delete_bounties(
+        self, room_id: int, bounty_ids: list[int], user_id: int
+    ) -> dict[int, str]:
+        """Soft delete multiple bounties. Only admins can delete.
+
+        Returns a dict mapping bounty_id to result:
+        - "deleted": Successfully soft-deleted
+        - "not_found": Bounty does not exist
+        - "permission_denied": User is not admin
+        """
+        results = {}
+        for bounty_id in bounty_ids:
+            bounty = self._storage.get_bounty(room_id, bounty_id)
+            if not bounty:
+                results[bounty_id] = "not_found"
+                continue
+            if not self.is_admin(room_id, user_id):
+                results[bounty_id] = "permission_denied"
+                continue
+
+            bounty.deleted_at = int(time.time())
+            self._storage.update_bounty(room_id, bounty)
+            results[bounty_id] = "deleted"
+        return results
+
 
 class TrackingService:
     """Service for tracking bounty operations."""

tests/test_services.py

@@ -210,6 +210,53 @@ class TestBountyService:
         result = self.service.delete_bounty(-1001, 999, self.admin_user_id)
         assert result is False
 
+    def test_delete_bounties_multiple_success(self):
+        """Test delete_bounties soft deletes multiple bounties."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="First"
+        )
+        b2 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
+        )
+        b3 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Third"
+        )
+        results = self.service.delete_bounties(
+            -1001, [b1.id, b2.id, b3.id], self.admin_user_id
+        )
+        assert results == {b1.id: "deleted", b2.id: "deleted", b3.id: "deleted"}
+        assert self.service.get_bounty(-1001, b1.id) is None
+        assert self.service.get_bounty(-1001, b2.id) is None
+        assert self.service.get_bounty(-1001, b3.id) is None
+
+    def test_delete_bounties_mixed_results(self):
+        """Test delete_bounties returns individual results per ID."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Exists"
+        )
+        results = self.service.delete_bounties(
+            -1001, [b1.id, 999, 888], self.admin_user_id
+        )
+        assert results == {b1.id: "deleted", 999: "not_found", 888: "not_found"}
+
+    def test_delete_bounties_permission_denied(self):
+        """Test delete_bounties returns permission_denied for non-admin."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="First"
+        )
+        b2 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
+        )
+        results = self.service.delete_bounties(
+            -1001,
+            [b1.id, b2.id],
+            999,  # non-admin user
+        )
+        assert results == {b1.id: "permission_denied", b2.id: "permission_denied"}
+        # Bounties should not be deleted
+        assert self.service.get_bounty(-1001, b1.id) is not None
+        assert self.service.get_bounty(-1001, b2.id) is not None
+
 
 class TestTrackingService:
     """Unit tests for TrackingService."""