revert: remove timezone command and revert date format to simple YYYY-MM-DD

This reverts:
- cmd_timezone function (issue #67)
- format_due_date with human-readable dates (issue #68)
- Reverts date display back to time.strftime("%Y-%m-%d")
- Keeps /edit command with -link/-date flags (issue #46)

apps/telegram-bot/commands.py

@@ -19,6 +19,7 @@ TRACKING_SERVICE = TrackingService(TRACKING_STORAGE, ROOM_STORAGE)
 TELEGRAM_BOT_USERNAME = "your_bot_username"
 
 
+
 def extract_args(text: str) -> list[str]:
     if not text:
         return []
@@ -26,26 +27,62 @@ 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]]:
+def parse_args(
+    args: list[str],
+) -> tuple[Optional[str], Optional[str], Optional[int], bool, bool]:
     text = None
     link = None
     due_date_ts = None
+    clear_link = False
+    clear_date = False
 
-    remaining = []
+    i = 0
-    for arg in args:
+    while i < len(args):
-        if not link and (arg.startswith("http://") or arg.startswith("https://")):
+        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://")):
             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:
-                remaining.append(arg)
+                i += 1
+                if text is None:
+                    text = arg
+                else:
+                    text = text + " " + arg
         else:
-            remaining.append(arg)
+            i += 1
+            if text is None:
+                text = arg
+            else:
+                text = text + " " + arg
 
-    text = " ".join(remaining) if remaining else None
+    return text, link, due_date_ts, clear_link, clear_date
-    return text, link, due_date_ts
 
 
 def format_bounty(b, show_id: bool = True) -> str:
@@ -111,6 +148,7 @@ 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)
@@ -137,7 +175,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
@@ -155,8 +193,9 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
 
     due_str = ""
     if due_date_ts:
-        due_str = f" | Due: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}"
+    due_str = ""
-
+    if due_date_ts:
+        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,
@@ -167,7 +206,14 @@ 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]"
+            "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"
         )
         return
 
@@ -177,8 +223,14 @@ 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 = parse_args(args[1:])
+    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:
+    if (
+        not text
+        and not link
+        and due_date_ts is None
+        and not clear_link
+        and not clear_date
+    ):
         await update.message.reply_text("Nothing to update.")
         return
 
@@ -193,10 +245,15 @@ 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.")
@@ -317,11 +374,16 @@ 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"
+        "/update <id> [text] [link] [due] — update bounty\n"
-        "/delete <id> — delete 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"
         "/track <id> — track a bounty (groups only)\n"
         "/untrack <id> — stop tracking (groups only)\n"
         "/start — re-initialize\n"
         "/help — this message",
         disable_web_page_preview=True,
     )
+
+

cli/main.py

@@ -127,40 +127,6 @@ def cmd_delete(args):
         sys.exit(1)
 
 
-def cmd_recover(args):
-    """List or recover soft-deleted bounties."""
-    bounty_service, _ = create_services()
-    room_id = args.group_id or args.user_id
-    user_id = args.user_id or 0
-
-    if not args.bounty_ids:
-        deleted = bounty_service.list_deleted_bounties(room_id)
-        if not deleted:
-            print("No recoverable bounties")
-            return
-        print("Recoverable bounties:")
-        for b in deleted:
-            from datetime import datetime
-
-            deleted_str = datetime.fromtimestamp(b.deleted_at).strftime("%d %b %Y")
-            print(f"  [#{b.id}] {b.text or '(no text)'} | Deleted {deleted_str}")
-        return
-
-    if not bounty_service.is_admin(room_id, user_id):
-        print("Error: Only admins can recover bounties.", file=sys.stderr)
-        sys.exit(1)
-
-    for bounty_id in args.bounty_ids:
-        try:
-            success, msg = bounty_service.recover_bounty(
-                room_id=room_id, bounty_id=bounty_id, user_id=user_id
-            )
-            print(msg)
-        except PermissionError as e:
-            print(f"Error: {e}", file=sys.stderr)
-            sys.exit(1)
-
-
 def cmd_track(args):
     """Track a bounty."""
     _, tracking_service = create_services()
@@ -230,9 +196,6 @@ def main():
     parser_untrack = subparsers.add_parser("untrack", help="Untrack a bounty")
     parser_untrack.add_argument("bounty_id", type=int, help="Bounty ID to untrack")
 
-    parser_recover = subparsers.add_parser("recover", help="List or recover soft-deleted bounties")
-    parser_recover.add_argument("bounty_ids", nargs="*", type=int, help="Bounty ID(s) to recover (optional)")
-
     for sp in [
         parser_add,
         parser_list,
@@ -241,7 +204,6 @@ def main():
         parser_delete,
         parser_track,
         parser_untrack,
-        parser_recover,
     ]:
         sp.add_argument(
             "--group-id", type=int, help="Group context (use group room ID)"
@@ -260,7 +222,7 @@ def main():
         print("Error: either --group-id or --user-id is required", file=sys.stderr)
         sys.exit(1)
 
-    if args.command in ("add", "list", "my", "update", "delete", "recover"):
+    if args.command in ("add", "list", "my", "update", "delete"):
         if not (args.group_id or args.user_id):
             print("Error: --group-id or --user-id required", file=sys.stderr)
             sys.exit(1)
@@ -276,7 +238,6 @@ def main():
         "delete": cmd_delete,
         "track": cmd_track,
         "untrack": cmd_untrack,
-        "recover": cmd_recover,
     }
 
     if args.command in command_map:

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.
-        """
-        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."
-
-        if not self.is_admin(room_id, user_id):
-            raise PermissionError("Only admins can recover bounties.")
-
-        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."""