Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 03:01:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

properly filter /unread /recent /popular /top (#7927)

Browse Source 
* feat: add failing test for pagination

* feat: test

* fix: redis tests

* refactor: remove logs

* fix: add new test

* feat: make sortedSetRangeByScore work with keys on redis

* fix: hardcoded set name

* feat: show topics from readable categories on recent/popular/top

* feat: rewrite unread topics

respect watched categories and followed topics

* fix: term + watched
This commit is contained in:
Barış Soner Uşaklı
2019-09-26 21:55:49 -04:00
committed by GitHub
parent 17437897f9
commit 310c6fd33f
12 changed files with 171 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/database/redis/sorted.js
View File

@@ -11,28 +11,28 @@ module.exports = function (module) {
require('./sorted/intersect')(module);
module.getSortedSetRange = async function (key, start, stop) {
return await sortedSetRange('zrange', key, start, stop, false);
return await sortedSetRange('zrange', key, start, stop, '-inf', '+inf', false);
};
module.getSortedSetRevRange = async function (key, start, stop) {
return await sortedSetRange('zrevrange', key, start, stop, false);
return await sortedSetRange('zrevrange', key, start, stop, '-inf', '+inf', false);
};
module.getSortedSetRangeWithScores = async function (key, start, stop) {
return await sortedSetRange('zrange', key, start, stop, true);
return await sortedSetRange('zrange', key, start, stop, '-inf', '+inf', true);
};
module.getSortedSetRevRangeWithScores = async function (key, start, stop) {
return await sortedSetRange('zrevrange', key, start, stop, true);
return await sortedSetRange('zrevrange', key, start, stop, '-inf', '+inf', true);
};
async function sortedSetRange(method, key, start, stop, withScores) {
async function sortedSetRange(method, key, start, stop, min, max, withScores) {
if (Array.isArray(key)) {
if (!key.length) {
return [];
}
const batch = module.client.batch();
key.forEach(key => batch[method]([key, 0, stop, 'WITHSCORES']));
key.forEach(key => batch[method](genParams(method, key, 0, stop, min, max, true)));
const data = await helpers.execBatch(batch);
const batchData = data.map(setData => helpers.zsetToObjectArray(setData));
@@ -48,11 +48,7 @@ module.exports = function (module) {
return objects;
}
var params = [key, start, stop];
if (withScores) {
params.push('WITHSCORES');
}
const params = genParams(method, key, start, stop, min, max, withScores);
const data = await module.client.async[method](params);
if (!withScores) {
return data;
@@ -61,25 +57,46 @@ module.exports = function (module) {
return objects;
}
function genParams(method, key, start, stop, min, max, withScores) {
const params = {
zrevrange: [key, start, stop],
zrange: [key, start, stop],
zrangebyscore: [key, min, max],
zrevrangebyscore: [key, max, min],
};
if (withScores) {
params[method].push('WITHSCORES');
}
if (method === 'zrangebyscore' || method === 'zrevrangebyscore') {
const count = stop !== -1 ? stop - start + 1 : stop;
params[method].push('LIMIT', start, count);
}
return params[method];
}
module.getSortedSetRangeByScore = async function (key, start, count, min, max) {
return await module.client.async.zrangebyscore([key, min, max, 'LIMIT', start, count]);
return await sortedSetRangeByScore('zrangebyscore', key, start, count, min, max, false);
};
module.getSortedSetRevRangeByScore = async function (key, start, count, max, min) {
return await module.client.async.zrevrangebyscore([key, max, min, 'LIMIT', start, count]);
return await sortedSetRangeByScore('zrevrangebyscore', key, start, count, min, max, false);
};
module.getSortedSetRangeByScoreWithScores = async function (key, start, count, min, max) {
return await sortedSetRangeByScoreWithScores('zrangebyscore', key, start, count, min, max);
return await sortedSetRangeByScore('zrangebyscore', key, start, count, min, max, true);
};
module.getSortedSetRevRangeByScoreWithScores = async function (key, start, count, max, min) {
return await sortedSetRangeByScoreWithScores('zrevrangebyscore', key, start, count, max, min);
return await sortedSetRangeByScore('zrevrangebyscore', key, start, count, min, max, true);
};
async function sortedSetRangeByScoreWithScores(method, key, start, count, min, max) {
const data = await module.client.async[method]([key, min, max, 'WITHSCORES', 'LIMIT', start, count]);
return helpers.zsetToObjectArray(data);
async function sortedSetRangeByScore(method, key, start, count, min, max, withScores) {
if (parseInt(count, 10) === 0) {
return [];
}
const stop = (parseInt(count, 10) === -1) ? -1 : (start + count - 1);
return await sortedSetRange(method, key, start, stop, min, max, withScores);
}
module.sortedSetCount = async function (key, min, max) {