separate WorldReadableRoomViewModel out of UnknownRoomViewModel

Author: ashfame

src/domain/session/SessionViewModel.js

@@ -18,6 +18,7 @@ limitations under the License.
 import {LeftPanelViewModel} from "./leftpanel/LeftPanelViewModel.js";
 import {RoomViewModel} from "./room/RoomViewModel.js";
 import {UnknownRoomViewModel} from "./room/UnknownRoomViewModel.js";
+import {WorldReadableRoomViewModel} from "./room/WorldReadableRoomViewModel.js";
 import {InviteViewModel} from "./room/InviteViewModel.js";
 import {RoomBeingCreatedViewModel} from "./room/RoomBeingCreatedViewModel.js";
 import {LightboxViewModel} from "./room/LightboxViewModel.js";
@@ -231,18 +232,19 @@ export class SessionViewModel extends ViewModel {
         return null;
     }
 
-    async _createUnknownRoomViewModel(roomIdOrAlias) {
-        const roomVM = new UnknownRoomViewModel(this.childOptions({
+    _createUnknownRoomViewModel(roomIdOrAlias) {
+        return new UnknownRoomViewModel(this.childOptions({
             roomIdOrAlias,
             session: this._client.session,
         }));
-        roomVM.load().then(() => {
-            if (roomVM.previewPossible) {
-                console.log('emitting middle');
-                this.emitChange("activeMiddleViewModel");
-                this.emitChange();
-            }
-        });
+    }
+
+    async _createWorldReadableRoomViewModel(roomIdOrAlias) {
+        const roomVM = new WorldReadableRoomViewModel(this.childOptions({
+            room: await this._client.session.loadWorldReadableRoom(roomIdOrAlias),
+            session: this._client.session,
+        }));
+        roomVM.load();
         return roomVM;
     }
 

src/domain/session/room/UnknownRoomViewModel.js

@@ -15,9 +15,6 @@ limitations under the License.
 */
 
 import {ViewModel} from "../../ViewModel";
-import {TimelineViewModel} from "./timeline/TimelineViewModel";
-import {tileClassForEntry as defaultTileClassForEntry} from "./timeline/tiles/index";
-import {getAvatarHttpUrl} from "../../avatar";
 
 export class UnknownRoomViewModel extends ViewModel {
     constructor(options) {
@@ -27,12 +24,6 @@ export class UnknownRoomViewModel extends ViewModel {
         this.roomIdOrAlias = roomIdOrAlias;
         this._error = null;
         this._busy = false;
-        this._worldReadable = false; // won't know until load() finishes with isWorldReadableRoom() call
-        this._checkingPreviewCapability = false; // won't know until load() finishes with isWorldReadableRoom() call
-    }
-
-    get room() {
-        return this._room;
     }
 
     get error() {
@@ -61,60 +52,7 @@ export class UnknownRoomViewModel extends ViewModel {
         return this._busy;
     }
 
-    // matrix.org can choose not to return messages for a world_readable room
-    // so this getter is used to render the correct view, if it's possible to preview the room right now
-    get previewPossible() {
-        return this._worldReadable && !! this._room;
-    }
-
-    get checkingPreviewCapability() {
-        return this._checkingPreviewCapability;
-    }
-
     get kind() {
-        return this._worldReadable ? "worldReadableRoom" : "unknown";
-    }
-
-    get timelineViewModel() {
-        return this._timelineVM;
-    }
-
-    avatarUrl(size) {
-        return getAvatarHttpUrl(this._room.avatarUrl, size, this.platform, this._room.mediaRepository);
-    }
-
-    async load() {
-        this._checkingPreviewCapability = true;
-        this._worldReadable = await this._session.isWorldReadableRoom(this.roomIdOrAlias);
-        this._checkingPreviewCapability = false;
-
-        if (!this._worldReadable) {
-            this.emitChange("checkingPreviewCapability");
-            return;
-        }
-
-        try {
-            this._room = await this._session.loadWorldReadableRoom(this.roomIdOrAlias);
-            const timeline = await this._room.openTimeline();
-            this._tileOptions = this.childOptions({
-                roomVM: this,
-                timeline,
-                tileClassForEntry: defaultTileClassForEntry,
-            });
-            this._timelineVM = this.track(new TimelineViewModel(this.childOptions({
-                tileOptions: this._tileOptions,
-                timeline,
-            })));
-            this.emitChange("timelineViewModel");
-        } catch (err) {
-            console.error(`room.openTimeline(): ${err.message}:\n${err.stack}`);
-            this._timelineError = err;
-            this.emitChange("error");
-        }
-    }
-
-    dispose() {
-        super.dispose();
-        void this._session.deleteWorldReadableRoomData(this.roomIdOrAlias);
+        return "unknown";
     }
 }

src/domain/session/room/WorldReadableRoomViewModel.js

@@ -0,0 +1,18 @@
+import {RoomViewModel} from "./RoomViewModel";
+
+export class WorldReadableRoomViewModel extends RoomViewModel {
+    constructor(options) {
+        options.room.isWorldReadable = true;
+        super(options);
+        this._session = options.session;
+    }
+
+    get kind() {
+        return "preview";
+    }
+
+    dispose() {
+        super.dispose();
+        void this._session.deleteWorldReadableRoomData(this.roomIdOrAlias);
+    }
+}

src/matrix/Session.js

@@ -668,7 +668,8 @@ export class Session {
             mediaRepository: this._mediaRepository,
             pendingEvents: [],
             user: this._user,
-            platform: this._platform
+            platform: this._platform,
+            roomStateHandler: this._roomStateHandler
         });
     }
 

src/platform/web/ui/session/SessionView.js

@@ -60,7 +60,7 @@ export class SessionView extends TemplateView {
                         return new RoomView(vm.currentRoomViewModel, viewClassForTile);
                     } else if (vm.currentRoomViewModel.kind === "roomBeingCreated") {
                         return new RoomBeingCreatedView(vm.currentRoomViewModel);
-                    } else if (vm.currentRoomViewModel.kind === "worldReadableRoom") {
+                    } else if (vm.currentRoomViewModel.kind === "preview") {
                         return new WorldReadableRoomView(vm.currentRoomViewModel);
                     } else {
                         return new UnknownRoomView(vm.currentRoomViewModel);