Even even more migrations to mautrix-python

mautrix_telegram/db/bot_chat.py

@@ -16,28 +16,31 @@
 from typing import Iterable
 
 from sqlalchemy import Column, Integer, String
+from sqlalchemy.engine.result import RowProxy
+
+from mautrix.bridge.db import Base
 
 from ..types import TelegramID
-from .base import Base
 
 
 # Fucking Telegram not telling bots what chats they are in 3:<
 class BotChat(Base):
     __tablename__ = "bot_chat"
-    id = Column(Integer, primary_key=True)  # type: TelegramID
-    type = Column(String, nullable=False)
+    id: TelegramID = Column(Integer, primary_key=True)
+    type: str = Column(String, nullable=False)
 
     @classmethod
-    def delete(cls, chat_id: TelegramID) -> None:
+    def delete_by_id(cls, chat_id: TelegramID) -> None:
         with cls.db.begin() as conn:
             conn.execute(cls.t.delete().where(cls.c.id == chat_id))
 
+    @classmethod
+    def scan(cls, row: RowProxy) -> 'BotChat':
+        return cls(id=row[0], type=row[1])
+
     @classmethod
     def all(cls) -> Iterable['BotChat']:
-        rows = cls.db.execute(cls.t.select())
-        for row in rows:
-            chat_id, chat_type = row
-            yield cls(id=chat_id, type=chat_type)
+        return cls._select_all()
 
     def insert(self) -> None:
         with self.db.begin() as conn: