diff options
| -rw-r--r-- | ui/room-list.go | 8 | ||||
| -rw-r--r-- | ui/tag-room-list.go | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ui/room-list.go b/ui/room-list.go index b9ee7f6..df986fe 100644 --- a/ui/room-list.go +++ b/ui/room-list.go @@ -91,7 +91,7 @@ func NewRoomList(parent *MainView) *RoomList { parent: parent, items: make(map[string]*TagRoomList), - tags: []string{"m.favourite", "net.maunium.gomuks.fake.direct", "", "m.lowpriority"}, + tags: []string{}, scrollOffset: 0, @@ -135,7 +135,7 @@ func (list *RoomList) checkTag(tag string) { trl, ok := list.items[tag] if ok && trl.IsEmpty() { - //delete(list.items, tag) + delete(list.items, tag) ok = false } @@ -221,7 +221,7 @@ func (list *RoomList) Clear() { list.Lock() defer list.Unlock() list.items = make(map[string]*TagRoomList) - list.tags = []string{"m.favourite", "net.maunium.gomuks.fake.direct", "", "m.lowpriority"} + list.tags = []string{} for _, tag := range list.tags { list.items[tag] = NewTagRoomList(list, tag) } @@ -533,7 +533,7 @@ func (list *RoomList) clickRoom(line, column int, mod bool) bool { return false } -var nsRegex = regexp.MustCompile("^[a-z]\\.[a-z](?:\\.[a-z])*$") +var nsRegex = regexp.MustCompile("^[a-z]+\\.[a-z]+(?:\\.[a-z]+)*$") func (list *RoomList) GetTagDisplayName(tag string) string { switch { diff --git a/ui/tag-room-list.go b/ui/tag-room-list.go index ca24d4e..3bea033 100644 --- a/ui/tag-room-list.go +++ b/ui/tag-room-list.go @@ -170,7 +170,10 @@ func almostEqual(a, b float64) bool { // ShouldBeAfter returns if the first room should be after the second room in the room list. // The manual order and last received message timestamp are considered. func (trl *TagRoomList) ShouldBeAfter(room1 *OrderedRoom, room2 *OrderedRoom) bool { - return room1.order > room2.order || (almostEqual(room1.order, room2.order) && room2.LastReceivedMessage.After(room1.LastReceivedMessage)) + // Lower order value = higher in list + return room1.order > room2.order || + // Equal order value and more recent message = higher in the list + (almostEqual(room1.order, room2.order) && room2.LastReceivedMessage.After(room1.LastReceivedMessage)) } func (trl *TagRoomList) Insert(order json.Number, mxRoom *rooms.Room) { |