polfan-server-js-client 0.1.56 → 0.1.57

package/build/types/types/src/schemes/events/PermissionOverwritesUpdated.d.ts

@@ -0,0 +1,8 @@
+import { PermissionOverwritesValue } from "../PermissionOverwritesValue";
+import { ChatLocation } from "../ChatLocation";
+export interface PermissionOverwritesUpdated {
+    location: ChatLocation;
+    target: 'User' | 'Role';
+    targetId: string;
+    overwrites: PermissionOverwritesValue;
+}

package/build/types/types/src/schemes/events/RoleDeleted.d.ts

@@ -0,0 +1,4 @@
+export interface RoleDeleted {
+    id: string;
+    spaceId: string;
+}

package/build/types/types/src/schemes/events/RoleUpdated.d.ts

@@ -0,0 +1,5 @@
+import { Role } from "../Role";
+export interface RoleUpdated {
+    spaceId: string;
+    role: Role;
+}

package/build/types/types/src/schemes/events/RoomDeleted.d.ts

@@ -0,0 +1,3 @@
+export interface RoomDeleted {
+    id: string;
+}

package/build/types/types/src/schemes/events/RoomJoined.d.ts

@@ -0,0 +1,4 @@
+import { Room } from "../Room";
+export interface RoomJoined {
+    room: Room;
+}

package/build/types/types/src/schemes/events/RoomLeft.d.ts

@@ -0,0 +1,3 @@
+export interface RoomLeft {
+    id: string;
+}

package/build/types/types/src/schemes/events/RoomMemberJoined.d.ts

@@ -0,0 +1,5 @@
+import { RoomMember } from "../RoomMember";
+export interface RoomMemberJoined {
+    roomId: string;
+    member: RoomMember;
+}

package/build/types/types/src/schemes/events/RoomMemberLeft.d.ts

@@ -0,0 +1,4 @@
+export interface RoomMemberLeft {
+    roomId: string;
+    userId: string;
+}

package/build/types/types/src/schemes/events/RoomMemberUpdated.d.ts

@@ -0,0 +1,6 @@
+import { RoomMember } from "../RoomMember";
+export interface RoomMemberUpdated {
+    roomId: string;
+    userId: string;
+    member: RoomMember;
+}

package/build/types/types/src/schemes/events/RoomMembers.d.ts

@@ -0,0 +1,5 @@
+import { RoomMember } from "../RoomMember";
+export interface RoomMembers {
+    id: string;
+    members: RoomMember[];
+}

package/build/types/types/src/schemes/events/RoomUpdated.d.ts

@@ -0,0 +1,4 @@
+import { Room } from "../Room";
+export interface RoomUpdated {
+    room: Room;
+}

package/build/types/types/src/schemes/events/Session.d.ts

@@ -0,0 +1,7 @@
+import { UserState } from "../UserState";
+import { User } from "../User";
+export interface Session {
+    serverVersion: string;
+    state: UserState;
+    user: User;
+}

package/build/types/types/src/schemes/events/SpaceDeleted.d.ts

@@ -0,0 +1,3 @@
+export interface SpaceDeleted {
+    id: string;
+}

package/build/types/types/src/schemes/events/SpaceJoined.d.ts

@@ -0,0 +1,4 @@
+import { Space } from "../Space";
+export interface SpaceJoined {
+    space: Space;
+}

package/build/types/types/src/schemes/events/SpaceLeft.d.ts

@@ -0,0 +1,3 @@
+export interface SpaceLeft {
+    id: string;
+}

package/build/types/types/src/schemes/events/SpaceMemberJoined.d.ts

@@ -0,0 +1,5 @@
+import { SpaceMember } from "../SpaceMember";
+export interface SpaceMemberJoined {
+    spaceId: string;
+    member: SpaceMember;
+}

package/build/types/types/src/schemes/events/SpaceMemberLeft.d.ts

@@ -0,0 +1,4 @@
+export interface SpaceMemberLeft {
+    spaceId: string;
+    userId: string;
+}

package/build/types/types/src/schemes/events/SpaceMemberUpdated.d.ts

@@ -0,0 +1,6 @@
+import { SpaceMember } from "../SpaceMember";
+export interface SpaceMemberUpdated {
+    spaceId: string;
+    userId: string;
+    member: SpaceMember;
+}

package/build/types/types/src/schemes/events/SpaceMembers.d.ts

@@ -0,0 +1,5 @@
+import { SpaceMember } from "../SpaceMember";
+export interface SpaceMembers {
+    id: string;
+    members: SpaceMember[];
+}

package/build/types/types/src/schemes/events/SpaceRooms.d.ts

@@ -0,0 +1,5 @@
+import { RoomSummary } from "../RoomSummary";
+export interface SpaceRooms {
+    id: string;
+    summaries: RoomSummary[];
+}

package/build/types/types/src/schemes/events/SpaceUpdated.d.ts

@@ -0,0 +1,4 @@
+import { Space } from "../Space";
+export interface SpaceUpdated {
+    space: Space;
+}

package/build/types/types/src/schemes/events/TopicDeleted.d.ts

@@ -0,0 +1,4 @@
+import { ChatLocation } from "../ChatLocation";
+export interface TopicDeleted {
+    location: ChatLocation;
+}

package/build/types/types/src/schemes/events/UserUpdated.d.ts

@@ -0,0 +1,4 @@
+import { User } from "../User";
+export interface UserUpdated {
+    user: User;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polfan-server-js-client",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "description": "JavaScript client library for handling communication with Polfan chat server.",
   "author": "Jarosław Żak",
   "license": "MIT",
@@ -35,14 +35,13 @@
     "html-webpack-plugin": "^5.5.0",
     "jest": "^29.3.1",
     "mini-css-extract-plugin": "^2.7.2",
-    "pserv-ts-types": "^0.0.30",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.5",
+    "ts-node": "^10.9.2",
     "typescript": "^4.9.4",
     "url-loader": "^4.1.1",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "4.11.1",
-    "ts-node": "^10.9.2"
+    "webpack-dev-server": "4.11.1"
   }
 }

package/src/AbstractChatClient.ts

@@ -62,8 +62,8 @@ import {
     Owners,
     Ok,
     GetOwners,
-    CreateOwner,
-} from "pserv-ts-types";
+    CreateOwner, RoleDeleted,
+} from "./types/src/index";
 import {EventTarget} from "./EventTarget";
 
 type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
@@ -146,7 +146,7 @@ export type EventsMap = {
     SpaceMembers: SpaceMembers,
     SpaceRooms: SpaceRooms,
     NewRole: NewRole,
-    RoleDeleted: RoomDeleted,
+    RoleDeleted: RoleDeleted,
     RoleUpdated: RoleUpdated,
     // Room events
     RoomJoined: RoomJoined,

package/src/WebApiChatClient.ts

@@ -1,6 +1,6 @@
 import {AbstractChatClient, CommandResult, CommandsMap} from "./AbstractChatClient";
 import {ObservableInterface} from "./EventTarget";
-import {Envelope} from "pserv-ts-types";
+import {Envelope} from "./types/src";
 
 export interface WebApiChatClientOptions {
     url: string;

package/src/WebSocketChatClient.ts

@@ -1,7 +1,7 @@
 import {ObservableInterface} from "./EventTarget";
 import {AbstractChatClient, CommandResult, CommandsMap} from "./AbstractChatClient";
-import {Envelope} from "pserv-ts-types";
 import {ChatStateTracker} from "./state-tracker/ChatStateTracker";
+import {Envelope} from "./types/src";
 
 export interface WebSocketClientOptions {
     url: string;

package/src/index.ts

@@ -8,11 +8,14 @@ import {
 } from "./IndexedObjectCollection";
 import { AuthClient } from "./AuthClient";
 import { Permissions, PermissionDefinition, Layer } from "./Permissions";
+import * as ChatTypes from './types/src';
 
 export {
     IndexedCollection, ObservableIndexedCollection,
     IndexedObjectCollection, ObservableIndexedObjectCollection,
     Permissions, PermissionDefinition, Layer,
     WebSocketChatClient, WebApiChatClient,
-    AuthClient
-};
+    AuthClient,
+};
+
+export type {ChatTypes};

package/src/state-tracker/ChatStateTracker.ts

@@ -1,11 +1,15 @@
 import {WebSocketChatClient} from "../WebSocketChatClient";
-import {Session, User} from "pserv-ts-types";
+import {Session, User} from "../types/src";
 import {RoomsManager} from "./RoomsManager";
 import {SpacesManager} from "./SpacesManager";
 import {PermissionsManager} from "./PermissionsManager";
 import {DeferredTask} from "./AsyncUtils";
 
 export class ChatStateTracker {
+    /**
+     * State of your permissions.
+     */
+    public readonly permissions = new PermissionsManager(this);
     /**
      * State of the rooms you are in.
      */
@@ -14,10 +18,6 @@ export class ChatStateTracker {
      * State of the spaces you are in.
      */
     public readonly spaces = new SpacesManager(this);
-    /**
-     * State of your permissions.
-     */
-    public readonly permissions = new PermissionsManager(this);
 
     private _me: User = null;
     private readonly deferredSession = new DeferredTask();

package/src/state-tracker/MessagesManager.ts

@@ -1,11 +1,11 @@
 import {ChatStateTracker} from "./ChatStateTracker";
-import {AckReport, AckReports, Message, NewMessage, Topic} from "pserv-ts-types";
+import {AckReport, AckReports, ChatLocation, Message, NewMessage, Topic} from "../types/src";
 import {
     IndexedCollection,
     ObservableIndexedObjectCollection
 } from "../IndexedObjectCollection";
 
-export const getCombinedId = (...ids: string[]) => ids.join('_');
+export const getCombinedId = (location: ChatLocation) => Object.values(location).filter(v => v).join('_');
 
 export class MessagesManager {
     // Temporary not lazy loaded; server must implement GetTopicMessages command.
@@ -20,8 +20,8 @@ export class MessagesManager {
     /**
      * Get collection of the messages written in topic.
      */
-    public async get(roomId: string, topicId: string): Promise<ObservableIndexedObjectCollection<Message> | undefined> {
-        return this.list.get(getCombinedId(roomId, topicId));
+    public async get(location: ChatLocation): Promise<ObservableIndexedObjectCollection<Message> | undefined> {
+        return this.list.get(getCombinedId(location));
     }
 
     /**
@@ -39,7 +39,7 @@ export class MessagesManager {
 
         if (missingRoomIds.length) {
             // If we don't have ack reports for all rooms in space, fetch them
-            const result = await this.tracker.client.send('GetAckReports', {spaceId});
+            const result = await this.tracker.client.send('GetAckReports', {location: {spaceId}});
 
             if (result.error) {
                 throw result.error;
@@ -64,7 +64,7 @@ export class MessagesManager {
         }
 
         if (! this.acks.has(roomId)) {
-            const result = await this.tracker.client.send('GetAckReports', {roomId});
+            const result = await this.tracker.client.send('GetAckReports', {location: {roomId}});
 
             if (result.error) {
                 throw result.error;
@@ -81,7 +81,7 @@ export class MessagesManager {
      * @internal
      */
     public _deleteByTopicIds(roomId: string, ...topicIds: string[]): void {
-        this.list.delete(...topicIds.map(topicId => getCombinedId(roomId, topicId)));
+        this.list.delete(...topicIds.map(topicId => getCombinedId({roomId, topicId})));
         this.acks.get(roomId)?.delete(...topicIds);
     }
 
@@ -91,14 +91,14 @@ export class MessagesManager {
      */
     public _handleNewTopics(roomId: string, ...topics: Topic[]): void {
         this.list.set(...topics.map<[string, ObservableIndexedObjectCollection<Message>]>(topic => [
-            getCombinedId(roomId, topic.id),
+            getCombinedId({roomId, topicId: topic.id}),
             new ObservableIndexedObjectCollection<Message>('id'),
         ]));
         this.createAckReportsForNewTopics(roomId, topics);
     }
 
     private handleNewMessage(ev: NewMessage): void {
-        this.list.get(getCombinedId(ev.roomId, ev.topicId)).set(ev.message);
+        this.list.get(getCombinedId(ev.location)).set(ev.message);
         this.updateLocallyAckReportOnNewMessage(ev);
     }
 
@@ -127,7 +127,7 @@ export class MessagesManager {
     }
 
     private updateLocallyAckReportOnNewMessage(ev: NewMessage): void {
-        const ackReports = this.acks.get(ev.roomId);
+        const ackReports = this.acks.get(ev.location.roomId);
 
         if (! ackReports) {
             // If we don't follow ack reports for this room, skip
@@ -135,7 +135,7 @@ export class MessagesManager {
         }
 
         const isMe = ev.message.author.id === this.tracker.me?.id;
-        const currentAckReport = ackReports.get(ev.topicId);
+        const currentAckReport = ackReports.get(ev.location.topicId);
         let update: Partial<AckReport>;
 
         if (isMe) {

package/src/state-tracker/PermissionsManager.ts

@@ -1,5 +1,6 @@
 import {ChatStateTracker} from "./ChatStateTracker";
 import {
+    ChatLocation,
     PermissionOverwrites,
     PermissionOverwritesUpdated,
     PermissionOverwritesValue,
@@ -10,21 +11,20 @@ import {
     SpaceLeft, SpaceMember,
     SpaceMemberUpdated,
     TopicDeleted,
-} from "pserv-ts-types";
+} from "../types/src";
 import {EventHandler, EventTarget} from "../EventTarget";
 import {IndexedCollection} from "../IndexedObjectCollection";
 import {Permissions} from "../Permissions";
 import {PromiseRegistry} from "./AsyncUtils";
 
 const getOvId = (
-    layer: PermissionOverwrites['layer'],
-    layerId: PermissionOverwrites['layerId'],
+    location: ChatLocation,
     target?: PermissionOverwrites['target'],
     targetId?: PermissionOverwrites['targetId'],
-) => layer + (layerId ?? '') + (target ?? '') + (targetId ?? '');
+) => (location.spaceId ?? '') + (location.roomId ?? '') + (location.topicId ?? '') + (target ?? '') + (targetId ?? '');
 
 const getOvIdByObject = (overwrites: PermissionOverwrites | PermissionOverwritesUpdated): string => getOvId(
-    overwrites.layer, overwrites.layerId, overwrites.target, overwrites.targetId
+    overwrites.location, overwrites.target, overwrites.targetId
 );
 
 interface CheckPermissionsResult {
@@ -56,18 +56,19 @@ export class PermissionsManager extends EventTarget {
     }
 
     public async getOverwrites(
-        layer: PermissionOverwrites['layer'],
-        layerId: PermissionOverwrites['layerId'],
+        location: ChatLocation,
         target: PermissionOverwrites['target'],
         targetId: PermissionOverwrites['targetId'],
     ): Promise<PermissionOverwrites | undefined> {
-        const id = getOvId(layer, layerId, target, targetId);
+        this.validateLocation(location);
+
+        const id = getOvId(location, target, targetId);
 
         if (this.overwritesPromises.notExist(id)) {
             this.overwritesPromises.registerByFunction(async () => {
                 const result = await this.tracker.client.send(
                     'GetPermissionOverwrites',
-                    {layer, layerId, target, targetId},
+                    {location, target, targetId},
                 );
                 if (result.error) {
                     throw result.error;
@@ -86,15 +87,13 @@ export class PermissionsManager extends EventTarget {
 
     public async check(
         permissionNames: (keyof typeof Permissions.list)[],
-        spaceId?: string,
-        roomId?: string,
-        topicId?: string,
+        location: ChatLocation,
     ): Promise<CheckPermissionsResult> {
         if (! permissionNames.length) {
             throw new Error('Permission names array cannot be empty');
         }
 
-        const ownedPermissions = await this.calculatePermissions(spaceId, roomId, topicId);
+        const ownedPermissions = await this.calculatePermissions(location);
         const missing: string[] = [];
 
         permissionNames.forEach(name => {
@@ -111,44 +110,36 @@ export class PermissionsManager extends EventTarget {
         };
     }
 
-    public async calculatePermissions(spaceId?: string, roomId?: string, topicId?: string): Promise<number> {
-        if (topicId && ! roomId || roomId && ! spaceId) {
-            throw new Error('Corrupted arguments hierarchy');
-        }
+    public async calculatePermissions(location: ChatLocation): Promise<number> {
+        this.validateLocation(location);
 
         const userId = (await this.tracker.getMe()).id;
-        const [spaceMember, roomMember] = await this.fetchMembersOrFail(spaceId, roomId);
+        const [spaceMember, roomMember] = await this.fetchMembersOrFail(location);
         const userRoles: string[] = [...(spaceMember?.roles ?? []), ...(roomMember?.roles ?? [])];
-        const [spaces, rooms, topics] = await Promise.all([
-            this.tracker.spaces.get(),
-            this.tracker.rooms.get(),
-            roomId ? this.tracker.rooms.getTopics(roomId) : null,
-        ]);
-
         const promises: Promise<PermissionOverwritesValue>[] = [
             // Global user overwrites
-            this.getOverwrites('Global', null, 'User', userId).then(v => v.overwrites),
+            this.getOverwrites({}, 'User', userId).then(v => v.overwrites),
         ];
 
-        if (spaceId && spaces.has(spaceId)) {
-            promises.push(this.collectRoleOverwrites(spaceId, 'Space', spaceId, userRoles));
-            promises.push(this.getOverwrites('Space', spaceId, 'User', userId).then(v => v.overwrites));
+        if (location.spaceId && (await this.tracker.spaces.get())?.has(location.spaceId)) {
+            const filterLocation: ChatLocation = {spaceId: location.spaceId};
+            promises.push(this.collectRoleOverwrites(filterLocation, userRoles));
+            promises.push(this.getOverwrites(filterLocation, 'User', userId).then(v => v.overwrites));
         }
 
-        if (roomId && rooms.has(roomId)) {
+        if (location.roomId && (await this.tracker.rooms.get())?.has(location.roomId)) {
+            const filterLocation: ChatLocation = {spaceId: location.spaceId, roomId: location.roomId};
             if (userRoles.length) {
-                promises.push(this.collectRoleOverwrites(spaceId, 'Room', roomId, userRoles));
+                promises.push(this.collectRoleOverwrites(filterLocation, userRoles));
             }
-
-            promises.push(this.getOverwrites('Room', roomId, 'User', userId).then(v => v.overwrites));
+            promises.push(this.getOverwrites(filterLocation, 'User', userId).then(v => v.overwrites));
         }
 
-        if (topicId && topics && topics.has(topicId)) {
+        if (location.topicId && (await this.tracker.rooms.getTopics(location.roomId))?.has(location.topicId)) {
             if (userRoles.length) {
-                promises.push(this.collectRoleOverwrites(spaceId, 'Topic', topicId, userRoles));
+                promises.push(this.collectRoleOverwrites(location, userRoles));
             }
-
-            promises.push(this.getOverwrites('Topic', topicId, 'User', userId).then(v => v.overwrites));
+            promises.push(this.getOverwrites(location, 'User', userId).then(v => v.overwrites));
         }
 
         return this.resolveOverwritesHierarchy(await Promise.all(promises));
@@ -160,22 +151,25 @@ export class PermissionsManager extends EventTarget {
     }
 
     private handleSpaceDeleted(ev: SpaceDeleted | SpaceLeft): void {
-        const ids = this.deleteOverwritesByIdPrefix(getOvId('Space', ev.id));
+        const ids = this.deleteOverwritesByIdPrefix(getOvId({spaceId: ev.id}));
         this.overwritesPromises.forget(...ids);
     }
 
-    private handleRoomDeleted(ev: RoomDeleted | RoomLeft): void {
-        const ids = this.deleteOverwritesByIdPrefix(getOvId('Room', ev.id));
-        this.overwritesPromises.forget(...ids);
+    private async handleRoomDeleted(ev: RoomDeleted | RoomLeft): Promise<void> {
+        const room = (await this.tracker.rooms.get()).get(ev.id);
+        if (room) {
+            const ids = this.deleteOverwritesByIdPrefix(getOvId({spaceId: room.spaceId, roomId: room.id}));
+            this.overwritesPromises.forget(...ids);
+        }
     }
 
     private handleTopicDeleted(ev: TopicDeleted): void {
-        const ids = this.deleteOverwritesByIdPrefix(getOvId('Topic', ev.id));
+        const ids = this.deleteOverwritesByIdPrefix(getOvId(ev.location));
         this.overwritesPromises.forget(...ids);
     }
 
     private handleRoleDeleted(ev: RoleDeleted): void {
-        const ids = this.deleteOverwritesByIdPrefix(getOvId('Space', ev.spaceId, 'Role', ev.id));
+        const ids = this.deleteOverwritesByIdPrefix(getOvId({spaceId: ev.spaceId}, 'Role', ev.id));
         this.overwritesPromises.forget(...ids);
     }
 
@@ -209,16 +203,14 @@ export class PermissionsManager extends EventTarget {
     }
 
     private async collectRoleOverwrites(
-        spaceId: string,
-        layer: PermissionOverwrites['layer'],
-        layerId: PermissionOverwrites['layerId'],
+        location: ChatLocation,
         userRoles: string[],
     ): Promise<PermissionOverwritesValue> {
         const roleOverwrites = await Promise.all(userRoles.map(
-            roleId => this.getOverwrites(layer, layerId, 'Role', roleId)
+            roleId => this.getOverwrites(location, 'Role', roleId)
         ));
 
-        return this.resolveOverwritesFromRolesByOrder(spaceId, roleOverwrites);
+        return this.resolveOverwritesFromRolesByOrder(location.spaceId, roleOverwrites);
     }
 
     private async resolveOverwritesFromRolesByOrder(
@@ -289,20 +281,26 @@ export class PermissionsManager extends EventTarget {
         return result;
     }
 
-    private async fetchMembersOrFail(spaceId?: string, roomId?: string): Promise<[SpaceMember | null, RoomMember | null]> {
+    private async fetchMembersOrFail(location: ChatLocation): Promise<[SpaceMember | null, RoomMember | null]> {
         const results = await Promise.all([
-            spaceId ? this.tracker.spaces.getMe(spaceId) : null,
-            roomId ? this.tracker.rooms.getMe(roomId) : null,
+            location.spaceId ? this.tracker.spaces.getMe(location.spaceId) : null,
+            location.roomId ? this.tracker.rooms.getMe(location.roomId) : null,
         ]);
 
-        const spaceFail = spaceId && ! results[0];
-        const roomFail = roomId && ! results[1];
+        const spaceFail = location.spaceId && ! results[0];
+        const roomFail = location.roomId && ! results[1];
 
         if (spaceFail || roomFail) {
-            const layer = spaceFail ? `space (${spaceId})` : `room (${roomId})`;
+            const layer = spaceFail ? `space (${location.spaceId})` : `room (${location.roomId})`;
             throw new Error(`Attempting to calculate permissions for a ${layer} that the user does not belong to`);
         }
 
         return results;
     }
+
+    private validateLocation(location: ChatLocation): void {
+        if (location.topicId && ! location.roomId || ! location.spaceId && ! location.roomId && ! location.topicId) {
+            throw new Error('Corrupted arguments hierarchy');
+        }
+    }
 }

package/src/state-tracker/RoomsManager.ts

@@ -9,7 +9,7 @@ import {
     Topic,
     TopicDeleted,
     UserUpdated,
-} from "pserv-ts-types";
+} from "../types/src";
 import {ChatStateTracker} from "./ChatStateTracker";
 import {DeferredTask, PromiseRegistry} from "./AsyncUtils";
 import {MessagesManager} from "./MessagesManager";
@@ -163,14 +163,17 @@ export class RoomsManager {
     }
 
     private handleTopicDeleted(ev: TopicDeleted): void {
-        const collection = this.topics.get(ev.roomId);
-        collection.delete(ev.id);
-        this.list.get(ev.roomId).topics = collection.items;
+        const collection = this.topics.get(ev.location.roomId);
+        collection.delete(ev.location.topicId);
+
+        const room = this.list.get(ev.location.roomId);
+        if (room.defaultTopic?.id === ev.location.topicId) {
+            this.list.set({...room, defaultTopic: null});
+        }
     }
 
     private handleNewTopic(ev: NewTopic): void {
         this.addJoinedRoomTopics(ev.roomId, ev.topic);
-        this.list.get(ev.roomId).topics.push(ev.topic);
     }
 
     private addJoinedRoomTopics(roomId: string, ...topics: Topic[]): void {
@@ -201,7 +204,9 @@ export class RoomsManager {
 
     private addJoinedRooms(...rooms: Room[]): void {
         for (const room of rooms) {
-            this.addJoinedRoomTopics(room.id, ...room.topics);
+            if (room.defaultTopic) {
+                this.addJoinedRoomTopics(room.id, room.defaultTopic);
+            }
         }
         this.list.set(...rooms);
     }