Commit f6b15ef0c66ef8142dc6e63a6065df61a37573a2
fix double up of items in main feed when thread spans multiple feed pages
caused by refactor: https://github.com/ssbc/patchwork/commit/2b4bd6561cd0949af862be8fed0c030 13cd2d9d4Matt McKegg committed on 12/4/2017, 5:43:51 AM
Parent: 769b943fffb01b5b2627c5b9a6cfcadd2bf8bf14
Files changed
modules/feed/html/rollup.js | changed |
package.json | changed |
modules/feed/html/rollup.js | ||
---|---|---|
@@ -29,8 +29,9 @@ | ||
29 | 29 | 'message.html.link': 'first', |
30 | 30 | 'message.sync.root': 'first', |
31 | 31 | 'feed.pull.rollup': 'first', |
32 | 32 | 'feed.pull.withReplies': 'first', |
33 | + 'feed.pull.unique': 'first', | |
33 | 34 | 'sbot.async.get': 'first', |
34 | 35 | 'keys.sync.id': 'first', |
35 | 36 | 'intl.sync.i18n': 'first', |
36 | 37 | 'message.html.missing': 'first' |
@@ -169,8 +170,9 @@ | ||
169 | 170 | stream, |
170 | 171 | abortable, |
171 | 172 | pull.filter(msg => msg && msg.value && msg.value.content), |
172 | 173 | prefiltered ? pull( |
174 | + api.feed.pull.unique(), | |
173 | 175 | pull.filter(msg => !api.message.sync.isBlocked(msg)), |
174 | 176 | api.feed.pull.withReplies() |
175 | 177 | ) : pull( |
176 | 178 | pull.filter(bumpFilter), |
package.json | ||
---|---|---|
@@ -41,9 +41,9 @@ | ||
41 | 41 | "mutant": "^3.21.2", |
42 | 42 | "mutant-pull-reduce": "^1.1.0", |
43 | 43 | "obv": "0.0.1", |
44 | 44 | "patch-settings": "^1.0.1", |
45 | - "patchcore": "~1.18.0", | |
45 | + "patchcore": "~1.19.0", | |
46 | 46 | "pull-abortable": "^4.1.0", |
47 | 47 | "pull-defer": "^0.2.2", |
48 | 48 | "pull-file": "~1.0.0", |
49 | 49 | "pull-identify-filetype": "^1.1.0", |
Built with git-ssb-web