diff --git a/src/topics/tags.js b/src/topics/tags.js index 0e144321b0..64cf407042 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -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); } }); diff --git a/test/topics.js b/test/topics.js index 634a59f550..ea3dde84b9 100644 --- a/test/topics.js +++ b/test/topics.js @@ -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']); });