diff options
author | Ev Bogue <ev@evbogue.com> | 2019-05-01 21:48:59 -0500 |
---|---|---|
committer | Ev Bogue <ev@evbogue.com> | 2019-05-01 21:48:59 -0500 |
commit | ffbc55163df0ab78d714aeceb43da89bff47643a (patch) | |
tree | a2991ec36143449de33ba9b0fe86bc163cbe98f4 | |
parent | b0dbdb26a35b56b3caa9c82a8271a4560cde3ab8 (diff) |
abstract regenerate into function and call regenerate on sync
-rw-r--r-- | bog.js | 29 | ||||
-rw-r--r-- | gossip.js | 22 | ||||
-rw-r--r-- | views.js | 61 |
3 files changed, 34 insertions, 78 deletions
@@ -70,6 +70,35 @@ function getName (id) { return name } +// bog.regenerate -- regenerates main log by taking all of the feed logs, combinging them, and then sorting them + +function regenerate () { + var newlog = [] + var openedlog = [] + localforage.iterate(function(value, key, i) { + if (key[0] == '@') { + newlog = newlog.concat(value) + } + console.log(newlog) + }).then(function () { + newlog.forEach(function (msg) { + var pubkey = nacl.util.decodeBase64(msg.author.substring(1)) + var sig = nacl.util.decodeBase64(msg.signature) + var opened = JSON.parse(nacl.util.encodeUTF8(nacl.sign.open(sig, pubkey))) + opened.key = msg.key + + openedlog.push(opened) + }) + console.log(openedlog) + + openedlog.sort((a, b) => a.timestamp - b.timestamp) + + var reversed = openedlog.reverse() + console.log('REGENERATE') + localforage.setItem('log', reversed).then(function () {location.reload()}) + }) +} + // bog.log (feed) -- returns a specific feed if a parameter is passed, if not returns the entire log // EX: bog().then(log => { console.log(log)}) // EX: bog('@ExE3QXmBhYQlGVA3WM2BD851turNzwhruWbIpMd7rbQ=').then(log => { console.log(log)}) @@ -40,18 +40,8 @@ function sync (src, server, keys) { console.log('RECEIVING') var newlog = serverMsg.log.concat(srclog) console.log('NEWLOG') - localforage.getItem('log').then(log => { - if (log) { - var newpubliclog = serverMsg.log.concat(log) - localforage.setItem('log', newpubliclog) - } - }) - - localforage.setItem(src, newlog) - setTimeout(function () { - location.reload() - }, 1000) + localforage.setItem(src, newlog).then(function () {regenerate()}) console.log(newlog) } @@ -72,19 +62,15 @@ function sync (src, server, keys) { ws.onmessage = function (message) { var serverMsg = JSON.parse(message.data) console.log(serverMsg) - localforage.getItem('log').then(log => { + /*localforage.getItem('log').then(log => { if (log) { var newlog = serverMsg.log.concat(log) localforage.setItem('log', newlog) } - }) - - localforage.setItem(src, serverMsg.log) + })*/ - setTimeout(function () { - location.reload() - }, 1000) + localforage.setItem(src, serverMsg.log).then(function () {regenerate()}) } } }) @@ -55,68 +55,9 @@ function profilePage (src, keys) { } function publicPage (keys) { - var newlog = [] - scroller.appendChild(h('button', { onclick: function () { - var openedlog = [] - localforage.iterate(function(value, key, i) { - if (key[0] == '@') { - newlog = newlog.concat(value) - } - console.log(newlog) - }).then(function () { - newlog.forEach(function (msg) { - var pubkey = nacl.util.decodeBase64(msg.author.substring(1)) - var sig = nacl.util.decodeBase64(msg.signature) - var opened = JSON.parse(nacl.util.encodeUTF8(nacl.sign.open(sig, pubkey))) - opened.key = msg.key - - openedlog.push(opened) - }) - console.log(openedlog) - localforage.setItem('log', openedlog).then(function () {location.reload()}) - }) - } - }, ['Merge'])) - - scroller.appendChild(h('button', { - onclick: function () { - localforage.getItem('log').then(log => { - log.sort((a, b) => a.timestamp - b.timestamp) - console.log(log) - var reversed = log.reverse() - localforage.setItem('log', reversed).then(function () {location.reload()}) - }) - } - }, ['Sort'])) - - scroller.appendChild(h('button', { - onclick: function () { - var openedlog = [] - localforage.iterate(function(value, key, i) { - if (key[0] == '@') { - newlog = newlog.concat(value) - } - console.log(newlog) - }).then(function () { - newlog.forEach(function (msg) { - var pubkey = nacl.util.decodeBase64(msg.author.substring(1)) - var sig = nacl.util.decodeBase64(msg.signature) - var opened = JSON.parse(nacl.util.encodeUTF8(nacl.sign.open(sig, pubkey))) - opened.key = msg.key - - openedlog.push(opened) - }) - console.log(openedlog) - - openedlog.sort((a, b) => a.timestamp - b.timestamp) - - var reversed = openedlog.reverse() - - localforage.setItem('log', reversed).then(function () {location.reload()}) - }) - + regenerate() } }, ['Regenerate'])) |