From 1ea6ba026aab8b9d3e66681c97043b5806ef4971 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 16 Jun 2019 15:15:30 +0300
Subject: Make displayname pushrule check possible without loading room state

---
 matrix/rooms/room.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index be91065..4928871 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -73,6 +73,7 @@ type Room struct {
 	PrevBatch string
 	// The MXID of the user whose session this room was created for.
 	SessionUserID string
+	SessionMember *mautrix.Member
 
 	// The number of unread messages that were notified about.
 	UnreadMessages   []UnreadMessage
@@ -362,8 +363,11 @@ func (room *Room) UpdateState(event *mautrix.Event) {
 		}
 		room.aliasesCache = nil
 	case mautrix.StateMember:
+		userID := event.GetStateKey()
+		if userID == room.SessionUserID {
+			room.SessionMember = room.eventToMember(userID, &event.Content)
+		}
 		if room.memberCache != nil {
-			userID := event.GetStateKey()
 			if event.Content.Membership == mautrix.MembershipLeave || event.Content.Membership == mautrix.MembershipBan {
 				delete(room.memberCache, userID)
 			} else if event.Content.Membership == mautrix.MembershipInvite || event.Content.Membership == mautrix.MembershipJoin {
@@ -567,6 +571,9 @@ func (room *Room) createMemberCache() map[string]*mautrix.Member {
 				cache[userID] = member
 				room.updateNthMemberCache(userID, member)
 			}
+			if userID == room.SessionUserID {
+				room.SessionMember = member
+			}
 		}
 	}
 	room.lock.RUnlock()
@@ -589,6 +596,9 @@ func (room *Room) GetMembers() map[string]*mautrix.Member {
 // GetMember returns the member with the given MXID.
 // If the member doesn't exist, nil is returned.
 func (room *Room) GetMember(userID string) *mautrix.Member {
+	if userID == room.SessionUserID && room.SessionMember != nil {
+		return room.SessionMember
+	}
 	room.Load()
 	room.createMemberCache()
 	room.lock.RLock()
-- 
cgit v1.2.3