git ssb - Merge branch 'master' of github.com:ssbc/patchbay

app/sync/initialise/settings.js	changed
app/sync/initialise/suggestionCaches.js	changed
config.js	changed
package-lock.json	changed
package.json	changed

app/sync/initialise/settings.jsView
		@@ -11,9 +11,9 @@
11	11 …	})
12	12 …
13	13 …	const defaults = {
14	14 …	patchbay: {
15		- defaultTabs: ['/public', '/inbox', '/notifications'],
	15 …	+ defaultTabs: ['/posts', '/inbox', '/notifications'],
16	16 …	accessibility: {
17	17 …	invert: false,
18	18 …	saturation: 100,
19	19 …	brightness: 100,

app/sync/initialise/suggestionCaches.jsView
		@@ -10,8 +10,9 @@
10	10 …	exports.create = function (api) {
11	11 …	return nest('app.sync.initialise', init)
12	12 …
13	13 …	function init () {
14		- api.about.async.suggest()
	14 …	+ // lazy load abouts on first use, can be quite heavy during startup
	15 …	+ //api.about.async.suggest()
15	16 …	api.channel.async.suggest()
16	17 …	}
17	18 …	}

config.jsView
		@@ -1,8 +1,9 @@
1	1 …	const nest = require('depnest')
2	2 …	const Config = require('ssb-config/inject')
3	3 …	const ssbKeys = require('ssb-keys')
4	4 …	const Path = require('path')
	5 …	+const merge = require('lodash/merge')
5	6 …
6	7 …	const appName = process.env.ssb_appname \|\| 'ssb'
7	8 …	const opts = appName === 'ssb'
8	9 …	? null
		@@ -14,12 +15,19 @@
14	15 …	return nest('config.sync.load', () => {
15	16 …	if (!config) {
16	17 …	console.log('LOADING config')
17	18 …	config = Config(appName, opts)
18		- config.keys = ssbKeys.loadOrCreateSync(Path.join(config.path, 'secret'))
19	19 …
20		- // HACK: fix offline on windows by specifying 127.0.0.1 instead of localhost (default)
21		- config.remote = `net:127.0.0.1:${config.port}~shs:${config.keys.id.slice(1).replace('.ed25519', '')}`
	20 …	+ const keys = ssbKeys.loadOrCreateSync(Path.join(config.path, 'secret'))
	21 …	+ const pubkey = keys.id.slice(1).replace(`.${keys.curve}`, '')
	22 …	+
	23 …	+ config = merge(config, {
	24 …	+ connections: {
	25 …	+ incoming: { unix: [{ 'scope': 'local', 'transform': 'noauth' }] }
	26 …	+ },
	27 …	+ keys,
	28 …	+ remote: `unix:${Path.join(config.path, 'socket')}:~noauth:${pubkey}`
	29 …	+ })
22	30 …	}
23	31 …	return config
24	32 …	})
25	33 …	}

package-lock.jsonView
The diff is too large to show. Use a local git client to view these changes. Old file size: 315118 bytes New file size: 315117 bytes

Dominic / patchbay