Merge pull request #61 from fix/issue-46

- Add -link and -date flags to /edit command for field clearing
- /edit <id> -link - clear link
- /edit <id> -date - clear date
- /edit <id> -link <url> - set link
- /edit <id> -date <date> - set date
- /edit <id> text -link - update text, clear link
- /edit <id> text <url> - update text and set link
- Parse_args now returns (text, link, due_date_ts, clear_link, clear_date)
- Update usage messages and help text
- Fixes #46

apps/telegram-bot/commands.py

@@ -56,56 +56,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
     while i < len(args):
         arg = args[i]
-        if not link and (arg.startswith("http://") or arg.startswith("https://")):
+
+        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())
-                if i + 1 < len(args) and _is_time_format(args[i + 1]):
+                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)
+                i += 1
+                if text is None:
+                    text = arg
+                else:
+                    text = text + " " + arg
         else:
-            remaining.append(arg)
+            i += 1
-        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 _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:
@@ -197,12 +203,12 @@ 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"
+            "Usage: /add <text> [link] [due_date]\n"
-            "Example: /add Fix bug https://github.com/foo/bar april 15 14:30"
+            "Example: /add Fix the bug https://github.com/foo/bar tomorrow"
         )
         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
@@ -210,20 +216,13 @@ 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(
-        bounty = BOUNTY_SERVICE.add_bounty(
+        room_id=room_id,
-            room_id=room_id,
+        user_id=user_id,
-            user_id=user_id,
+        text=text,
-            text=text,
+        link=link,
-            link=link,
+        due_date_ts=due_date_ts,
-            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:
@@ -240,7 +239,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
 
@@ -250,8 +256,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
 
@@ -266,10 +278,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.")
@@ -389,8 +406,11 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         "👻 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"
+        "/add <text> [link] [due] — add bounty\n"
-        "/update <id> [text] [link] [due] — update bounty (admin only)\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"
         "/track <id> — track a bounty (groups only)\n"
         "/untrack <id> — stop tracking (groups only)\n"

core/services.py

@@ -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:
+    ) -> bool:
-        """Check if a link is unique within a room (not used by another bounty).
+        """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.
-        """
         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 False
-        return None
+        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 not self.check_link_unique(room_id, link):
-        if conflicting_id is not None:
+            raise ValueError("A bounty with this link already exists in this room.")
-            raise ValueError(
-                f"A bounty with this link already exists: #{conflicting_id}"
-            )
 
         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 (
+        if link and not self.check_link_unique(
-            link
+            room_id, link, exclude_bounty_id=bounty_id
-            and self.check_link_unique(room_id, link, exclude_bounty_id=bounty_id)
-            is not None
         ):
             raise ValueError("A bounty with this link already exists in this room.")