Commit 78f161513725070b23d7b626a71e1ee9cea8a74d
get private messages working again (latest referenced patchcore fork adds support)
Matt McKegg committed on 6/9/2017, 8:04:59 AMParent: 1ef63fc8d1740acdafa24fef3e651e595e15ba93
Files changed
| modules/feed/pull/private.js | changed |
| server-process.js | changed |
| modules/feed/pull/private.js | ||
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| 1 | 1 | const pull = require('pull-stream') |
| 2 | 2 | const nest = require('depnest') |
| 3 | -const extend = require('xtend') | |
| 4 | 3 | const defer = require('pull-defer') |
| 5 | 4 | const onceTrue = require('mutant/once-true') |
| 6 | 5 | |
| 7 | 6 | exports.gives = nest('feed.pull.private') |
| @@ -10,20 +9,24 @@ | ||
| 10 | 9 | }) |
| 11 | 10 | |
| 12 | 11 | exports.create = function (api) { |
| 13 | 12 | return nest('feed.pull.private', function (opts) { |
| 14 | - // HACK: handle lt/gt | |
| 15 | - if (opts.lt != null) { | |
| 16 | - opts.query = [ | |
| 17 | - {$filter: { | |
| 18 | - timestamp: {$gte: 0, $lt: opts.lt} | |
| 19 | - }} | |
| 20 | - ] | |
| 21 | - delete opts.lt | |
| 22 | - } | |
| 13 | + // HACK: needed to select correct index and handle lt | |
| 23 | 14 | |
| 15 | + opts.query = [ | |
| 16 | + {$filter: { | |
| 17 | + timestamp: opts.lt | |
| 18 | + ? {$lt: opts.lt} | |
| 19 | + : {$gt: 0} | |
| 20 | + }} | |
| 21 | + ] | |
| 22 | + | |
| 23 | + delete opts.lt | |
| 24 | + | |
| 24 | 25 | return StreamWhenConnected(api.sbot.obs.connection, (sbot) => { |
| 25 | - return (sbot.private && sbot.private.read || pull.empty)(opts) | |
| 26 | + return pull( | |
| 27 | + sbot.private.read(opts) | |
| 28 | + ) | |
| 26 | 29 | }) |
| 27 | 30 | }) |
| 28 | 31 | } |
| 29 | 32 | |
| server-process.js | ||
|---|---|---|
| @@ -11,9 +11,10 @@ | ||
| 11 | 11 | .use(require('ssb-blobs')) |
| 12 | 12 | .use(require('scuttlebot/plugins/invite')) |
| 13 | 13 | .use(require('scuttlebot/plugins/local')) |
| 14 | 14 | .use(require('scuttlebot/plugins/logging')) |
| 15 | - .use(require('patchcore/backlinks-plugin')) | |
| 15 | + .use(require('patchcore/sbot-plugins/backlinks')) | |
| 16 | + .use(require('patchcore/sbot-plugins/private')) | |
| 16 | 17 | .use(require('ssb-query')) //using this instead of query-with-progress |
| 17 | 18 | // .use(require('./lib/private-with-index')) |
| 18 | 19 | // .use(require('./lib/query-with-progress')) |
| 19 | 20 | //.use(require('ssb-fulltext')) // disabled for now |
Built with git-ssb-web