| modules/feed/html/rollup.jsView |
|---|
| 1 | 1 | var nest = require('depnest') |
| 2 | | -var {Value, Proxy, Array: MutantArray, h, computed, when, onceTrue, throttle} = require('mutant') |
| 2 | +var {Value, Proxy, Array: MutantArray, h, computed, when, onceTrue, throttle, resolve} = require('mutant') |
| 3 | 3 | var pull = require('pull-stream') |
| 4 | 4 | var Abortable = require('pull-abortable') |
| 5 | 5 | var Scroller = require('../../../lib/scroller') |
| 6 | 6 | var nextStepper = require('../../../lib/next-stepper') |
| 22 | 22 | 'about.obs.name': 'first', |
| 23 | 23 | 'app.sync.externalHandler': 'first', |
| 24 | 24 | 'message.html.canRender': 'first', |
| 25 | 25 | 'message.html.render': 'first', |
| 26 | + 'message.sync.isBlocked': 'first', |
| 26 | 27 | 'profile.html.person': 'first', |
| 27 | 28 | 'message.html.link': 'first', |
| 28 | 29 | 'message.sync.root': 'first', |
| 29 | 30 | 'feed.pull.rollup': 'first', |
| 31 | + 'feed.pull.withReplies': 'first', |
| 30 | 32 | 'sbot.async.get': 'first', |
| 31 | 33 | 'keys.sync.id': 'first', |
| 32 | 34 | 'intl.sync.i18n': 'first', |
| 33 | 35 | 'message.html.missing': 'first' |
| 152 | 154 | })) |
| 153 | 155 | |
| 154 | 156 | pull( |
| 155 | 157 | stream, |
| 156 | | - prefiltered ? pull.through() : pull.filter(bumpFilter), |
| 157 | 158 | abortable, |
| 158 | | - api.feed.pull.rollup(rootFilter), |
| 159 | + prefiltered ? pull( |
| 160 | + pull.filter(msg => !api.message.sync.isBlocked(msg)), |
| 161 | + api.feed.pull.withReplies() |
| 162 | + ) : pull( |
| 163 | + pull.filter(bumpFilter), |
| 164 | + api.feed.pull.rollup(rootFilter) |
| 165 | + ), |
| 159 | 166 | scroller |
| 160 | 167 | ) |
| 161 | 168 | }) |
| 162 | 169 | } |
| 200 | 207 | }) |
| 201 | 208 | |
| 202 | 209 | var renderedMessage = api.message.html.render(item, { |
| 203 | 210 | compact: compactFilter(item), |
| 211 | + includeForks: false, |
| 204 | 212 | priority: highlightItems.has(item.key) ? 2 : 0 |
| 205 | 213 | }) |
| 206 | 214 | |
| 207 | 215 | if (!renderedMessage) return h('div') |