Automated sync from GitHub

app/handlers/replace.py

@@ -13,6 +13,7 @@ from telethon import Button, errors
 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 ..sync_engine import SyncOptions, sync_ids
 from ..tgutil import classify_media, esc, explain_rpc, get_rights, pack_file_id, ser_entities
 from ..channelref import parse_channel_ref
 
@@ -98,7 +99,8 @@ def parse_post_link(value: str):
         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])
+            # Telegram's t.me/c URL uses the same positive channel ID stored by Telethon and in our database.
+            return 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]):
@@ -228,8 +230,26 @@ def register(ctx: Ctx) -> 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.")
+            if post is None:
+                report = await sync_ids(
+                    ctx.client,
+                    db,
+                    channel,
+                    [message_id],
+                    SyncOptions(history=False, grace=0, delete_services=False, ignore=ctx.sync_ignore),
+                    adopt_ids={message_id},
+                )
+                post = await db.find_by_message(channel.id, message_id)
+                if post is None:
+                    if report.error:
+                        raise UserError(f"I couldn't read that post: {report.error}")
+                    if report.restricted:
+                        raise UserError("Telegram is currently holding that post back, so I can't replace its media.")
+                    if report.unsupported:
+                        raise UserError("That post can't be saved in My posts, so its media can't be replaced here.")
+                    raise UserError("That post no longer exists in the channel, or I can't add it to My posts.")
+            if post.status != "sent":
+                raise UserError("That post is not published yet.")
             caption = reply.raw_text or ""
             await apply_edit(
                 ctx, post, channel, replace_media=True, media_kind=kind, media_file_id=pack_file_id(reply),

tests/harness.py

@@ -29,7 +29,7 @@ class FakeSent:
 
 
 class FakeEvent:
-    def __init__(self, uid, out, text="", data=None, message=None):
+    def __init__(self, uid, out, text="", data=None, message=None, reply=None):
         self.sender_id, self.out = uid, out
         self.is_private = True
         self.is_channel = False
@@ -40,6 +40,7 @@ class FakeEvent:
             raw_text=text, entities=[], media=None, grouped_id=None, forward=None
         )
         self.pattern_match = None
+        self._reply = reply
         self._is_callback = data is not None
         if data is not None:
             self.data = data.encode()
@@ -57,6 +58,9 @@ class FakeEvent:
     async def get_input_chat(self):
         return types.InputPeerUser(self.sender_id, 0)
 
+    async def get_reply_message(self):
+        return self._reply
+
 
 class Outbox:
     def __init__(self):
@@ -189,8 +193,8 @@ class App:
         await self.db.init()
         register_all(self.ctx)
 
-    async def text(self, s, message=None):
-        ev = FakeEvent(self.uid, self.out, s, message=message)
+    async def text(self, s, message=None, reply=None):
+        ev = FakeEvent(self.uid, self.out, s, message=message, reply=reply)
         for builder, cb in self.tg.handlers:
             if not isinstance(builder, events.NewMessage):
                 continue

tests/test_units.py

@@ -11,7 +11,7 @@ from app.common import UserError
 from app.db import normalize_db_url
 from app.channelref import parse_channel_ref
 from app.handlers.panel import extract_content
-from app.handlers.replace import parse_replace_args
+from app.handlers.replace import parse_post_link, parse_replace_args
 from app.linkswap import apply_span_replacements, classify_url, normalize_username, swap_url
 from app.suggest import advance_plain, build_suggestion
 from app.tgutil import (
@@ -27,7 +27,7 @@ from app.tgutil import (
     utf16_len,
 )
 
-from .fakes import cb_btn, make_msg, markup, url_btn
+from .fakes import FakeChannelClient, cb_btn, make_msg, markup, photo_media, url_btn
 from .harness import App
 
 NOW = datetime.datetime.now(datetime.timezone.utc)
@@ -166,6 +166,30 @@ def test_replace_args_and_refs():
     assert normalize_username("https://t.me/foo_bar/") == "foo_bar" and normalize_username("@x y") is None
     assert parse_channel_ref("@animech") == "animech" and parse_channel_ref("https://t.me/c/123456/7") == 123456
     assert parse_channel_ref("-1001234567890") == 1234567890 and parse_channel_ref("???") is None
+    assert parse_post_link("https://t.me/c/1723201445/9084") == (1723201445, 9084)
+    assert parse_post_link("https://t.me/animech/9084") == ("animech", 9084)
+
+
+def test_replace_adopts_a_linked_private_post_then_updates_its_media(tmp_path):
+    async def run():
+        app = App(tmp_path)
+        await app.start()
+        channel_id, message_id = 1723201445, 9084
+        old = make_msg(message_id, "old caption", media=photo_media(10))
+        app.tg.add_channel(FakeChannelClient({message_id: old}, cid=channel_id, title="Database Channel"))
+        await app.db.save_channel(channel_id, 5, "Database Channel", None, 1)
+        replacement = make_msg(1, "new caption", media=photo_media(20))
+
+        await app.text(f"/replace https://t.me/c/{channel_id}/{message_id}", reply=replacement)
+
+        saved = await app.db.find_by_message(channel_id, message_id)
+        assert saved is not None and saved.source == "adopted"
+        assert saved.text == "new caption" and saved.media_file_id == pack_file_id(replacement)
+        assert app.tg.edits[-1][1] == message_id
+        assert "Replaced the media" in app.out.last_text
+        await app.db.close()
+
+    asyncio.run(run())
 
 
 def test_url_helpers():