Merge pull request #6167 from mozilla/remove_console_log

Fix hubs room regex
Hubs-Foundation · Jul 17, 2023 · 4abb59a · 4abb59a
2 parents d52bd00 + 9c9e2f5
commit 4abb59a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/components/media-loader.js b/src/components/media-loader.js
@@ -374,8 +374,6 @@ AFRAME.registerComponent("media-loader", {
         !src.match(hubsRoomRegex)?.groups.id &&
         !src.match(localHubsRoomRegex)?.groups.id;
 
-      console.log("IS LOCAL ASSET?", isLocalAsset, src);
-
       if (this.data.resolve && !src.startsWith("data:") && !src.startsWith("hubs:") && !isLocalAsset) {
         const is360 = !!(this.data.mediaOptions.projection && this.data.mediaOptions.projection.startsWith("360"));
         const quality = getDefaultResolveQuality(is360);

diff --git a/src/utils/media-url-utils.js b/src/utils/media-url-utils.js
@@ -201,7 +201,7 @@ export const isHubsRoomUrl = async url =>
   (await isHubsServer(url)) &&
   !(await isHubsAvatarUrl(url)) &&
   !(await isHubsSceneUrl(url)) &&
-  !url.match(hubsRoomRegex)?.groups.id;
+  ((await url.match(hubsRoomRegex)?.groups.id) || (await url.match(localHubsRoomRegex)?.groups.id));
 
 export const isHubsDestinationUrl = async url =>
   (await isHubsServer(url)) && ((await isHubsSceneUrl(url)) || (await isHubsRoomUrl(url)));