Merge branch 'master' into develop

* master:
  Fix making sure max_time is actually used which makes feed return immutable results, less glitchy behavior is achieved this way

Author: veqtor

conseilUtil.js

@@ -379,7 +379,7 @@ const getArtisticUniverse = async (max_time) => {
     let mintOperationQuery = conseiljs.ConseilQueryBuilder.blankQuery();
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addFields(mintOperationQuery, 'operation_group_hash');
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'kind', conseiljs.ConseilOperator.EQ, ['transaction'])
-    mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'timestamp', conseiljs.ConseilOperator.AFTER, [d.getTime()]) //Two weeks ago
+    mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'timestamp', conseiljs.ConseilOperator.BETWEEN, [max_time, d.getTime()]) //Two weeks ago
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'status', conseiljs.ConseilOperator.EQ, ['applied'])
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'destination', conseiljs.ConseilOperator.EQ, [mainnet.protocol])
     mintOperationQuery = conseiljs.ConseilQueryBuilder.addPredicate(mintOperationQuery, 'parameters_entrypoints', conseiljs.ConseilOperator.EQ, ['mint_OBJKT'])

index.js

@@ -198,19 +198,18 @@ const app = express()
 app.use(express.json())
 app.use(cors({ origin: '*' }))
 
-const feedfeatured = async(req, res) => {
+app.post('/feed|/featured', async (req, res) => {
     const feedOffset = req.body.counter || 0
     const isFeatured = req.path === '/featured'
-
-    await getFeed(res, feedOffset, isFeatured, req.body.max_time)
-}
-
-app.post('/feed|/featured', async (req, res) => {
-    await feedfeatured(req, res)
+    const max_time = req.body.max_time
+    await getFeed(res, feedOffset, isFeatured, max_time)
 })
 
 app.get('/feed|/featured', async (req, res) => {
-    await feedfeatured(req, res)
+    const feedOffset = req.query.counter || 0
+    const isFeatured = req.path === '/featured'
+    const max_time = req.query.max_time
+    await getFeed(res, feedOffset, isFeatured, max_time)
 })