Merge branch 'master' into ssb-legacy-conn

Author: staltz

lib/catch-links.js

@@ -1,5 +1,3 @@
-var Url = require('url')
-
 module.exports = function (root, cb) {
   root.addEventListener('click', (ev) => {
     if (ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey || ev.defaultPrevented) {
@@ -18,8 +16,16 @@ module.exports = function (root, cb) {
     var href = anchor.getAttribute('href')
 
     if (href) {
-      var url = Url.parse(href)
-      if (url.host) {
+      var isUrl
+
+      try {
+        var url = new URL(href)
+        isUrl = true
+      } catch (e) {
+        isUrl = false
+      }
+
+      if (isUrl && url.host) {
         cb(href, true)
       } else if (href !== '#') {
         cb(href, false, anchor.anchor)

lib/scroller.js

@@ -1,6 +1,6 @@
 var pull = require('pull-stream')
 var Pause = require('pull-pause')
-var { h, onceIdle, computed, Value } = require('mutant')
+var { h, computed, Value } = require('mutant')
 
 window.stopIt = false
 

locales/en.json

@@ -300,5 +300,6 @@
 	"You have chosen to privately ignore this person.": "You have chosen to privately ignore this person.",
 	"No new messages will be downloaded. Existing messages will be hidden.": "No new messages will be downloaded. Existing messages will be hidden.",
 	"You have chosen to publicly block this person.": "You have chosen to publicly block this person.",
-	"Click for options to block syncing with this person and/or hide their posts": "Click for options to block syncing with this person and/or hide their posts"
+	"Click for options to block syncing with this person and/or hide their posts": "Click for options to block syncing with this person and/or hide their posts",
+	"invited you to this gathering": "invited you to this gathering"
 }

main-window.js

@@ -13,6 +13,7 @@ var ref = require('ssb-ref')
 var setupContextMenuAndSpellCheck = require('./lib/context-menu-and-spellcheck')
 var watch = require('mutant/watch')
 var requireStyle = require('require-style')
+var ssbUri = require('ssb-uri')
 
 try {
   var mouseForwardBack = require('mouse-forward-back')
@@ -289,6 +290,15 @@ module.exports = function (config) {
       if (!err && handler) {
         handler(href)
       } else {
+        if (href.startsWith('ssb:')) {
+          try {
+            href = ssbUri.toSigilLink(href)
+          } catch (e) {
+            // error can be safely ignored
+            // it just means this isn't an SSB URI
+          }
+        }
+
         // no external handler found, use page.html.render
         previewElement.cancel()
         views.setView(href, anchor)

modules/app/html/search.js

@@ -1,6 +1,7 @@
 var h = require('mutant/h')
 var nest = require('depnest')
 var addSuggest = require('suggest-box')
+var ssbUri = require('ssb-uri')
 
 exports.needs = nest({
   'profile.async.suggest': 'first',
@@ -48,10 +49,18 @@ exports.create = function (api) {
     return searchBox
 
     function doSearch () {
+      const prefixes = ['/', '?', '@', '#', '%', 'ssb:']
       var value = searchBox.value.trim()
-      if (value.startsWith('/') || value.startsWith('?') || value.startsWith('@') || value.startsWith('#') || value.startsWith('%') || value.startsWith('&')) {
+
+      if (prefixes.some(p => value.startsWith(p))) {
         if (value.startsWith('@') && value.length < 30) {
           // probably not a key
+        } else if (value.startsWith('ssb:')) {
+          try {
+            setView(ssbUri.toSigilLink(value))
+          } catch (e) {
+            // not a URI
+          }
         } else if (value.length > 2) {
           setView(value)
         }

modules/feed/html/rollup.js

@@ -5,12 +5,13 @@ var Abortable = require('pull-abortable')
 var Scroller = require('../../../lib/scroller')
 var extend = require('xtend')
 var GroupSummaries = require('../../../lib/group-summaries')
-var rootBumpTypes = ['mention', 'channel-mention']
+var rootBumpTypes = ['mention', 'channel-mention', 'invite']
 var getBump = require('../../../lib/get-bump')
 var many = require('../../../lib/many')
 
 var bumpMessages = {
   'reaction': 'liked this message',
+  'invite': 'invited you to this gathering',
   'reply': 'replied to this message',
   'updated': 'added changes',
   'mention': 'mentioned you',

modules/invite/dhtAcceptSheet.js

@@ -1,4 +1,4 @@
-var { h, when, Value, Proxy } = require('mutant')
+var { h, when, Value } = require('mutant')
 var nest = require('depnest')
 var electron = require('electron')
 

modules/invite/dhtCreateSheet.js

@@ -46,7 +46,7 @@ exports.create = function (api) {
               'ev-click': () => {
                 api.sbot.async.createDHT((err, code) => {
                   if (err) {
-                    created.set(false)
+                    creating.set(false)
                     showDialog({
                       type: 'error',
                       title: i18n('Error'),

package-lock.json

@@ -90,6 +90,7 @@
     "ssb-server": "^13.3.0",
     "ssb-sort": "^1.1.0",
     "ssb-tags": "^0.2.0",
+    "ssb-uri": "^1.0.1",
     "ssb-ws": "~3.0.2",
     "standard": "^12.0.1",
     "suggest-box": "github:mmckegg/suggest-box#scroll-selection-into-view",