Commit 2d9c04497ae27569166c3fce934b7c17eee3753b
Merge branch 'master' into feature-keys-export
mix irving committed on 5/29/2018, 2:34:07 AMParent: 493292f2dc34df1e6685ec0848041c4fed74987d
Parent: 2314018b27b8f2a68eab93b5a8c8b0cc777bb8b2
Files changed
| app/html/scroller.js | changed |
| app/html/sideNav/sideNavDiscovery.js | changed |
| app/html/scroller.js | ||
|---|---|---|
| @@ -15,9 +15,9 @@ | ||
| 15 | 15 | function createScroller (opts = {}) { |
| 16 | 16 | const { |
| 17 | 17 | stream, // TODO - rename this to createStream (rename across app) |
| 18 | 18 | filter = () => pull.filter((msg) => true), |
| 19 | - indexProperty = ['value', 'timestamp'] | |
| 19 | + indexProperty = ['timestamp'] | |
| 20 | 20 | } = opts |
| 21 | 21 | |
| 22 | 22 | const streamToTop = pull( |
| 23 | 23 | next(stream, { live: true, reverse: false, old: false, limit: 100, property: indexProperty }), |
| app/html/sideNav/sideNavDiscovery.js | ||
|---|---|---|
| @@ -40,9 +40,9 @@ | ||
| 40 | 40 | |
| 41 | 41 | function markUnread (msg) { |
| 42 | 42 | unreadMsgsCache.get(msg.value.content.root || msg.key) |
| 43 | 43 | .delete(msg.key) |
| 44 | - | |
| 44 | + | |
| 45 | 45 | const participants = api.message.sync.getParticipants(msg) |
| 46 | 46 | unreadMsgsCache.get(participants.key) |
| 47 | 47 | .delete(msg.key) |
| 48 | 48 | } |
| @@ -70,15 +70,15 @@ | ||
| 70 | 70 | updateCache(getUnreadMsgsCache(rootKey), msg) |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | pull( |
| 74 | - next(api.feed.pull.private, {reverse: true, limit: 1000, live: false, property: ['value', 'timestamp']}), | |
| 74 | + next(api.feed.pull.private, {reverse: true, limit: 1000, live: false, property: ['timestamp']}), | |
| 75 | 75 | privateMsgFilter(), |
| 76 | 76 | pull.drain(updateUnreadMsgsCache) |
| 77 | 77 | ) |
| 78 | 78 | |
| 79 | 79 | pull( |
| 80 | - next(api.feed.pull.private, {old: false, live: true, property: ['value', 'timestamp']}), | |
| 80 | + next(api.feed.pull.private, {old: false, live: true, property: ['timestamp']}), | |
| 81 | 81 | privateMsgFilter(), |
| 82 | 82 | pull.drain(updateUnreadMsgsCache) |
| 83 | 83 | ) |
| 84 | 84 | |
| @@ -366,5 +366,4 @@ | ||
| 366 | 366 | return true |
| 367 | 367 | } |
| 368 | 368 | return false |
| 369 | 369 | } |
| 370 | - | |
Built with git-ssb-web