From 00e124b900fab837be14b4ca88b08986c69540bc Mon Sep 17 00:00:00 2001 From: Ev Bogue Date: Sun, 16 Jun 2019 16:23:18 -0500 Subject: fix a few bugs that prevented initial sync and sync when publishing --- bog.js | 35 +++++++++++++++++++++++------------ views.js | 8 +++++--- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/bog.js b/bog.js index 17098c4..1a45fef 100644 --- a/bog.js +++ b/bog.js @@ -60,12 +60,14 @@ function getName (id) { name.textContent = id.substring(0, 10) + '...' bog().then(log => { - for (var i = 0; i < log.length; i++ ) { - if (log[i].named == id) { - console.log(log[i].name) - return name.textContent = '@' + log[i].name + if (log) { + for (var i = 0; i < log.length; i++ ) { + if (log[i].named == id) { + console.log(log[i].name) + return name.textContent = '@' + log[i].name + } } - } + } }) return name @@ -149,14 +151,19 @@ async function publish (post, keys) { log.unshift(openedMsg) localforage.setItem('log', log) } else { - var feed = [openedMessage] + var feed = [openedMsg] localforage.setItem('log', feed) } }) + console.log(keys.publicKey) + + var subs = [keys.publicKey] + feed.unshift(message) - localforage.setItem(keys.publicKey, feed) - sync(keys.publicKey, keys) + localforage.setItem(keys.publicKey, feed).then(function () { + sync(subs, keys) + }) return message } else { @@ -170,18 +177,22 @@ async function publish (post, keys) { localforage.getItem('log').then(log => { if (log) { - log.unshift(openedMessage) + log.unshift(openedMsg) localforage.setItem('log', log) } else { - var feed = [openedMessage] + var feed = [openedMsg] localforage.setItem('log', feed) } }) var feed = [message] - localforage.setItem(keys.publicKey, feed) - sync(keys.publicKey, keys) + var subs = [keys.publicKey] + + localforage.setItem(keys.publicKey, feed).then(function () { + sync(subs, keys) + }) + return message } } diff --git a/views.js b/views.js index 94fd469..9da4412 100644 --- a/views.js +++ b/views.js @@ -108,9 +108,11 @@ function publicPage (keys) { scroller.appendChild(composer(keys)) bog().then(log => { - log.forEach(function (msg) { - scroller.appendChild(render(msg, keys)) - }) + if (log) { + log.forEach(function (msg) { + scroller.appendChild(render(msg, keys)) + }) + } }) } -- cgit v1.2.3-70-g09d2