From 5ad1b5cf5ac3edac01a8ad290a880573f0a1fd62 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Thu, 4 Jun 2020 12:58:28 -0700 Subject: [PATCH] Move metaverse server URL update: revert nearly all changes to Javascript scripts because the 'require' of the central definition file was not included. --- script-archive/avatarSelector.js | 2 +- script-archive/entityScripts/recordingEntityScript.js | 4 ++-- script-archive/lobby.js | 2 +- .../winterSmashUp/targetPractice/targetPracticeGame.js | 2 +- scripts/system/html/js/SnapshotReview.js | 2 +- server-console/src/main.js | 2 +- server-console/src/modules/hf-notifications.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/script-archive/avatarSelector.js b/script-archive/avatarSelector.js index 9dca3f6494..119044e35a 100644 --- a/script-archive/avatarSelector.js +++ b/script-archive/avatarSelector.js @@ -155,7 +155,7 @@ var avatars = {}; function changeLobbyTextures() { var req = new XMLHttpRequest(); - req.open("GET", URLs.METAVERSE_URL + "/api/v1/marketplace?category=head+%26+body&limit=21", false); + req.open("GET", "https://metaverse.highfidelity.com/api/v1/marketplace?category=head+%26+body&limit=21", false); req.send(); // Data returned is randomized. avatars = JSON.parse(req.responseText).data.items; diff --git a/script-archive/entityScripts/recordingEntityScript.js b/script-archive/entityScripts/recordingEntityScript.js index 4281fbc64e..3d1b6f46df 100644 --- a/script-archive/entityScripts/recordingEntityScript.js +++ b/script-archive/entityScripts/recordingEntityScript.js @@ -21,8 +21,8 @@ var START_MESSAGE = "recordingStarted"; var STOP_MESSAGE = "recordingEnded"; var PARTICIPATING_MESSAGE = "participatingToRecording"; - var RECORDING_ICON_URL = URLs.CDN_URL + "/alan/production/icons/ICO_rec-active.svg"; - var NOT_RECORDING_ICON_URL = URLs.CDN_URL + "/alan/production/icons/ICO_rec-inactive.svg"; + var RECORDING_ICON_URL = "http://cdn.highfidelity.com/alan/production/icons/ICO_rec-active.svg"; + var NOT_RECORDING_ICON_URL = "http://cdn.highfidelity.com/alan/production/icons/ICO_rec-inactive.svg"; var ICON_WIDTH = 60; var ICON_HEIGHT = 60; var overlay = null; diff --git a/script-archive/lobby.js b/script-archive/lobby.js index 54f3dc526e..7a06cdd906 100644 --- a/script-archive/lobby.js +++ b/script-archive/lobby.js @@ -153,7 +153,7 @@ var places = {}; function changeLobbyTextures() { var req = new XMLHttpRequest(); - req.open("GET", URLs.METAVERSE_URL + "/api/v1/places?limit=21", false); + req.open("GET", "https://metaverse.highfidelity.com/api/v1/places?limit=21", false); req.send(); places = JSON.parse(req.responseText).data.places; diff --git a/script-archive/winterSmashUp/targetPractice/targetPracticeGame.js b/script-archive/winterSmashUp/targetPractice/targetPracticeGame.js index 4e7f39821d..5e2612ded6 100644 --- a/script-archive/winterSmashUp/targetPractice/targetPracticeGame.js +++ b/script-archive/winterSmashUp/targetPractice/targetPracticeGame.js @@ -14,7 +14,7 @@ const GAME_CHANNEL = 'winterSmashUpGame'; const SCORE_POST_URL = 'https://script.google.com/macros/s/AKfycbwZAMx6cMBx6-8NGEhR8ELUA-dldtpa_4P55z38Q4vYHW6kneg/exec'; -const MODEL_URL = URLs.CDN_URL + '/chris/production/winter/game/'; +const MODEL_URL = 'http://cdn.highfidelity.com/chris/production/winter/game/'; const MAX_GAME_TIME = 120; //seconds const TARGET_CLOSE_OFFSET = 0.5; const MILLISECS_IN_SEC = 1000; diff --git a/scripts/system/html/js/SnapshotReview.js b/scripts/system/html/js/SnapshotReview.js index 71e468265f..1e8be9d644 100644 --- a/scripts/system/html/js/SnapshotReview.js +++ b/scripts/system/html/js/SnapshotReview.js @@ -440,7 +440,7 @@ function updateShareInfo(containerID, storyID) { } var shareBar = document.getElementById(containerID + "shareBar"), parentDiv = document.getElementById(containerID), - shareURL = URLs.METAVERSE_URL + "/user_stories/" + storyID, + shareURL = "https://highfidelity.com/user_stories/" + storyID, facebookButton = document.getElementById(containerID + "facebookButton"), twitterButton = document.getElementById(containerID + "twitterButton"); diff --git a/server-console/src/main.js b/server-console/src/main.js index f645d6af4c..d8d6fea4bf 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -56,7 +56,7 @@ const menuNotificationIcon = path.join(__dirname, '../resources/tray-menu-notifi const DELETE_LOG_FILES_OLDER_THAN_X_SECONDS = 60 * 60 * 24 * 7; // 7 Days const LOG_FILE_REGEX = /(domain-server|ac-monitor|ac)-.*-std(out|err).txt/; -const HOME_CONTENT_URL = URLs.CDN_URL + "/content-sets/home-tutorial-RC40.tar.gz"; +const HOME_CONTENT_URL = "http://cdn.highfidelity.com/content-sets/home-tutorial-RC40.tar.gz"; const buildInfo = GetBuildInfo(); diff --git a/server-console/src/modules/hf-notifications.js b/server-console/src/modules/hf-notifications.js index dfc07ed77c..1ddbd1d307 100644 --- a/server-console/src/modules/hf-notifications.js +++ b/server-console/src/modules/hf-notifications.js @@ -19,7 +19,7 @@ const MARKETPLACE_NOTIFICATION_POLL_TIME_MS = 600 * 1000; const OSX_CLICK_DELAY_TIMEOUT = 500; -const METAVERSE_SERVER_URL = process.env.HIFI_METAVERSE_URL ? process.env.HIFI_METAVERSE_URL : URLs.METAVERSE_URL +const METAVERSE_SERVER_URL= process.env.HIFI_METAVERSE_URL ? process.env.HIFI_METAVERSE_URL : 'https://metaverse.highfidelity.com' const STORIES_URL= '/api/v1/user_stories'; const USERS_URL= '/api/v1/users'; const ECONOMIC_ACTIVITY_URL= '/api/v1/commerce/history';