Separate the membership events out.

We need to handle the membership events so we can populate the nicklist
and set nick colors before we print out any messages.

matrix/events.py

@@ -326,6 +326,10 @@ class MatrixSyncEvent(MatrixEvent):
             room.prev_batch = info.prev_batch
 
         tags = tags_for_message("message")
+
+        for event in info.membership_events:
+            event.execute(server, room, buf, list(tags))
+
         for event in info.events:
             event.execute(server, room, buf, list(tags))
 

matrix/rooms.py

@@ -86,10 +86,11 @@ def matrix_create_room_buffer(server, room_id):
 
 class RoomInfo():
 
-    def __init__(self, room_id, prev_batch, events):
+    def __init__(self, room_id, prev_batch, membership_events, events):
-        # type: (str, str, List[Any]) -> None
+        # type: (str, str, List[Any], List[Any]) -> None
         self.room_id = room_id
         self.prev_batch = prev_batch
+        self.membership_events = membership_events
         self.events = events
 
     @staticmethod
@@ -122,29 +123,28 @@ class RoomInfo():
         return None
 
     @staticmethod
-    def _event_from_dict(event):
+    def _parse_events(parsed_dict):
-        if event["type"] == "m.room.message":
+        membership_events = []
-            return RoomInfo._message_from_event(event)
+        other_events = []
-        elif event["type"] == "m.room.member":
+
-            return RoomInfo._membership_from_dict(event)
+        for event in parsed_dict:
-        else:
+            if event["type"] == "m.room.message":
-            return None
+                other_events.append(RoomInfo._message_from_event(event))
+            elif event["type"] == "m.room.member":
+                membership_events.append(RoomInfo._membership_from_dict(event))
+
+        return (list(filter(None, membership_events)), other_events)
 
     @classmethod
     def from_dict(cls, room_id, parsed_dict):
         prev_batch = sanitize_id(parsed_dict['timeline']['prev_batch'])
 
-        events = []
-
         state_dict = parsed_dict['state']['events']
         timeline_dict = parsed_dict['timeline']['events']
 
-        for event in timeline_dict:
+        membership_events, other_events = RoomInfo._parse_events(timeline_dict)
-            events.append(RoomInfo._event_from_dict(event))
 
-        filtered_events = list(filter(None, events))
+        return cls(room_id, prev_batch, membership_events, other_events)
-
-        return cls(room_id, prev_batch, filtered_events)
 
 
 class RoomEvent():