Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possibly fix firstMemberCache being invalid

Browse Source
This commit is contained in:
Tulir Asokan 2018-04-23 00:13:41 +03:00
parent ea965766b4
commit ee4b0be953
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
matrix/rooms/room.go
View File

@ -56,7 +56,7 @@ type Room struct {
memberCache map[string]*Member memberCache map[string]*Member
// The first non-SessionUserID member in the room. Calculated at // The first non-SessionUserID member in the room. Calculated at
// the same time as memberCache. // the same time as memberCache.
firstMemberCache string firstMemberCache *Member
// The name of the room. Calculated from the state event name, // The name of the room. Calculated from the state event name,
// canonical_alias or alias or the member cache. // canonical_alias or alias or the member cache.
nameCache string nameCache string
@ -120,7 +120,7 @@ func (room *Room) UpdateState(event *gomatrix.Event) {
room.aliasesCache = nil room.aliasesCache = nil
case "m.room.member": case "m.room.member":
room.memberCache = nil room.memberCache = nil
room.firstMemberCache = "" room.firstMemberCache = nil
if room.nameCacheSource >= MemberRoomName { if room.nameCacheSource >= MemberRoomName {
room.nameCache = "" room.nameCache = ""
} }
@ -225,10 +225,12 @@ func (room *Room) updateNameFromMembers() {
members := room.GetMembers() members := room.GetMembers()
if len(members) <= 1 { if len(members) <= 1 {
room.nameCache = "Empty room" room.nameCache = "Empty room"
} else if room.firstMemberCache == nil {
room.nameCache = "Room"
} else if len(members) == 2 { } else if len(members) == 2 {
room.nameCache = members[room.firstMemberCache].DisplayName room.nameCache = room.firstMemberCache.DisplayName
} else { } else {
firstMember := members[room.firstMemberCache].DisplayName firstMember := room.firstMemberCache.DisplayName
room.nameCache = fmt.Sprintf("%s and %d others", firstMember, len(members)-2) room.nameCache = fmt.Sprintf("%s and %d others", firstMember, len(members)-2)
} }
} }
@ -267,13 +269,13 @@ func (room *Room) GetTitle() string {
func (room *Room) createMemberCache() map[string]*Member { func (room *Room) createMemberCache() map[string]*Member {
cache := make(map[string]*Member) cache := make(map[string]*Member)
events := room.GetStateEvents("m.room.member") events := room.GetStateEvents("m.room.member")
room.firstMemberCache = "" room.firstMemberCache = nil
if events != nil { if events != nil {
for userID, event := range events { for userID, event := range events {
if len(room.firstMemberCache) == 0 && userID != room.SessionUserID {
room.firstMemberCache = userID
}
member := eventToRoomMember(userID, event) member := eventToRoomMember(userID, event)
if room.firstMemberCache == nil && userID != room.SessionUserID {
room.firstMemberCache = member
}
if member.Membership != "leave" { if member.Membership != "leave" {
cache[member.UserID] = member cache[member.UserID] = member
} }
@ -288,7 +290,7 @@ func (room *Room) createMemberCache() map[string]*Member {
// The members are returned from the cache. // The members are returned from the cache.
// If the cache is empty, it is updated first. // If the cache is empty, it is updated first.
func (room *Room) GetMembers() map[string]*Member { func (room *Room) GetMembers() map[string]*Member {
if len(room.memberCache) == 0 { if len(room.memberCache) == 0 || room.firstMemberCache == nil {
room.createMemberCache() room.createMemberCache()
} }
return room.memberCache return room.memberCache