From 39d4dcba461450ba33ed98ac078d3870e9d427b0 Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Tue, 18 May 2021 20:16:44 +0100
Subject: [PATCH] Remove url server config option

---
 index.html     |  3 ---
 src/api.ts     | 13 -------------
 src/index.d.ts |  1 -
 src/main.ts    |  2 +-
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/index.html b/index.html
index aa9ab22..632819a 100644
--- a/index.html
+++ b/index.html
@@ -31,7 +31,6 @@
             servers: {
                 creative: {
                 	label: 'Creative',
-                    url: '/map/creative',
                     dynmap: {
                         configuration: 'http://dynmap.local/standalone/creative/MySQL_configuration.php',
                         update: 'http://dynmap.local/standalone/creative/MySQL_update.php?world={world}&ts={timestamp}',
@@ -44,7 +43,6 @@
                 },
                 survival: {
                 	label: 'Survival',
-                    url: '/map/survival',
                     dynmap: {
                         configuration: 'http://dynmap.local/standalone/survival/MySQL_configuration.php',
                         update: 'http://dynmap.local/standalone/survival/MySQL_update.php?world={world}&ts={timestamp}',
@@ -57,7 +55,6 @@
                 },
                 build: {
                 	label: 'Build',
-                    url: '/map/build',
                     dynmap: {
                         configuration: 'http://dynmap.local/standalone/build/MySQL_configuration.php',
                         update: 'http://dynmap.local/standalone/build/MySQL_update.php?world={world}&ts={timestamp}',
diff --git a/src/api.ts b/src/api.ts
index e948b02..689de0d 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -602,19 +602,6 @@ const validateLiveAtlasConfiguration = (config: any): Map<string, LiveAtlasServe
 			throw new ConfigurationError(`Server '${server}': Dynmap sendmessage URL missing. ${check}`);
 		}
 
-		if(serverConfig.url) {
-			const a = document.createElement('a');
-			a.href = serverConfig.url;
-
-			if(a.origin !== window.location.origin) {
-				throw new ConfigurationError(`Server '${server}': URL doesn't match LiveAtlas origin. ${check}`);
-			}
-
-			serverConfig.url = a.pathname;
-		} else {
-			serverConfig.url = serverConfig.id;
-		}
-
 		result.set(server, serverConfig);
 	}
 
diff --git a/src/index.d.ts b/src/index.d.ts
index 475b885..3a109cc 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -22,7 +22,6 @@ declare module '@vue/runtime-core' {
 interface LiveAtlasServerDefinition {
 	id: string
 	label?: string
-	url?: string
 }
 
 interface LiveAtlasDynmapServerDefinition extends LiveAtlasServerDefinition {
diff --git a/src/main.ts b/src/main.ts
index 7ec999e..91c4da9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -96,7 +96,7 @@ try {
 
 		//Update url if server doesn't exist
 		if(serverName !== lastSegment) {
-			window.history.replaceState({}, '', store.state.servers.get(serverName)!.url + window.location.hash);
+			window.history.replaceState({}, '', serverName + window.location.hash);
 		}
 
 		store.commit(MutationTypes.SET_CURRENT_SERVER, serverName);