Commit 423cc7568f0fc24488b6965030e1a93560d534fc
Better error handling and bump patchcore for bugfix
Anders Rune Jensen committed on 4/27/2018, 8:22:00 AMParent: 0c8170ba0a21c43a0ced6048c04d79e7c03cee13
Files changed
app/html/filter.js | changed |
package-lock.json | changed |
package.json | changed |
app/html/filter.js | ||
---|---|---|
@@ -164,10 +164,10 @@ | ||
164 | 164 … | |
165 | 165 … | function followFilter (msg) { |
166 | 166 … | if (!filterSettings().only.peopleAndChannelsIFollow) return true |
167 | 167 … | |
168 | - return Array.from(peopleIFollow()).concat(myId).includes(msg.value.author) || | |
169 | - (msg.value.content && Array.from(channelsIFollow()).includes(msg.value.content.channel)) | |
168 … | + return (msg.value && Array.from(peopleIFollow()).concat(myId).includes(msg.value.author)) || | |
169 … | + (msg.value && msg.value.content && Array.from(channelsIFollow()).includes(msg.value.content.channel)) | |
170 | 170 … | } |
171 | 171 … | |
172 | 172 … | function userFilter (msg) { |
173 | 173 … | const id = resolve(userId) |
@@ -207,8 +207,9 @@ | ||
207 | 207 … | |
208 | 208 … | function filterDownThrough () { |
209 | 209 … | return pull( |
210 | 210 … | downScrollAborter, |
211 … | + pull.filter(msg => msg), | |
211 | 212 … | pull.filter(followFilter), |
212 | 213 … | pull.filter(userFilter), |
213 | 214 … | pull.filter(rootFilter), |
214 | 215 … | pull.filter(channelFilter), |
@@ -220,8 +221,9 @@ | ||
220 | 221 … | |
221 | 222 … | function filterUpThrough () { |
222 | 223 … | return pull( |
223 | 224 … | upScrollAborter, |
225 … | + pull.filter(msg => msg), | |
224 | 226 … | pull.filter(followFilter), |
225 | 227 … | pull.filter(userFilter), |
226 | 228 … | pull.filter(rootFilter), |
227 | 229 … | pull.filter(channelFilter), |
package-lock.json | ||
---|---|---|
The diff is too large to show. Use a local git client to view these changes. Old file size: 299842 bytes New file size: 301500 bytes |
package.json | ||
---|---|---|
@@ -63,9 +63,9 @@ | ||
63 | 63 … | "patch-settings": "^1.1.1", |
64 | 64 … | "patch-suggest": "^1.1.0", |
65 | 65 … | "patchbay-book": "^1.0.5", |
66 | 66 … | "patchbay-gatherings": "^2.0.0", |
67 | - "patchcore": "^1.26.0", | |
67 … | + "patchcore": "^1.26.1", | |
68 | 68 … | "pull-abortable": "^4.1.1", |
69 | 69 … | "pull-cat": "^1.1.11", |
70 | 70 … | "pull-next": "^1.0.0", |
71 | 71 … | "pull-scroll": "^1.0.9", |
Built with git-ssb-web