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

Make room name from aliases calculation consistent

Browse Source
This commit is contained in:
Tulir Asokan 2018-04-22 23:23:30 +03:00
parent 64fa922ec0
commit 1085ddc390
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
matrix/rooms/room.go
View File

@ -18,6 +18,7 @@ package rooms
import ( import (
"fmt" "fmt"
"sort"
"sync" "sync"
"maunium.net/go/gomatrix" "maunium.net/go/gomatrix"
@ -26,7 +27,7 @@ import (
type RoomNameSource int type RoomNameSource int
const ( const (
ExplicitRoomName RoomNameSource = iota ExplicitRoomName RoomNameSource = iota
CanonicalAliasRoomName CanonicalAliasRoomName
AliasRoomName AliasRoomName
MemberRoomName MemberRoomName
@ -126,7 +127,11 @@ func (room *Room) UpdateState(event *gomatrix.Event) {
case "m.room.topic": case "m.room.topic":
room.topicCache = "" room.topicCache = ""
} }
room.State[event.Type][*event.StateKey] = event if event.StateKey == nil {
room.State[event.Type][""] = event
} else {
room.State[event.Type][*event.StateKey] = event
}
} }
// GetStateEvent returns the state event for the given type/state_key combo, or nil. // GetStateEvent returns the state event for the given type/state_key combo, or nil.
@ -179,7 +184,7 @@ func (room *Room) GetAliases() []string {
newAliases := make([]string, len(room.aliasesCache)+len(aliases)) newAliases := make([]string, len(room.aliasesCache)+len(aliases))
copy(newAliases, room.aliasesCache) copy(newAliases, room.aliasesCache)
for index, alias := range aliases { for index, alias := range aliases {
newAliases[len(room.aliasesCache) + index], _ = alias.(string) newAliases[len(room.aliasesCache)+index], _ = alias.(string)
} }
room.aliasesCache = newAliases room.aliasesCache = newAliases
} }
@ -201,13 +206,10 @@ func (room *Room) updateNameFromNameEvent() {
func (room *Room) updateNameFromAliases() { func (room *Room) updateNameFromAliases() {
// TODO the spec says clients should not use m.room.aliases for room names. // TODO the spec says clients should not use m.room.aliases for room names.
// However, Riot also uses m.room.aliases, so this is here now. // However, Riot also uses m.room.aliases, so this is here now.
aliasEvents := room.GetStateEvents("m.room.aliases") aliases := room.GetAliases()
for _, event := range aliasEvents { if len(aliases) > 0 {
aliases, _ := event.Content["aliases"].([]interface{}) sort.Sort(sort.StringSlice(aliases))
if len(aliases) > 0 { room.nameCache = aliases[0]
room.nameCache, _ = aliases[0].(string)
break
}
} }
} }