Improve handling of reaching the start of a chat in backfill

mautrix_telegram/db/backfill_queue.py

@@ -21,9 +21,11 @@ from datetime import datetime, timedelta
 from asyncpg import Record
 from attr import dataclass
 
-from mautrix.types import RoomID, UserID
+from mautrix.types import UserID
 from mautrix.util.async_db import Database
 
+from ..types import TelegramID
+
 fake_db = Database.create("") if TYPE_CHECKING else None
 
 
@@ -34,8 +36,9 @@ class Backfill:
     queue_id: int | None
     user_mxid: UserID
     priority: int
-    portal_tgid: int
-    portal_tg_receiver: int
+    portal_tgid: TelegramID
+    portal_tg_receiver: TelegramID
+    anchor_msg_id: TelegramID | None
     messages_per_batch: int
     post_batch_delay: int
     max_batches: int
@@ -47,9 +50,10 @@ class Backfill:
     def new(
         user_mxid: UserID,
         priority: int,
-        portal_tgid: int,
-        portal_tg_receiver: int,
+        portal_tgid: TelegramID,
+        portal_tg_receiver: TelegramID,
         messages_per_batch: int,
+        anchor_msg_id: TelegramID | None = None,
         post_batch_delay: int = 0,
         max_batches: int = -1,
     ) -> "Backfill":
@@ -59,6 +63,7 @@ class Backfill:
             priority=priority,
             portal_tgid=portal_tgid,
             portal_tg_receiver=portal_tg_receiver,
+            anchor_msg_id=anchor_msg_id,
             messages_per_batch=messages_per_batch,
             post_batch_delay=post_batch_delay,
             max_batches=max_batches,
@@ -78,6 +83,7 @@ class Backfill:
         "priority",
         "portal_tgid",
         "portal_tg_receiver",
+        "anchor_msg_id",
         "messages_per_batch",
         "post_batch_delay",
         "max_batches",
@@ -150,6 +156,7 @@ class Backfill:
             self.priority,
             self.portal_tgid,
             self.portal_tg_receiver,
+            self.anchor_msg_id,
             self.messages_per_batch,
             self.post_batch_delay,
             self.max_batches,

mautrix_telegram/db/upgrade/__init__.py

@@ -17,4 +17,5 @@ from . import (
     v12_message_sender,
     v13_multiple_reactions,
     v14_puppet_custom_mxid_index,
+    v15_backfill_anchor_id,
 )

mautrix_telegram/db/upgrade/v00_latest_revision.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from mautrix.util.async_db import Connection, Scheme
 
-latest_version = 14
+latest_version = 15
 
 
 async def create_latest_tables(conn: Connection, scheme: Scheme) -> int:
@@ -221,6 +221,7 @@ async def create_latest_tables(conn: Connection, scheme: Scheme) -> int:
             priority            INTEGER NOT NULL,
             portal_tgid         BIGINT,
             portal_tg_receiver  BIGINT,
+            anchor_msg_id       BIGINT,
             messages_per_batch  INTEGER NOT NULL,
             post_batch_delay    INTEGER NOT NULL,
             max_batches         INTEGER NOT NULL,

mautrix_telegram/db/upgrade/v15_backfill_anchor_id.py

@@ -0,0 +1,23 @@
+# mautrix-telegram - A Matrix-Telegram puppeting bridge
+# Copyright (C) 2022 Tulir Asokan
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+from mautrix.util.async_db import Connection
+
+from . import upgrade_table
+
+
+@upgrade_table.register(description="Store lowest message ID in backfill queue")
+async def upgrade_v15(conn: Connection) -> None:
+    await conn.execute("ALTER TABLE backfill_queue ADD COLUMN anchor_msg_id BIGINT")