From 220f0aa9f5a576e890b0cd8a0b43e4ca984c16d3 Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Wed, 4 Sep 2019 00:07:03 -0700
Subject: [PATCH 1/3] handle empty servers better

---
 js/modules/loki_public_chat_api.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js
index f2f312206..5b22bed2e 100644
--- a/js/modules/loki_public_chat_api.js
+++ b/js/modules/loki_public_chat_api.js
@@ -457,6 +457,12 @@ class LokiPublicChannelAPI {
         { params }
       );
 
+      // if any problems, abort out
+      if (res.err || !res.response) {
+        if (res.err) log.error('Error '+res.err);
+        break;
+      }
+
       // Process results
       res.response.data.reverse().forEach(deleteEntry => {
         // Escalate it up to the subsystem that can check to see if this has

From dffcf51f888c3476dfd3f57fbaedd151514dd580 Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Wed, 4 Sep 2019 00:07:30 -0700
Subject: [PATCH 2/3] add defaultPublicChatServer to config

---
 app/sql.js          | 7 +++++--
 config/default.json | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/sql.js b/app/sql.js
index bd1e4f1e6..056058077 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -5,6 +5,7 @@ const sql = require('@journeyapps/sqlcipher');
 const { app, dialog, clipboard } = require('electron');
 const { redactAll } = require('../js/modules/privacy');
 const { remove: removeUserConfig } = require('./user_config');
+const config = require('./config');
 
 const pify = require('pify');
 const uuidv4 = require('uuid/v4');
@@ -833,9 +834,11 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
   };
 
   const lokiPublicServerData = {
-    serverUrl: 'https://chat.lokinet.org',
+    // make sure we don't have a trailing slash just in case
+    serverUrl: config.get('defaultPublicChatServer').replace(/\/*$/, ''),
     token: null,
   };
+  console.log('lokiPublicServerData', lokiPublicServerData);
 
   const baseData = {
     friendRequestStatus: 4, // Friends
@@ -851,7 +854,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
 
   const publicChatData = {
     ...baseData,
-    id: 'publicChat:1@chat.lokinet.org',
+    id: 'publicChat:1@' + lokiPublicServerData.serverUrl.replace(/^https?\:\/\//i, ''),
     server: lokiPublicServerData.serverUrl,
     name: 'Loki Public Chat',
     channelId: '1',
diff --git a/config/default.json b/config/default.json
index 8740d6b93..a1e9adf51 100644
--- a/config/default.json
+++ b/config/default.json
@@ -22,5 +22,6 @@
   "certificateAuthority":
     "-----BEGIN CERTIFICATE-----\nMIID7zCCAtegAwIBAgIJAIm6LatK5PNiMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD\nVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j\naXNjbzEdMBsGA1UECgwUT3BlbiBXaGlzcGVyIFN5c3RlbXMxHTAbBgNVBAsMFE9w\nZW4gV2hpc3BlciBTeXN0ZW1zMRMwEQYDVQQDDApUZXh0U2VjdXJlMB4XDTEzMDMy\nNTIyMTgzNVoXDTIzMDMyMzIyMTgzNVowgY0xCzAJBgNVBAYTAlVTMRMwEQYDVQQI\nDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMR0wGwYDVQQKDBRP\ncGVuIFdoaXNwZXIgU3lzdGVtczEdMBsGA1UECwwUT3BlbiBXaGlzcGVyIFN5c3Rl\nbXMxEzARBgNVBAMMClRleHRTZWN1cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\nggEKAoIBAQDBSWBpOCBDF0i4q2d4jAXkSXUGpbeWugVPQCjaL6qD9QDOxeW1afvf\nPo863i6Crq1KDxHpB36EwzVcjwLkFTIMeo7t9s1FQolAt3mErV2U0vie6Ves+yj6\ngrSfxwIDAcdsKmI0a1SQCZlr3Q1tcHAkAKFRxYNawADyps5B+Zmqcgf653TXS5/0\nIPPQLocLn8GWLwOYNnYfBvILKDMItmZTtEbucdigxEA9mfIvvHADEbteLtVgwBm9\nR5vVvtwrD6CCxI3pgH7EH7kMP0Od93wLisvn1yhHY7FuYlrkYqdkMvWUrKoASVw4\njb69vaeJCUdU+HCoXOSP1PQcL6WenNCHAgMBAAGjUDBOMB0GA1UdDgQWBBQBixjx\nP/s5GURuhYa+lGUypzI8kDAfBgNVHSMEGDAWgBQBixjxP/s5GURuhYa+lGUypzI8\nkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB+Hr4hC56m0LvJAu1R\nK6NuPDbTMEN7/jMojFHxH4P3XPFfupjR+bkDq0pPOU6JjIxnrD1XD/EVmTTaTVY5\niOheyv7UzJOefb2pLOc9qsuvI4fnaESh9bhzln+LXxtCrRPGhkxA1IMIo3J/s2WF\n/KVYZyciu6b4ubJ91XPAuBNZwImug7/srWvbpk0hq6A6z140WTVSKtJG7EP41kJe\n/oF4usY5J7LPkxK3LWzMJnb5EIJDmRvyH8pyRwWg6Qm6qiGFaI4nL8QU4La1x2en\n4DGXRaLMPRwjELNgQPodR38zoCMuA8gHZfZYYoZ7D7Q1wNUiVHcxuFrEeBaYJbLE\nrwLV\n-----END CERTIFICATE-----\n",
   "import": false,
-  "serverTrustRoot": "BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx"
+  "serverTrustRoot": "BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx",
+  "defaultPublicChatServer": "https://chat.lokinet.org/"
 }

From b4277532d69e277dcdd364e3c81bb833b40d66e4 Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Wed, 4 Sep 2019 01:01:04 -0700
Subject: [PATCH 3/3] Update app/sql.js

Co-Authored-By: Beaudan Campbell-Brown <beau@loki.network>
---
 app/sql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/sql.js b/app/sql.js
index 056058077..a846ad1e9 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -854,7 +854,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
 
   const publicChatData = {
     ...baseData,
-    id: 'publicChat:1@' + lokiPublicServerData.serverUrl.replace(/^https?\:\/\//i, ''),
+    id: `publicChat:1@${lokiPublicServerData.serverUrl.replace(/^https?\:\/\//i, '')}`,
     server: lokiPublicServerData.serverUrl,
     name: 'Loki Public Chat',
     channelId: '1',