aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bog.js3
-rw-r--r--gossip.js23
-rw-r--r--views.js11
3 files changed, 14 insertions, 23 deletions
diff --git a/bog.js b/bog.js
index 53b721c..74b7d05 100644
--- a/bog.js
+++ b/bog.js
@@ -150,7 +150,7 @@ async function publish (post, keys) {
feed.unshift(message)
localforage.setItem(keys.publicKey, feed)
-
+ sync(keys.publicKey, keys)
return message
} else {
@@ -175,6 +175,7 @@ async function publish (post, keys) {
var feed = [message]
localforage.setItem(keys.publicKey, feed)
+ sync(keys.publicKey, keys)
return message
}
}
diff --git a/gossip.js b/gossip.js
index cfdbeaa..16b96a3 100644
--- a/gossip.js
+++ b/gossip.js
@@ -1,10 +1,10 @@
-function sync (src, server, keys) {
+function sync (src, keys) {
+ var server = 'ws://localhost:8080/'
+
var ws = new WebSocket(server + src)
- console.log(server)
- console.log(src)
- console.log(keys.publicKey)
-
+ console.log('SYNCING')
+
bog(src).then(srclog => {
if (srclog) {
open(srclog[0]).then(msg => {
@@ -13,43 +13,30 @@ function sync (src, server, keys) {
seq: msg.seq,
requester: keys.publicKey
}
- console.log(req)
ws.onopen = function () {
ws.send(JSON.stringify(req))
}
ws.onmessage = function (message) {
var serverMsg = JSON.parse(message.data)
- console.log(serverMsg)
if (msg.seq === serverMsg.seq) {
- console.log('DO NOTHING')
} else if (msg.seq > serverMsg.seq) {
- console.log('SENDING')
var diff = msg.seq - serverMsg.seq
- console.log(diff)
var sendlog = srclog.slice(0, diff)
- console.log(sendlog)
var send = {
src,
log: sendlog,
requester: keys.publicKey
}
- console.log(send)
ws.send(JSON.stringify(send))
} else {
if (serverMsg.log) {
- console.log('RECEIVING')
var newlog = serverMsg.log.concat(srclog)
- console.log('NEWLOG')
-
localforage.setItem(src, newlog).then(function () {regenerate()})
-
- console.log(newlog)
}
}
}
})
} else {
- console.log('NO LOG!')
var req = {
src,
seq: null,
diff --git a/views.js b/views.js
index bc77e76..d6a527a 100644
--- a/views.js
+++ b/views.js
@@ -5,12 +5,12 @@ function threadPage (src, keys) {
}
function profilePage (src, keys) {
- var server = 'ws://localhost:8080/'
-
var profile = h('div', {classList: 'profile'})
scroller.appendChild(profile)
+ sync(src, keys)
+
var input = h('input', {placeholder: 'New name'})
profile.appendChild(h('a', {href: '#' + src}, [getName(src)]))
@@ -32,13 +32,16 @@ function profilePage (src, keys) {
profile.appendChild(h('button', {
onclick: function () {
- sync(src, server, keys)
+ sync(src, keys)
}
}, ['Sync feed']))
profile.appendChild(h('button', {
onclick: function () {
- localforage.removeItem(src).then(function () { regenerate() })
+ localforage.removeItem(src).then(function () {
+ location.hash = ''
+ regenerate()
+ })
}
}, ['Delete feed']))