Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed my issue #102

Closed
wants to merge 1 commit into from
Closed

fixed my issue #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added dump.rdb
View file
Open in desktop
Binary file not shown.
122 changes: 60 additions & 62 deletions src/topics/tags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,25 @@
const cache = require('../cache');

module.exports = function (Topics) {
console.log('dcharkvi')

Check failure on line 21 in src/topics/tags.js

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon
Topics.createTags = async function (tags, tid, timestamp) {
if (!Array.isArray(tags) || !tags.length) {
return;
}

const cid = await Topics.getTopicField(tid, 'cid');
const topicSets = tags.map(tag => `tag:${tag}:topics`).concat(
tags.map(tag => `cid:${cid}:tag:${tag}:topics`)
);
const topicSets = generateTopicSets(tags, cid);
await db.sortedSetsAdd(topicSets, timestamp, tid);
await Topics.updateCategoryTagsCount([cid], tags);
await Promise.all(tags.map(updateTagCount));
await updateTagCountsForAll(tags);
};

function generateTopicSets(tags, cid) {
return tags.map(tag => `tag:${tag}:topics`).concat(
tags.map(tag => `cid:${cid}:tag:${tag}:topics`)
);
}
async function updateTagCountsForAll(tags) {
await Promise.all(tags.map(updateTagCount));
}
Topics.filterTags = async function (tags, cid) {
const result = await plugins.hooks.fire('filter:tags.filter', { tags: tags, cid: cid });
tags = _.uniq(result.tags)
Expand Down Expand Up @@ -65,36 +70,42 @@
cids.map(cid => `cid:${cid}:tags`), '-inf', 0
);
};

console.log("dcharkvi")

Check failure on line 73 in src/topics/tags.js

View workflow job for this annotation

GitHub Actions / test 

Strings must use singlequote

Check failure on line 73 in src/topics/tags.js

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon
Topics.validateTags = async function (tags, cid, uid, tid = null) {
if (!Array.isArray(tags)) {
throw new Error('[[error:invalid-data]]');
}
tags = _.uniq(tags);
const [categoryData, isPrivileged, currentTags] = await Promise.all([
const [categoryData, isPrivileged, currentTags] = await getValidationData(tags, cid, uid, tid);
validateTagCount(tags, categoryData);
await validateSystemTags(tags, currentTags, isPrivileged);
};
async function getValidationData(tags, cid, uid, tid) {
return await Promise.all([
categories.getCategoryFields(cid, ['minTags', 'maxTags']),
user.isPrivileged(uid),
tid ? Topics.getTopicTags(tid) : [],
]);
}
function validateTagCount(tags, categoryData) {
if (tags.length < parseInt(categoryData.minTags, 10)) {
throw new Error(`[[error:not-enough-tags, ${categoryData.minTags}]]`);
} else if (tags.length > parseInt(categoryData.maxTags, 10)) {
throw new Error(`[[error:too-many-tags, ${categoryData.maxTags}]]`);
}

}
async function validateSystemTags(tags, currentTags, isPrivileged) {
const addedTags = tags.filter(tag => !currentTags.includes(tag));
const removedTags = currentTags.filter(tag => !tags.includes(tag));
const systemTags = (meta.config.systemTags || '').split(',');

if (!isPrivileged && systemTags.length && addedTags.length && addedTags.some(tag => systemTags.includes(tag))) {
const systemTags = (meta.config.systemTags || '').split(',').map(tag => tag.trim()).filter(Boolean);
if (!isPrivileged && systemTags.length && addedTags.some(tag => systemTags.includes(tag))) {
throw new Error('[[error:cant-use-system-tag]]');
}

if (!isPrivileged && systemTags.length && removedTags.length && removedTags.some(tag => systemTags.includes(tag))) {
if (!isPrivileged && systemTags.length && removedTags.some(tag => systemTags.includes(tag))) {
throw new Error('[[error:cant-remove-system-tag]]');
}
};

}
console.log('dcharkvi')

Check failure on line 108 in src/topics/tags.js

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon
async function filterCategoryTags(tags, cid) {
const tagWhitelist = await categories.getTagWhitelist([cid]);
if (!Array.isArray(tagWhitelist[0]) || !tagWhitelist[0].length) {
Expand All @@ -103,7 +114,6 @@
const whitelistSet = new Set(tagWhitelist[0]);
return tags.filter(tag => whitelistSet.has(tag));
}

Topics.createEmptyTag = async function (tag) {
if (!tag) {
throw new Error('[[error:invalid-tag]]');
Expand All @@ -124,67 +134,55 @@
.map(cid => ([`cid:${cid}:tags`, 0, tag]));
await db.sortedSetAddBulk(bulkAdd);
};

console.log('dcharkvi')

Check failure on line 137 in src/topics/tags.js

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon
Topics.renameTags = async function (data) {
for (const tagData of data) {
// eslint-disable-next-line no-await-in-loop
await renameTag(tagData.value, tagData.newName);
}
await Promise.all(data.map(tagData => renameTag(tagData.value, tagData.newName)));
};

async function renameTag(tag, newTagName) {
if (!newTagName || tag === newTagName) {
return;
}
newTagName = utils.cleanUpTag(newTagName, meta.config.maximumTagLength);

await Topics.createEmptyTag(newTagName);
const allCids = await processTagForAllTids(tag, newTagName);
await Topics.updateCategoryTagsCount(Object.keys(allCids), [newTagName]);
await updateTagCount(newTagName);
}
console.log('dcharkvi')

Check failure on line 151 in src/topics/tags.js

View workflow job for this annotation

GitHub Actions / test 

Missing semicolon
async function processTagForAllTids(tag, newTagName) {
const allCids = {};

await batch.processSortedSet(`tag:${tag}:topics`, async (tids) => {
const topicData = await Topics.getTopicsFields(tids, ['tid', 'cid', 'tags']);
const cids = topicData.map(t => t.cid);
topicData.forEach((t) => { allCids[t.cid] = true; });
const scores = await db.sortedSetScores(`tag:${tag}:topics`, tids);
// update tag:<tag>:topics
await db.sortedSetAdd(`tag:${newTagName}:topics`, scores, tids);
await db.sortedSetRemove(`tag:${tag}:topics`, tids);

// update cid:<cid>:tag:<tag>:topics
await db.sortedSetAddBulk(topicData.map(
(t, index) => [`cid:${t.cid}:tag:${newTagName}:topics`, scores[index], t.tid]
));
await db.sortedSetRemove(cids.map(cid => `cid:${cid}:tag:${tag}:topics`), tids);

// update 'tags' field in topic hash
topicData.forEach((topic) => {
topic.tags = topic.tags.map(tagItem => tagItem.value);
const index = topic.tags.indexOf(tag);
if (index !== -1) {
topic.tags.splice(index, 1, newTagName);
}
});
await db.setObjectBulk(
topicData.map(t => [`topic:${t.tid}`, { tags: t.tags.join(',') }]),
);
await updateTagTopics(newTagName, tag, scores, tids, topicData, cids);
}, {});
const followers = await db.getSortedSetRangeWithScores(`tag:${tag}:followers`, 0, -1);
if (followers.length) {
const userKeys = followers.map(item => `uid:${item.value}:followed_tags`);
const scores = await db.sortedSetsScore(userKeys, tag);
await db.sortedSetsRemove(userKeys, tag);
await db.sortedSetsAdd(userKeys, scores, newTagName);
await db.sortedSetAdd(
`tag:${newTagName}:followers`,
followers.map(item => item.score),
followers.map(item => item.value),
);
}
await Topics.deleteTag(tag);
await updateTagCount(newTagName);
await Topics.updateCategoryTagsCount(Object.keys(allCids), [newTagName]);
return allCids;
}
async function updateTagTopics(newTagName, tag, scores, tids, topicData, cids) {
await db.sortedSetAdd(`tag:${newTagName}:topics`, scores, tids);
await db.sortedSetRemove(`tag:${tag}:topics`, tids);
// Update cid:<cid>:tag:<newTagName>:topics
await db.sortedSetAddBulk(topicData.map(
(t, index) => [`cid:${t.cid}:tag:${newTagName}:topics`, scores[index], t.tid]
));
await db.sortedSetRemove(cids.map(cid => `cid:${cid}:tag:${tag}:topics`), tids);
// Update 'tags' field in topic hash
await updateTopicHashTags(tids, topicData, tag, newTagName);
}
async function updateTopicHashTags(tids, topicData, oldTag, newTag) {
topicData.forEach((topic) => {
topic.tags = topic.tags.map(tagItem => tagItem.value);
const index = topic.tags.indexOf(oldTag);
if (index !== -1) {
topic.tags.splice(index, 1, newTag);
}
});
await db.setObjectBulk(
topicData.map(t => [`topic:${t.tid}`, { tags: t.tags.join(',') }]),
);
}

async function updateTagCount(tag) {
const count = await Topics.getTagTopicCount(tag);
await db.sortedSetAdd('tags:topic:count', count || 0, tag);
Expand Down
30 changes: 30 additions & 0 deletions test/topics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2503,6 +2503,36 @@ describe('Topic\'s', () => {
const score = await db.sortedSetScore('topics:scheduled', topicData.tid);
assert(!score);
});

it('should throw an error when tags is not an array', (done) => {
const invalidTags = 'notAnArray';
const cid = 1;
const uid = 1;
topics.validateTags(invalidTags, cid, uid)
.then(() => {
done(new Error('Test failed: Expected an error to be thrown'));
})
.catch((err) => {
try {
assert.equal(err.message, '[[error:invalid-data]]');
done();
} catch (assertionErr) {
done(assertionErr);
}
});
});

it('should do nothing if newTagName is null or the same as tag', (done) => {
const tag = 'existingTag';
const newTagName = tag;
topics.renameTags([{ value: tag, newName: newTagName }])
.then(() => {
done();
})
.catch((err) => {
done(new Error(`Test failed: Unexpected error was thrown - ${err.message}`));
});
});
});
});

Expand Down
Loading