浏览代码

Fix getting reactions/messages from db

Tulir Asokan 4 年之前
父节点
当前提交
f52db2051c
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 4 4
      mautrix_signal/db/message.py
  2. 2 2
      mautrix_signal/db/reaction.py

+ 4 - 4
mautrix_signal/db/message.py

@@ -68,7 +68,7 @@ class Message:
         row = await cls.db.fetchrow(q, mxid, mx_room)
         if not row:
             return None
-        return cls(**row)
+        return cls._from_row(row)
 
     @classmethod
     async def get_by_signal_id(cls, sender: UUID, timestamp: int, signal_chat_id: Union[str, UUID],
@@ -79,14 +79,14 @@ class Message:
         row = await cls.db.fetchrow(q, sender, timestamp, str(signal_chat_id), signal_receiver)
         if not row:
             return None
-        return cls(**row)
+        return cls._from_row(row)
 
     @classmethod
     async def find_by_timestamps(cls, timestamps: List[int]) -> List['Message']:
         q = ("SELECT mxid, mx_room, sender, timestamp, signal_chat_id, signal_receiver "
              "FROM message WHERE timestamp=ANY($1)")
         rows = await cls.db.fetch(q, timestamps)
-        return [cls(**row) for row in rows]
+        return [cls._from_row(row) for row in rows]
 
     @classmethod
     async def find_by_sender_timestamp(cls, sender: UUID, timestamp: int) -> Optional['Message']:
@@ -95,4 +95,4 @@ class Message:
         row = await cls.db.fetchrow(q, sender, timestamp)
         if not row:
             return None
-        return cls(**row)
+        return cls._from_row(row)

+ 2 - 2
mautrix_signal/db/reaction.py

@@ -76,7 +76,7 @@ class Reaction:
         row = await cls.db.fetchrow(q, mxid, mx_room)
         if not row:
             return None
-        return cls(**row)
+        return cls._from_row(row)
 
     @classmethod
     async def get_by_signal_id(cls, chat_id: str, receiver: str, msg_author: UUID,
@@ -88,4 +88,4 @@ class Reaction:
         row = await cls.db.fetchrow(q, chat_id, receiver, msg_author, msg_timestamp, author)
         if not row:
             return None
-        return cls(**row)
+        return cls._from_row(row)