From 156514e067f8ed70a147d0f29a0909ce52d1f61e Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Wed, 19 Aug 2020 11:27:59 -0400 Subject: [PATCH 1/3] try_until -> before --- src/routes.js | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/src/routes.js b/src/routes.js index ad189cad..0b382459 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2174,7 +2174,7 @@ module.exports = async ( * 2 pages and 205 response. */ // eslint-disable-next-line prefer-destructuring - const try_until = req.query.try_until + const before = req.query.before if (pageStr) { const page = Number(pageStr) @@ -2194,18 +2194,47 @@ module.exports = async ( } return res.status(200).json({ - posts: await GunGetters.getFeedPage(page) + posts: await GunGetters.getFeedPage(page), + page }) } - if (try_until) { + if (before) { + return res.status(200).json({ + posts: [ + { + author: { + avatar: null, + bio: null, + displayName: `user-1`, + lastSeenApp: 0, + lastSeenNode: 0, + publicKey: (Math.random() * 100).toString() + }, + contentItems: { + [Math.random().toString()]: { + type: 'text/paragraph', + text: + 'Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor' + } + }, + date: Date.now(), + id: '-1', + status: 'publish', + tags: '', + title: 'jashdkjashjkashjd' + } + ], + page: 1 + }) + const pages = range(1, MAX_PAGES_TO_FETCH_FOR_TRY_UNTIL) const promises = pages.map(p => GunGetters.getFeedPage(p)) let results = await Promise.all(promises) const idxIfFound = results.findIndex(pp => - pp.some(p => p.id === try_until) + pp.some(p => p.id === before) ) if (idxIfFound > -1) { From d995cc428c6d132808b32d9ca3bfd40cb65f5c07 Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Wed, 19 Aug 2020 11:28:16 -0400 Subject: [PATCH 2/3] return page --- src/routes.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/routes.js b/src/routes.js index 0b382459..063d527f 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2243,7 +2243,8 @@ module.exports = async ( const posts = flatten(results) return res.status(200).json({ - posts + posts, + page: idx }) } @@ -2253,6 +2254,7 @@ module.exports = async ( return res.status(205).json({ posts: results[0] || [] + ,page: 1 }) } From 727f91b1ca7bf75cccd839ad4d2a1fc2b338e09e Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Wed, 19 Aug 2020 11:35:19 -0400 Subject: [PATCH 3/3] remove debug code --- src/routes.js | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/src/routes.js b/src/routes.js index 063d527f..987a6471 100644 --- a/src/routes.js +++ b/src/routes.js @@ -2200,34 +2200,6 @@ module.exports = async ( } if (before) { - return res.status(200).json({ - posts: [ - { - author: { - avatar: null, - bio: null, - displayName: `user-1`, - lastSeenApp: 0, - lastSeenNode: 0, - publicKey: (Math.random() * 100).toString() - }, - contentItems: { - [Math.random().toString()]: { - type: 'text/paragraph', - text: - 'Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor Lorem ipsum dolor' - } - }, - date: Date.now(), - id: '-1', - status: 'publish', - tags: '', - title: 'jashdkjashjkashjd' - } - ], - page: 1 - }) - const pages = range(1, MAX_PAGES_TO_FETCH_FOR_TRY_UNTIL) const promises = pages.map(p => GunGetters.getFeedPage(p)) @@ -2244,7 +2216,7 @@ module.exports = async ( return res.status(200).json({ posts, - page: idx + page: idxIfFound }) } @@ -2253,8 +2225,8 @@ module.exports = async ( // 205 code (client should refresh UI) return res.status(205).json({ - posts: results[0] || [] - ,page: 1 + posts: results[0] || [], + page: 1 }) }