Skip to content

Refactor (src/user/categories.js): reduce nesting in module.exports #163

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

Closed
tenTilMidnight wants to merge 9 commits into from
Closed

Refactor (src/user/categories.js): reduce nesting in module.exports #163

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f77bf1
reduced nesting and created triggers
tenTilMidnight Jan 23, 2026
d8d1255
fixed too many parameters smell
tenTilMidnight Jan 23, 2026
096ed65
indentation
tenTilMidnight Jan 23, 2026
932a568
indentation
tenTilMidnight Jan 23, 2026
6aa1347
indentation
tenTilMidnight Jan 23, 2026
640d0f7
indentation
tenTilMidnight Jan 23, 2026
01ac945
deleted comments
tenTilMidnight Jan 23, 2026
4184dd9
added my name to console output
tenTilMidnight Jan 24, 2026
3ff5ed0
fixed lint error
tenTilMidnight Jan 24, 2026
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
109 changes: 65 additions & 44 deletions src/user/categories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,60 @@ const activitypub = require('../activitypub');
const plugins = require('../plugins');
const utils = require('../utils');


console.log('Grace Tian');

async function getCategoryWatchState(User, uid) {
if (!(parseInt(uid, 10) > 0)) {
return {};
}

const cids = await categories.getAllCidsFromSet('categories:cid');
const states = await categories.getWatchState(cids, uid);
return _.zipObject(cids, states);
};

async function getIgnoredCategories(User, uid) {
if (!(parseInt(uid, 10) > 0)) {
return [];
}
const cids = await User.getCategoriesByStates(uid, [categories.watchStates.ignoring]);
const result = await plugins.hooks.fire('filter:user.getIgnoredCategories', {
uid: uid,
cids: cids,
});
return result.cids;
};

async function getWatchedCategories(User, uid) {
if (!(parseInt(uid, 10) > 0)) {
return [];
}
let cids = await User.getCategoriesByStates(uid, [categories.watchStates.watching]);
const categoryData = await categories.getCategoriesFields(cids, ['disabled']);
cids = cids.filter((cid, index) => categoryData[index] && !categoryData[index].disabled);
const result = await plugins.hooks.fire('filter:user.getWatchedCategories', {
uid: uid,
cids: cids,
});
return result.cids;
};

async function getCategoriesByStates(User, uid, states) {
const [localCids, remoteCids] = await Promise.all([
categories.getAllCidsFromSet('categories:cid'),
meta.config.activitypubEnabled ? db.getObjectValues('handle:cid') : [],
]);
const cids = localCids.concat(remoteCids);
if (!(parseInt(uid, 10) > 0)) {
return cids;
}
const userState = await categories.getWatchState(cids, uid);
return cids.filter((cid, index) => states.includes(userState[index]));
};

console.log('Grace Tian');

module.exports = function (User) {
User.setCategoryWatchState = async function (uid, cids, state) {
if (utils.isNumber(uid) && parseInt(uid, 10) <= 0) {
Expand Down Expand Up @@ -39,54 +93,21 @@ module.exports = function (User) {
]);
};

User.getCategoryWatchState = async function (uid) {
if (!(parseInt(uid, 10) > 0)) {
return {};
}
console.log('Grace Tian');

const cids = await categories.getAllCidsFromSet('categories:cid');
const states = await categories.getWatchState(cids, uid);
return _.zipObject(cids, states);
};
User.getCategoryWatchState = uid =>
getCategoryWatchState(User, uid);

User.getIgnoredCategories = async function (uid) {
if (!(parseInt(uid, 10) > 0)) {
return [];
}
const cids = await User.getCategoriesByStates(uid, [categories.watchStates.ignoring]);
const result = await plugins.hooks.fire('filter:user.getIgnoredCategories', {
uid: uid,
cids: cids,
});
return result.cids;
};
User.getIgnoredCategories = uid =>
getIgnoredCategories(User, uid);

User.getWatchedCategories = async function (uid) {
if (!(parseInt(uid, 10) > 0)) {
return [];
}
let cids = await User.getCategoriesByStates(uid, [categories.watchStates.watching]);
const categoryData = await categories.getCategoriesFields(cids, ['disabled']);
cids = cids.filter((cid, index) => categoryData[index] && !categoryData[index].disabled);
const result = await plugins.hooks.fire('filter:user.getWatchedCategories', {
uid: uid,
cids: cids,
});
return result.cids;
};
User.getWatchedCategories = uid =>
getWatchedCategories(User, uid);

User.getCategoriesByStates = async function (uid, states) {
const [localCids, remoteCids] = await Promise.all([
categories.getAllCidsFromSet('categories:cid'),
meta.config.activitypubEnabled ? db.getObjectValues('handle:cid') : [],
]);
const cids = localCids.concat(remoteCids);
if (!(parseInt(uid, 10) > 0)) {
return cids;
}
const userState = await categories.getWatchState(cids, uid);
return cids.filter((cid, index) => states.includes(userState[index]));
};
User.getCategoriesByStates = (uid, state) =>
getCategoriesByStates(User, uid, state);

console.log('Grace Tian');

User.ignoreCategory = async function (uid, cid) {
await User.setCategoryWatchState(uid, cid, categories.watchStates.ignoring);
Expand Down