Merge pull request #312 from ssbc/support-unbox-links

Support links with unbox key
ssbc · Apr 2, 2019 · ead85ed · ead85ed
2 parents 09faa08 + 6c59c79
commit ead85ed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/app/page/thread.js b/app/page/thread.js
@@ -23,7 +23,9 @@ exports.create = function (api) {
   return nest('app.page.thread', threadPage)
 
   function threadPage (location) {
-    const root = get(location, 'value.content.root') || get(location, 'value.content.about') || location.key
+    let root = get(location, 'value.content.root') || get(location, 'value.content.about') || location.key
+    if (location.value && location.value.unbox) // direct link with unbox key
+      root = location.key
     const msg = location.key
     if (msg !== root) scrollDownToMessage(msg)
 
@@ -41,14 +43,18 @@ exports.create = function (api) {
       placeholder: 'Write a reply',
       shrink: false
     })
+
     onceTrue(channel, ch => {
       const channelInput = composer.querySelector('input')
       channelInput.value = `#${ch}`
       channelInput.disabled = true
     })
 
     const content = map(messages, m => {
-      const message = api.message.html.render(resolve(m), { pageId: root })
+      let msg = resolve(m)
+      if (msg.key == location.key && location.value && location.value.unbox) // we have an unbox key, so message is already unboxed
+        msg = location
+      const message = api.message.html.render(msg, { pageId: root })
       markReadWhenVisible(message)
       return message
     }, { comparer })

diff --git a/message/html/render/about.js b/message/html/render/about.js
@@ -1,6 +1,6 @@
 const nest = require('depnest')
 const extend = require('xtend')
-const { isFeed, isMsg, isBlob } = require('ssb-ref')
+const { isFeed, isBlob } = require('ssb-ref')
 const { h } = require('mutant')
 
 exports.gives = nest('message.html.render')

diff --git a/router/async/normalise.js b/router/async/normalise.js
@@ -1,5 +1,5 @@
 const nest = require('depnest')
-const { isBlobLink, isFeed, isMsg } = require('ssb-ref')
+const { isBlobLink, isFeed, isMsg, parseLink } = require('ssb-ref')
 const ssbUri = require('ssb-uri')
 
 exports.gives = nest('router.async.normalise')
@@ -31,12 +31,19 @@ exports.create = (api) => {
       }
     }
 
-    if (isMsg(location)) {
-      api.sbot.async.get(location, (err, value) => {
+    var link = parseLink(location)
+
+    if (link && isMsg(link.link)) {
+      var params = { id: link.link }
+      if (link.query && link.query.unbox) {
+        params.private = true
+        params.unbox = link.query.unbox
+      }
+      api.sbot.async.get(params, function (err, value) {
         if (err) cb(err)
         else {
           if (typeof value.content === 'string') value = api.message.sync.unbox(value)
-          cb(null, { key: location, value })
+          cb(null, { key: link.link, value })
         }
       })
     } else if (isBlobLink(location)) {