Remove no-text rooms, highlight active room, fix custom voice room icons

src/app/core/state.ts

@@ -568,11 +568,19 @@ export const chatSearch = derived(throttled(800, chatsById), $chatsByPubkey => {
 
 // Rooms
 
+export enum RoomType {
+  Text = "text",
+  Voice = "voice",
+}
+
 export type Room = PublishedRoomMeta & {
   id: string
   url: string
 }
 
+export const getRoomType = (room: {livekit?: boolean}): RoomType =>
+  room.livekit ? RoomType.Voice : RoomType.Text
+
 export const makeRoomId = (url: string, h: string) => `${url}'${h}`
 
 export const splitRoomId = (id: string) => id.split("'")
@@ -664,7 +672,7 @@ export const displayRoom = (url: string, h: string) => getRoom(makeRoomId(url, h
 
 export const roomComparator = (url: string) => (h: string) => displayRoom(url, h).toLowerCase()
 
-export const deriveRoomsWithLivekit = (url: string) =>
+export const deriveVoiceRooms = (url: string) =>
   derived(roomsById, $roomsById => {
     const set = new Set<string>()
     for (const room of $roomsById.values()) {
@@ -687,20 +695,17 @@ export const deriveRoomsNoText = (url: string) =>
   })
 
 export const deriveOtherVoiceRooms = (url: string) =>
-  derived(
-    [deriveRoomsWithLivekit(url), deriveUserRooms(url)],
-    ([$roomsWithLivekit, $userRooms]) => {
-      const rooms: string[] = []
+  derived([deriveVoiceRooms(url), deriveUserRooms(url)], ([$roomsWithLivekit, $userRooms]) => {
+    const rooms: string[] = []
 
-      for (const h of $roomsWithLivekit) {
-        if (!$userRooms.includes(h)) {
-          rooms.push(h)
-        }
+    for (const h of $roomsWithLivekit) {
+      if (!$userRooms.includes(h)) {
+        rooms.push(h)
       }
+    }
 
-      return sortBy(roomComparator(url), uniq(rooms))
-    },
-  )
+    return sortBy(roomComparator(url), uniq(rooms))
+  })
 
 // User space/room lists
 
@@ -792,12 +797,12 @@ export const deriveUserRooms = (url: string) =>
 
 export const deriveOtherRooms = (url: string) =>
   derived(
-    [deriveUserRooms(url), deriveRoomsNoText(url), roomsByUrl],
-    ([$userRooms, $roomsNoText, $roomsByUrl]) => {
+    [deriveUserRooms(url), deriveVoiceRooms(url), roomsByUrl],
+    ([$userRooms, voiceRooms, $roomsByUrl]) => {
       const rooms: string[] = []
 
       for (const {h} of $roomsByUrl.get(url) || []) {
-        if (!$userRooms.includes(h) && !$roomsNoText.has(h)) {
+        if (!$userRooms.includes(h) && !voiceRooms.has(h)) {
           rooms.push(h)
         }
       }