Make default scene URL configurable

Hubs-Foundation · Jul 23, 2019 · 5c11606 · 5c11606
1 parent 79e958c
commit 5c11606
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/.env.defaults b/.env.defaults
@@ -37,3 +37,6 @@ STATSD_PREFIX=discordbot.
 
 # True if verbose (e.g. per-message) logging should be enabled.
 VERBOSE=false
+
+# If set, Hubs rooms created by the bot with no scene specified will use this scene/GLTF/GLB/bundle URL as the scene.
+DEFAULT_SCENE_URL=https://asset-bundles-prod.reticulum.io/rooms/atrium/Atrium.bundle.json
diff --git a/habitat/default.toml b/habitat/default.toml
@@ -10,3 +10,4 @@ shard_count = "0"
 verbose = "false"
 locale = "en-US"
 timezone = "America/Los_Angeles"
+default_scene_url = "https://asset-bundles-prod.reticulum.io/rooms/atrium/Atrium.bundle.json"
diff --git a/habitat/hooks/run b/habitat/hooks/run
@@ -16,6 +16,7 @@ export LOCALE="{{ cfg.general.locale }}"
 export TIMEZONE="{{ cfg.general.timezone }}"
 export STATSD_HOST="{{ cfg.general.statsd_host }}"
 export STATSD_PREFIX="{{ cfg.general.statsd_prefix }}"
+export DEFAULT_SCENE_URL="{{ cfg.general.default_scene_url }}"
 
 cd {{pkg.svc_path}}
 

diff --git a/src/index.js b/src/index.js
@@ -676,26 +676,18 @@ async function start() {
           return discordCh.send("A Hubs room is already bridged in the topic, so I am cowardly refusing to replace it.");
         }
 
-        if (args.length === 2) { // !hubs create
-          const { url: hubUrl, hub_id: hubId } = await reticulumClient.createHubFromUrl(discordCh.name);
-          const updatedTopic = topicManager.addHub(discordCh.topic, hubUrl);
-          if (await trySetTopic(discordCh, updatedTopic) != null) {
-            return reticulumClient.bindHub(hubId, discordCh.guild.id, discordCh.id);
-          }
-          return;
-        }
-
-        const { sceneUrl, sceneId, sceneSlug } = topicManager.matchScene(args[2]) || {};
-        const name = args.length === 4 ? args[3] : (sceneSlug || discordCh.name);
+        const url = args.length > 2 ? args[2] : process.env.DEFAULT_SCENE_URL;
+        const { sceneUrl, sceneId, sceneSlug } = topicManager.matchScene(url) || {};
+        const name = args.length > 3 ? args[3] : discordCh.name;
         const guildId = discordCh.guild.id;
-        if (sceneUrl) { // !hubs create [scene URL] [name]
+        if (sceneId) { // !hubs create [scene URL] [name]
           const { url: hubUrl, hub_id: hubId } = await reticulumClient.createHubFromScene(name, sceneId);
           const updatedTopic = topicManager.addHub(discordCh.topic, hubUrl);
           if (await trySetTopic(discordCh, updatedTopic) != null) {
             return reticulumClient.bindHub(hubId, guildId, discordCh.id);
           }
         } else { // !hubs create [environment URL] [name]
-          const { url: hubUrl, hub_id: hubId } = await reticulumClient.createHubFromUrl(name, args[2]);
+          const { url: hubUrl, hub_id: hubId } = await reticulumClient.createHubFromUrl(name, url);
           const updatedTopic = topicManager.addHub(discordCh.topic, hubUrl);
           if (await trySetTopic(discordCh, updatedTopic) != null) {
             return reticulumClient.bindHub(hubId, guildId, discordCh.id);

diff --git a/src/reticulum.js b/src/reticulum.js
@@ -9,9 +9,6 @@ dotenv.config({ path: ".env.defaults" });
 // All of the session IDs ever assigned to the bot.
 const BOT_SESSION_IDS = new Set();
 
-// The URL for the scene used if users create a new room but don't specify a scene.
-const DEFAULT_BUNDLE_URL = "https://asset-bundles-prod.reticulum.io/rooms/atrium/Atrium.bundle.json";
-
 // Converts a Phoenix message push object into a promise that resolves when the push
 // is acknowledged by Reticulum or rejects when it times out or Reticulum produces an error.
 function promisifyPush(push) {
@@ -216,9 +213,9 @@ class ReticulumClient {
     return this._request("POST", "hubs", payload);
   }
 
-  // Creates a new hub with the given name and GLTF/GLB/bundle URL, or the default if not specified.
+  // Creates a new hub with the given name and GLTF/GLB/bundle URL.
   async createHubFromUrl(name, url) {
-    const payload = { hub: { name, default_environment_gltf_bundle_url: url || DEFAULT_BUNDLE_URL } };
+    const payload = { hub: { name, default_environment_gltf_bundle_url: url } };
     return this._request("POST", "hubs", payload);
   }