From 6b4adccce22b6c2ea81d9dbdd78657ea46f1acbc Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 20 Apr 2020 22:46:41 +0300
Subject: [PATCH] Fix loading member events

---
 matrix/matrix.go     | 7 +++++++
 matrix/rooms/room.go | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/matrix/matrix.go b/matrix/matrix.go
index 617bbd5..303184f 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -890,11 +890,18 @@ func (c *Container) LeaveRoom(roomID id.RoomID) error {
 }
 
 func (c *Container) FetchMembers(room *rooms.Room) error {
+	debug.Print("Fetching member list for", room.ID)
 	members, err := c.client.Members(room.ID, mautrix.ReqMembers{At: room.LastPrevBatch})
 	if err != nil {
 		return err
 	}
+	debug.Printf("Fetched %d members for %s", len(members.Chunk), room.ID)
 	for _, evt := range members.Chunk {
+		err := evt.Content.ParseRaw(evt.Type)
+		if err != nil {
+			debug.Printf("Failed to parse member event of %s: %v", evt.GetStateKey(), err)
+			continue
+		}
 		room.UpdateState(evt)
 	}
 	room.MembersFetched = true
diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index 7feae89..0238cfb 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -213,6 +213,10 @@ func (room *Room) Unload() bool {
 	debug.Print("Unloading", room.ID)
 	room.Save()
 	room.state = nil
+	room.memberCache = nil
+	room.exMemberCache = nil
+	room.firstMemberCache = nil
+	room.secondMemberCache = nil
 	if room.postUnload != nil {
 		room.postUnload()
 	}
@@ -408,7 +412,7 @@ func (room *Room) UpdateState(evt *event.Event) {
 	case *event.TopicEventContent:
 		room.topicCache = content.Topic
 	case *event.EncryptionEventContent:
-		if content.Algorithm == "m.megolm.v1.aes-sha2" {
+		if content.Algorithm == event.AlgorithmMegolmV1 {
 			room.Encrypted = true
 		}
 	}