Fix parsing /messages response

Author: tulir

mautrix/client/api/events.py

@@ -395,15 +395,13 @@ async def get_messages(
         try:
             return PaginatedMessages(
                 content["start"],
-                content["end"],
+                content.get("end"),
                 [Event.deserialize(event) for event in content["chunk"]],
             )
         except KeyError:
             if "start" not in content:
                 raise MatrixResponseError("`start` not in response.")
-            elif "end" not in content:
-                raise MatrixResponseError("`start` not in response.")
-            raise MatrixResponseError("`content` not in response.")
+            raise MatrixResponseError("`chunk` not in response.")
         except SerializerError as e:
             raise MatrixResponseError("Invalid events in response") from e
 

mautrix/types/misc.py

@@ -106,7 +106,7 @@ class RoomDirectoryResponse(SerializableAttrs):
 
 
 PaginatedMessages = NamedTuple(
-    "PaginatedMessages", start=SyncToken, end=SyncToken, events=List[Event]
+    "PaginatedMessages", start=SyncToken, end=Optional[SyncToken], events=List[Event]
 )