fix(classroom): force using periodic uuid when exist (#1551)

netless-io · Jun 6, 2022 · 1817304 · 1817304
1 parent e751bbe
commit 1817304
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/desktop/renderer-app/src/pages/utils/join-room-handler.ts b/desktop/renderer-app/src/pages/utils/join-room-handler.ts
@@ -11,7 +11,8 @@ export const joinRoomHandler = async (
     try {
         const formatRoomUUID = roomUUID.replace(/\s+/g, "");
         const roomInfo = roomStore.rooms.get(formatRoomUUID);
-        const data = await roomStore.joinRoom(formatRoomUUID);
+        const periodicUUID = roomInfo?.periodicUUID;
+        const data = await roomStore.joinRoom(periodicUUID || formatRoomUUID);
         globalStore.updateShowGuide(data.showGuide);
         globalStore.updatePeriodicUUID(roomInfo?.periodicUUID);
 

diff --git a/web/flat-web/src/pages/utils/join-room-handler.ts b/web/flat-web/src/pages/utils/join-room-handler.ts
@@ -11,7 +11,8 @@ export const joinRoomHandler = async (
     try {
         const formatRoomUUID = roomUUID.replace(/\s+/g, "");
         const roomInfo = roomStore.rooms.get(formatRoomUUID);
-        const data = await roomStore.joinRoom(formatRoomUUID);
+        const periodicUUID = roomInfo?.periodicUUID;
+        const data = await roomStore.joinRoom(periodicUUID || formatRoomUUID);
         globalStore.updateShowGuide(data.showGuide);
         globalStore.updatePeriodicUUID(roomInfo?.periodicUUID);
         // try to work around chrome does not show permission popup after