Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplifying code and making START_ROOM_URL compatible with public (_) and private (@) paths

Browse source
This commit is contained in:
David Négrier 2021-01-21 09:40:11 +01:00
parent d79a18ee81
commit bbf9325396
4 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
front/src/Connexion/ConnectionManager.ts
View file

@ -27,9 +27,9 @@ class ConnectionManager {
const organizationSlug = data.organizationSlug;
const worldSlug = data.worldSlug;
const roomSlug = data.roomSlug;
urlManager.editUrlForRoom(roomSlug, organizationSlug, worldSlug);
const room = new Room(window.location.pathname + window.location.hash);
const room = new Room('/@/'+organizationSlug+'/'+worldSlug+'/'+roomSlug + window.location.hash);
urlManager.pushRoomIdToUrl(room);
return Promise.resolve(room);
} else if (connexionType === GameConnexionTypes.organization || connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
const localUser = localUserStore.getLocalUser();
@ -48,11 +48,7 @@ class ConnectionManager {
}
let roomId: string
if (connexionType === GameConnexionTypes.empty) {
if (START_ROOM_URL.startsWith('http://') || START_ROOM_URL.startsWith('https://')) {
roomId = '/_/global/' + START_ROOM_URL.replace('http://', '').replace('https://', '');
} else {
roomId = urlManager.editUrlForRoom(START_ROOM_URL, null, null);
}
roomId = START_ROOM_URL;
} else {
roomId = window.location.pathname + window.location.hash;
}