Automated sync from GitHub

.gitattributes

@@ -1,8 +1,8 @@
-*.mp3 filter=lfs diff=lfs merge=lfs -text
-*.jpg filter=lfs diff=lfs merge=lfs -text
-*.jpeg filter=lfs diff=lfs merge=lfs -text
-*.png filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
 *.otf filter=lfs diff=lfs merge=lfs -text
 *.webp filter=lfs diff=lfs merge=lfs -text
 *.mp4 filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text

app/db.py

@@ -80,7 +80,7 @@ class Post(Base):
 
 
 class Batch(Base):
-    """One /replace run (so it can be undone)."""
+    """One /swap run (so it can be undone)."""
 
     __tablename__ = "batches"
 

app/handlers/basic.py

@@ -25,9 +25,10 @@ HELP = (
     "/channels - list your channels, or take one out (the bot asks whether its saved posts in My posts are deleted too)\n\n"
     "<b>Owner tools</b>\n"
     "/broadcast [time] - send one message to all channels; with a time (50m, 1h, 5d) it is deleted again from all channels and My posts afterwards\n"
-    "/replace @old @new - swap the username inside t.me links (button links and hyperlinks) in all channels\n"
+    "/replace <post link> - reply to a new media message to replace that post's media and caption\n"
+    "/swap @old @new - swap the username inside t.me links (button links and hyperlinks) in all channels\n"
     "/handleswap @old @new - change the username @old written in posts (text, captions, button names) to @new in all channels; links stay\n"
-    "/undo - undo the last /replace or /handleswap\n"
+    "/undo - undo the last /swap or /handleswap\n"
     "/repost @old @new - copy every post of a channel in order (links swapped, replies, pins and links between posts kept), then delete the old posts\n"
     "/shift @source @destination [from_id] [to_id] [-c] [-all] [--no-media] - copy posts from one channel into another (buttons kept, listed in My posts); "
     "a channel Telegram restricts (copyright strike) is copied from My posts; "

app/handlers/replace.py

@@ -1,4 +1,4 @@
-"""/replace, /handleswap and /undo (owner only)."""
+"""/replace media, /swap links, /handleswap and /undo (owner only)."""
 from __future__ import annotations
 
 import logging
@@ -6,19 +6,20 @@ import re
 import secrets
 import time
 from dataclasses import dataclass, field
+from urllib.parse import urlparse
 
 from telethon import Button, errors
 
-from ..common import Ctx, UserError, cmd, edit_callback_message, guard, on_cb, purge_pending, require_owner, say, show
+from ..common import Ctx, UserError, apply_edit, cmd, edit_callback_message, guard, on_cb, purge_pending, require_owner, say, show
 from ..linkswap import normalize_username
 from ..replace_engine import ApplyResult, ChannelScan, ScanOptions, apply_channel, scan_channel, undo_batch
-from ..tgutil import esc, explain_rpc, get_rights
+from ..tgutil import classify_media, esc, explain_rpc, get_rights, pack_file_id, ser_entities
 from ..channelref import parse_channel_ref
 
 log = logging.getLogger(__name__)
 
 USAGE = (
-    "Usage: <code>/replace @old @new</code>\n"
+    "Usage: <code>/swap @old @new</code>\n"
     "Options: <code>--channel @name</code> (only that channel), <code>--last 200</code> (only the newest 200 "
     "post ids), <code>--posts</code> (also change t.me/old/123 post links), <code>--no-typed</code> (don't touch "
     "links typed in the text)."
@@ -89,6 +90,24 @@ def pick_channels(chans: list, ref) -> list:
     return out
 
 
+def parse_post_link(value: str):
+    """Return (public username or private channel id, message id) for Telegram post links."""
+    try:
+        u = urlparse(value if "://" in value else "https://" + value)
+        bits = [x for x in u.path.strip("/").split("/") if x]
+        if u.netloc.lower() not in {"t.me", "www.t.me", "telegram.me", "www.telegram.me"}:
+            return None
+        if bits and bits[0] == "c" and len(bits) == 3 and bits[1].isdigit() and bits[2].isdigit():
+            return -1000000000000 - int(bits[1]), int(bits[2])
+        if bits and bits[0] == "s":
+            bits = bits[1:]
+        if len(bits) == 2 and bits[1].isdigit() and re.fullmatch(r"[A-Za-z][A-Za-z0-9_]{3,}", bits[0]):
+            return bits[0].lower(), int(bits[1])
+    except Exception:
+        pass
+    return None
+
+
 def handles_summary(job: Job) -> str:
     o = job.opts
     lines = [f"🔎 <b>Scan finished</b> - swap the username <code>@{esc(o.old)}</code> → <code>@{esc(o.new)}</code>"]
@@ -183,10 +202,47 @@ def register(ctx: Ctx) -> None:
 
         return upd
 
-    # ------------------------------------------------------------------ /replace
+    # ------------------------------------------------------------------ /replace media
     @client.on(cmd("replace", args=True))
     @guard(ctx, owner=True)
     async def h_replace(event):
+        purge_pending(ctx)
+        raw = (event.pattern_match.group(1) or "").strip()
+        if not raw:
+            await say(event, "Reply to a new photo, video, or file with <code>/replace &lt;channel post link&gt;</code>.")
+            return
+        # File replacement mode: reply to a media message with /replace <link to the saved post>.
+        link_bits = parse_post_link(raw) if len(raw.split()) == 1 else None
+        if link_bits:
+            reply = await event.get_reply_message()
+            if reply is None:
+                raise UserError("Reply to the new photo, video, or file, then send /replace <channel post link>.")
+            kind = classify_media(reply)
+            if not kind:
+                raise UserError("The replied-to message must contain a photo, video, GIF, audio file, or document.")
+            ref, message_id = link_bits
+            channels = await db.list_channels()
+            channel = next((c for c in channels if c.id == ref), None) if isinstance(ref, int) else next(
+                (c for c in channels if (c.username or "").lower() == ref), None
+            )
+            if channel is None:
+                raise UserError("That post link is not from a registered channel. Check /channels.")
+            post = await db.find_by_message(channel.id, message_id)
+            if post is None or post.status != "sent":
+                raise UserError("That published post is not in My posts.")
+            caption = reply.raw_text or ""
+            await apply_edit(
+                ctx, post, channel, replace_media=True, media_kind=kind, media_file_id=pack_file_id(reply),
+                text=caption, entities=ser_entities(reply.entities),
+            )
+            await say(event, f"✅ Replaced the media in <b>{esc(channel.title)}</b> and updated My posts.")
+            return
+        raise UserError("Use /replace with a channel post link, replying to the new media. Username swaps use /swap.")
+
+    # ------------------------------------------------------------------ /swap usernames in links
+    @client.on(cmd("swap", args=True))
+    @guard(ctx, owner=True)
+    async def h_swap(event):
         purge_pending(ctx)
         raw = (event.pattern_match.group(1) or "").strip()
         if not raw:
@@ -229,7 +285,7 @@ def register(ctx: Ctx) -> None:
     async def begin_scan(event, opts, chans) -> None:
         """Read the channels, show what would change and wait for the owner's yes."""
         if lock.locked():
-            raise UserError("Another /replace, /handleswap or /undo is still running - wait for it to finish.")
+            raise UserError("Another /swap, /handleswap or /undo is still running - wait for it to finish.")
         async with lock:
             status = await say(event, f"🔍 Scanning {len(chans)} channel(s)…")
             last_edit = [0.0]
@@ -281,7 +337,7 @@ def register(ctx: Ctx) -> None:
         token, action = parts[0], parts[1]
         job = ctx.pending.get(token)
         if not isinstance(job, Job) or job.user != event.sender_id:
-            raise UserError("That scan has expired. Run /replace again.")
+            raise UserError("That scan has expired. Run /swap again.")
         if action == "n":
             ctx.pending.pop(token, None)
             await show(event, "Cancelled - nothing was changed.")
@@ -367,7 +423,7 @@ def register(ctx: Ctx) -> None:
     async def h_undo(event):
         batch = await db.last_batch()
         if batch is None:
-            raise UserError("There is nothing to undo - no /replace or /handleswap run yet.")
+            raise UserError("There is nothing to undo - no /swap or /handleswap run yet.")
         await ask_undo(event, batch)
 
     @on_cb(ctx, "ruc")
@@ -382,7 +438,7 @@ def register(ctx: Ctx) -> None:
     async def cb_undo(event, parts):
         require_owner(ctx, event)
         if lock.locked():
-            raise UserError("Another /replace, /handleswap or /undo is still running.")
+            raise UserError("Another /swap, /handleswap or /undo is still running.")
         upd = make_updater(event)
         async with lock:
             await upd("⏳ Restoring…", force=True)

app/handleswap.py

@@ -43,7 +43,7 @@ def find_mention_spans(sur: str, entities, name: str) -> tuple:
 
 def compute_handle_changes(msg, old: str, new: str) -> tuple:
     """(MsgChange or None, number of mentions skipped because they are part of a link) - same shape as
-    linkswap.compute_message_changes, so the /replace engine can apply it."""
+    linkswap.compute_message_changes, so the /swap engine can apply it."""
     text = msg.message or ""
     ents = list(msg.entities or [])
     sur = add_surrogate(text)

app/replace_engine.py

@@ -1,4 +1,4 @@
-"""/replace engine: scan channels message by message, rewrite links, log every change, undo."""
+"""/swap engine: scan channels message by message, rewrite links, log every change, undo."""
 from __future__ import annotations
 
 import asyncio
@@ -36,7 +36,7 @@ class ScanOptions:
     include_typed: bool = True
     include_posts: bool = False
     last: Optional[int] = None
-    mode: str = "links"  # "links": the username inside t.me links (/replace); "handles": '@name' written in a post (/handleswap)
+    mode: str = "links"  # "links": the username inside t.me links (/swap); "handles": '@name' written in a post (/handleswap)
 
 
 def compute_changes(m, opts: ScanOptions) -> tuple:
@@ -284,7 +284,7 @@ async def undo_batch(
     edit_delay: float = 1.2,
     progress: Optional[Callable[[UndoResult], Awaitable[None]]] = None,
 ) -> UndoResult:
-    """Put every post touched by a /replace run back exactly as it was."""
+    """Put every post touched by a /swap run back exactly as it was."""
     res = UndoResult()
     channels: dict = {}
     done_ids: list = []

app/syncer.py

@@ -5,7 +5,7 @@
   seconds later (the wait lets a burst of changes settle, and lets the bot finish saving its own posts first);
 * service messages ("pinned a message", "channel photo changed" ...) are deleted the moment they appear.
 
-Nothing here holds the bot's one-long-job lock: a running /repost, /shift, /replace ... always wins, and what happens
+Nothing here holds the bot's one-long-job lock: a running /repost, /shift, /swap ... always wins, and what happens
 while it runs is picked up by the next timed check.
 """
 from __future__ import annotations

bot.py

@@ -42,7 +42,8 @@ COMMANDS = [
     ("addchannel", "Register a channel"),
     ("channels", "List channels"),
     ("broadcast", "Send one message to all channels, optionally timed (owner)"),
-    ("replace", "Swap a username in links (owner)"),
+    ("replace", "Replace a post's media (owner)"),
+    ("swap", "Swap a username in links (owner)"),
     ("handleswap", "Swap a @username written in posts (owner)"),
     ("repost", "Copy a whole channel in order (owner)"),
     ("shift", "Copy posts from one channel to another (owner)"),

tests/test_flows.py

@@ -123,7 +123,7 @@ def test_bad_input_and_permissions(tmp_path):
 
         # a non-owner is rejected everywhere
         app.uid = 999
-        await app.text("/replace @a @b")
+        await app.text("/swap @a @b")
         assert "private" in app.out.last_text.lower()
         await app.db.close()
 

tests/test_handleswap.py

@@ -246,13 +246,13 @@ def test_replace_still_works_after_the_refactor(tmp_path):
     async def go():
         app = await flow_app(tmp_path)
         app.tg.msgs[3].reply_markup = markup([url_btn("Get", "https://t.me/bro?start=1")])
-        await app.text("/replace @bro @sis")
+        await app.text("/swap @bro @sis")
         shown = norm(app.out.last_text)
         assert "replace @bro → @sis" in shown and "Apply to" in str(app.out.last_buttons())
         await app.press(app.out.callback_data("Apply to"))
         assert "Done - @bro → @sis" in norm(app.out.last_text)
         assert button_url(app.tg.msgs[3].reply_markup.rows[0].buttons[0]) == "https://t.me/sis?start=1"
-        assert app.tg.msgs[1].message == "Join @bro today"  # /replace never touches a plain username
+        assert app.tg.msgs[1].message == "Join @bro today"  # /swap never touches a plain username
         await app.text("/undo")
         assert "Undo the replace @bro → @sis" in norm(app.out.last_text)
         await app.db.close()