Fix fossasia#70 - Added option for custom server

Added option for custom server in settings page.
djmgit · Oct 24, 2017 · 1849ed6 · 1849ed6
1 parent 67f3860
commit 1849ed6
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git a/src/scripts/main.js b/src/scripts/main.js
@@ -13,6 +13,7 @@ var userMapObj={latitude:null,longitude:null,status:null,mapids:[]};
 var numberOfMessagesToLoad = 15;
 var isLogged = false;
 var accessToken = "";
+var BASE_URL = "https://api.susi.ai";
 messageFormElement.addEventListener("submit", function (event) {
 	event.preventDefault();
 	handleMessageInputSubmit();
@@ -109,6 +110,11 @@ function loadMoreMessages(){
 function restoreMessages(){
 	var buffer = browser.storage.sync.get(null);
 	buffer.then(function(res){
+		if (res["serverOpt"]) {
+			if (res["serverOpt"] === "custom") {
+				BASE_URL = res["serverName"]
+			}
+		}
 
 		if(res["messagesHistory"]){
 			messagesHistory = res["messagesHistory"];
@@ -473,9 +479,9 @@ function fetchResponse(query,msgId) {
 	var msgId_susi=msgId;
 	var latitude=userMapObj.latitude;
 	var longitude=userMapObj.longitude;
-	var url="https://api.susi.ai/susi/chat.json?language=en&timezoneOffset=-300&q=";
+	var url=BASE_URL + "/susi/chat.json?language=en&timezoneOffset=-300&q=";
 	if(userMapObj.status==="SUCCESS"){
-		url="https://api.susi.ai/susi/chat.json?language=en&latitude="+latitude+"&longitude="+longitude+"&timezoneOffset=-300&q=";
+		url=BASE_URL + "/susi/chat.json?language=en&latitude="+latitude+"&longitude="+longitude+"&timezoneOffset=-300&q=";
 	}
 	url = url + query ;
 	if(isLogged){

diff --git a/src/scripts/options.js b/src/scripts/options.js
@@ -150,15 +150,31 @@ function persistSettings(){
 			loginForm.style.display="block";
 			logoutButton.style.display="none";
 		}
+		if(res["serverOpt"]) {
+			$("input[name=serverOption]").val([res["serverOpt"]]);
+			if(res["serverOpt"] === "custom") {
+				$("#customServer").val(res["serverName"])
+			}
+		}
 
 	});
 }
 
 
 function saveOptions(e) {
 	e.preventDefault();
+	var selectedServer = "";
+	var selectedServerOpt = $('input[name=serverOption]:checked').val();
+	if (selectedServerOpt === "default") {
+		selectedServer = "https://api.susi.ai";
+		$("#customServer").val("");
+	} else {
+		selectedServer = $("#customServer").val();
+	}
 	browser.storage.sync.set({
-		theme: document.querySelector("#theme").value
+		theme: document.querySelector("#theme").value,
+		serverOpt: selectedServerOpt,
+		serverName: selectedServer
 	});
 
 }

diff --git a/src/settings.css b/src/settings.css
@@ -52,3 +52,7 @@ button{
 .hide{
     display: none;
 }
+
+#customServer {
+    width: 47%;
+}
diff --git a/src/settings.html b/src/settings.html
@@ -26,6 +26,11 @@ <h4>Theme</h4>
   <option value="light">Light</option>
   <option value="dark">Dark</option>
 </select>
+<div id="selectServer">
+  <input type = "radio" name="serverOption" value="default" checked> Use default server <br>
+  <input type = "radio" name="serverOption" value="custom"><input type = "text" id="customServer"
+  placeholder="Enter custom server name (http://<server_name>)"> <br>
+</div>
 <br>
 <br>
 <br>