Ignore @ when working out room name sort positions

This commit is contained in:
Kegan Dougal 2021-11-02 18:05:38 +00:00
parent 31a51d0ed5
commit e6a3543ac1
2 changed files with 4 additions and 4 deletions

View File

@ -20,7 +20,7 @@
</div>
<div class="rightSide">
<div class="roomheading">
<img class="roomavatar" id="selectedroomavatar" src="/client/placeholder.svg"/>
<img class="roomavatar" decoding="async" id="selectedroomavatar" src="/client/placeholder.svg"/>
<span id="selectedroomname">Select a room</span>
<div id="selectedroomtopic">
@ -30,7 +30,7 @@
</div>
<template id="roomCellTemplate">
<div class="roomcell">
<img class="roomavatar" src="/client/placeholder.svg"/>
<img class="roomavatar" decoding="async" src="/client/placeholder.svg"/>
<div class="roominfo">
<span class="unreadcount"></span>
<span class="roomname"></span>

View File

@ -87,7 +87,7 @@ func (s *ConnState) load(req *Request) error {
rooms[i] = RoomConnMetadata{
RoomMetadata: metadata,
CanonicalisedName: strings.ToLower(
strings.Trim(internal.CalculateRoomName(&metadata, 5), "#!()):_"),
strings.Trim(internal.CalculateRoomName(&metadata, 5), "#!()):_@"),
),
HighlightCount: urd.HighlightCount,
NotificationCount: urd.NotificationCount,
@ -270,7 +270,7 @@ func (s *ConnState) processIncomingEvent(updateEvent *EventData) ([]Room, []Resp
newRoomConn := RoomConnMetadata{
RoomMetadata: *newRoom,
CanonicalisedName: strings.ToLower(
strings.Trim(internal.CalculateRoomName(newRoom, 5), "#!()):_"),
strings.Trim(internal.CalculateRoomName(newRoom, 5), "#!()):_@"),
),
}
s.sortedJoinedRooms = append(s.sortedJoinedRooms, newRoomConn)