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

revert: revert tag sort

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-04-08 15:19:35 -04:00
parent 036f935fa9
commit f9df6431c9
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/topics/tags.js
View File

@@ -289,15 +289,13 @@ module.exports = function (Topics) {
};
Topics.getTopicTags = async function (tid) {
const tags = await db.getSetMembers(`topic:${tid}:tags`);
return tags.sort();
return await db.getSetMembers(`topic:${tid}:tags`);
};
Topics.getTopicsTags = async function (tids) {
const keys = tids.map(tid => `topic:${tid}:tags`);
const tags = await db.getSetsMembers(keys);
tags.forEach(tags => tags.sort());
return tags;
return await db.getSetsMembers(
tids.map(tid => `topic:${tid}:tags`)
);
};
Topics.getTopicTagsObjects = async function (tid) {
@@ -316,7 +314,6 @@ module.exports = function (Topics) {
topicTags.forEach((tags, index) => {
if (Array.isArray(tags)) {
topicTags[index] = tags.map(tag => tagDataMap[tag]);
topicTags[index].sort((tag1, tag2) => tag2.value - tag1.value);
}
});

6
test/topics.js
View File

@@ -2031,19 +2031,19 @@ describe('Topic\'s', () => {
let tags = await topics.getTopicTags(tid);
let categoryTags = await topics.getCategoryTags(cid, 0, -1);
assert.deepStrictEqual(tags, ['tag1', 'tag2', 'tag3', 'tag4']);
assert.deepStrictEqual(tags.sort(), ['tag1', 'tag2', 'tag3', 'tag4']);
assert.deepStrictEqual(categoryTags.sort(), ['tag1', 'tag2', 'tag3', 'tag4']);
await topics.addTags(['tag7', 'tag6', 'tag5'], [tid]);
tags = await topics.getTopicTags(tid);
categoryTags = await topics.getCategoryTags(cid, 0, -1);
assert.deepStrictEqual(tags, ['tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6', 'tag7']);
assert.deepStrictEqual(tags.sort(), ['tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6', 'tag7']);
assert.deepStrictEqual(categoryTags.sort(), ['tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6', 'tag7']);
await topics.removeTags(['tag1', 'tag3', 'tag5', 'tag7'], [tid]);
tags = await topics.getTopicTags(tid);
categoryTags = await topics.getCategoryTags(cid, 0, -1);
assert.deepStrictEqual(tags, ['tag2', 'tag4', 'tag6']);
assert.deepStrictEqual(tags.sort(), ['tag2', 'tag4', 'tag6']);
assert.deepStrictEqual(categoryTags.sort(), ['tag2', 'tag4', 'tag6']);
});