diff --git a/app/renderer/js/main.js b/app/renderer/js/main.js index 8607a21d..a0102d09 100644 --- a/app/renderer/js/main.js +++ b/app/renderer/js/main.js @@ -6,10 +6,10 @@ const data = db.getData("/"); if (data["domain"] !== undefined) { - window.location.href = 'https://' + data["domain"]; + window.location.href = data["domain"]; } else { - + dialogs.prompt('Enter the URL for your Zulip server', function(url) { let newurl = 'https://' + url.replace(/^https?:\/\//,'') diff --git a/app/renderer/js/pref.js b/app/renderer/js/pref.js index d9a6763d..f5343b3d 100644 --- a/app/renderer/js/pref.js +++ b/app/renderer/js/pref.js @@ -8,6 +8,7 @@ document.getElementById('close-button').addEventListener('click', function (e) { function addDomain() { + const request = require('request'); const ipcRenderer = require('electron').ipcRenderer; const JsonDB = require('node-json-db'); const db = new JsonDB('domain', true, true); @@ -16,8 +17,18 @@ function addDomain() { newDomain = newDomain.replace(/^https?:\/\//,'') const domain = 'https://' + newDomain; + const checkDomain = domain + '/static/audio/zulip.ogg'; + + request(checkDomain, function (error, response, body) { + if (!error && response.statusCode !== 404) { + document.getElementById('urladded').innerHTML = newDomain + ' Added'; + db.push('/domain', newDomain); + ipcRenderer.send('new-domain', domain); + } + else{ + document.getElementById('urladded').innerHTML = "Not a vaild Zulip server"; + } + }) + - document.getElementById('urladded').innerHTML = newDomain + ' Added'; - db.push('/domain', newDomain); - ipcRenderer.send('new-domain', domain); }