From 954d39bb0c162a075a6cc2ad7e2ef8c62a96b679 Mon Sep 17 00:00:00 2001 From: jonny Date: Sun, 9 Jan 2022 13:51:44 +0100 Subject: [PATCH 1/4] always set hash --- front/src/Connexion/Room.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts index 74dd06de..0f7f9d18 100644 --- a/front/src/Connexion/Room.ts +++ b/front/src/Connexion/Room.ts @@ -9,7 +9,7 @@ import { isMapDetailsData } from "../Messages/JsonMessages/MapDetailsData"; import { isRoomRedirect } from "../Messages/JsonMessages/RoomRedirect"; export class MapDetail { - constructor(public readonly mapUrl: string, public readonly textures: CharacterTexture[] | undefined) {} + constructor(public readonly mapUrl: string, public readonly textures: CharacterTexture[] | undefined) { } } export interface RoomRedirect { @@ -91,9 +91,9 @@ export class Room { } baseUrl.pathname = "/_/" + instance + "/" + absoluteExitSceneUrl.host + absoluteExitSceneUrl.pathname; - if (absoluteExitSceneUrl.hash) { - baseUrl.hash = absoluteExitSceneUrl.hash; - } + + baseUrl.hash = absoluteExitSceneUrl.hash; + return baseUrl; } From e5afac1df54560ce964b6128a70bb546c356367e Mon Sep 17 00:00:00 2001 From: jonny Date: Sun, 9 Jan 2022 23:17:17 +0100 Subject: [PATCH 2/4] prettier fix --- front/src/Connexion/Room.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts index 0f7f9d18..8e151e76 100644 --- a/front/src/Connexion/Room.ts +++ b/front/src/Connexion/Room.ts @@ -91,7 +91,6 @@ export class Room { } baseUrl.pathname = "/_/" + instance + "/" + absoluteExitSceneUrl.host + absoluteExitSceneUrl.pathname; - baseUrl.hash = absoluteExitSceneUrl.hash; From 73ab4f3a260554f4ee105a0c8639ab24cab4c0b5 Mon Sep 17 00:00:00 2001 From: jonny Date: Sun, 9 Jan 2022 23:18:38 +0100 Subject: [PATCH 3/4] prettier fix --- front/src/Connexion/Room.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts index 8e151e76..0f7f9d18 100644 --- a/front/src/Connexion/Room.ts +++ b/front/src/Connexion/Room.ts @@ -91,6 +91,7 @@ export class Room { } baseUrl.pathname = "/_/" + instance + "/" + absoluteExitSceneUrl.host + absoluteExitSceneUrl.pathname; + baseUrl.hash = absoluteExitSceneUrl.hash; From 786448a2b2f41648988e634df78cbed8d59acc95 Mon Sep 17 00:00:00 2001 From: jonny Date: Sun, 9 Jan 2022 23:21:07 +0100 Subject: [PATCH 4/4] prettier fix --- front/src/Connexion/Room.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts index 0f7f9d18..213c3019 100644 --- a/front/src/Connexion/Room.ts +++ b/front/src/Connexion/Room.ts @@ -9,7 +9,7 @@ import { isMapDetailsData } from "../Messages/JsonMessages/MapDetailsData"; import { isRoomRedirect } from "../Messages/JsonMessages/RoomRedirect"; export class MapDetail { - constructor(public readonly mapUrl: string, public readonly textures: CharacterTexture[] | undefined) { } + constructor(public readonly mapUrl: string, public readonly textures: CharacterTexture[] | undefined) {} } export interface RoomRedirect { @@ -91,10 +91,8 @@ export class Room { } baseUrl.pathname = "/_/" + instance + "/" + absoluteExitSceneUrl.host + absoluteExitSceneUrl.pathname; - baseUrl.hash = absoluteExitSceneUrl.hash; - return baseUrl; }