Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jun 6, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion desktop/renderer-app/src/pages/utils/join-room-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 2 additions & 1 deletion web/flat-web/src/pages/utils/join-room-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down