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

feat: #7964, change all categories at once

Browse Source 
allow passing cids to setCategoryWatchState and category.exists
This commit is contained in:
Baris Usakli
2019-10-11 15:25:41 -04:00
parent 0da4f7ee8d
commit 485fbd2f14
5 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/user.json
View File

@@ -28,6 +28,7 @@
"reputation": "Reputation", "reputation": "Reputation",
"bookmarks":"Bookmarks", "bookmarks":"Bookmarks",
"watched_categories": "Watched categories", "watched_categories": "Watched categories",
"change_all": "Change All",
"watched": "Watched", "watched": "Watched",
"ignored": "Ignored", "ignored": "Ignored",
"default-category-watch-state": "Default category watch state", "default-category-watch-state": "Default category watch state",

42
public/src/client/account/categories.js
View File

@@ -10,6 +10,21 @@ define('forum/account/categories', ['forum/account/header'], function (header) {
ajaxify.data.categories.forEach(function (category) { ajaxify.data.categories.forEach(function (category) {
handleIgnoreWatch(category.cid); handleIgnoreWatch(category.cid);
}); });
$('[component="category/watch/all"]').find('[component="category/watching"], [component="category/ignoring"], [component="category/notwatching"]').on('click', function () {
var cids = [];
var state = $(this).attr('data-state');
$('[data-parent-cid="0"]').each(function (index, el) {
cids.push($(el).attr('data-cid'));
});
socket.emit('categories.setWatchState', { cid: cids, state: state, uid: ajaxify.data.uid }, function (err, modified_cids) {
if (err) {
return app.alertError(err.message);
}
updateDropdowns(modified_cids, state);
});
});
}; };
function handleIgnoreWatch(cid) { function handleIgnoreWatch(cid) {
@@ -22,23 +37,26 @@ define('forum/account/categories', ['forum/account/header'], function (header) {
if (err) { if (err) {
return app.alertError(err.message); return app.alertError(err.message);
} }
updateDropdowns(modified_cids, state);
modified_cids.forEach(function (cid) {
var category = $('[data-cid="' + cid + '"]');
category.find('[component="category/watching/menu"]').toggleClass('hidden', state !== 'watching');
category.find('[component="category/watching/check"]').toggleClass('fa-check', state === 'watching');
category.find('[component="category/notwatching/menu"]').toggleClass('hidden', state !== 'notwatching');
category.find('[component="category/notwatching/check"]').toggleClass('fa-check', state === 'notwatching');
category.find('[component="category/ignoring/menu"]').toggleClass('hidden', state !== 'ignoring');
category.find('[component="category/ignoring/check"]').toggleClass('fa-check', state === 'ignoring');
});
app.alertSuccess('[[category:' + state + '.message]]'); app.alertSuccess('[[category:' + state + '.message]]');
}); });
}); });
} }
function updateDropdowns(modified_cids, state) {
modified_cids.forEach(function (cid) {
var category = $('[data-cid="' + cid + '"]');
category.find('[component="category/watching/menu"]').toggleClass('hidden', state !== 'watching');
category.find('[component="category/watching/check"]').toggleClass('fa-check', state === 'watching');
category.find('[component="category/notwatching/menu"]').toggleClass('hidden', state !== 'notwatching');
category.find('[component="category/notwatching/check"]').toggleClass('fa-check', state === 'notwatching');
category.find('[component="category/ignoring/menu"]').toggleClass('hidden', state !== 'ignoring');
category.find('[component="category/ignoring/check"]').toggleClass('fa-check', state === 'ignoring');
});
}
return Categories; return Categories;
}); });

3
src/categories/index.js
View File

@@ -23,6 +23,9 @@ require('./update')(Categories);
require('./watch')(Categories); require('./watch')(Categories);
Categories.exists = async function (cid) { Categories.exists = async function (cid) {
if (Array.isArray(cid)) {
return await db.exists(cid.map(cid => 'category:' + cid));
}
return await db.exists('category:' + cid); return await db.exists('category:' + cid);
}; };

8
src/socket.io/categories.js
View File

@@ -105,8 +105,8 @@ SocketCategories.setWatchState = async function (socket, data) {
if (!data || !data.cid || !data.state) { if (!data || !data.cid || !data.state) {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');
} }
return await ignoreOrWatch(async function (uid, cid) { return await ignoreOrWatch(async function (uid, cids) {
await user.setCategoryWatchState(uid, cid, categories.watchStates[data.state]); await user.setCategoryWatchState(uid, cids, categories.watchStates[data.state]);
}, socket, data); }, socket, data);
}; };
@@ -120,7 +120,7 @@ SocketCategories.ignore = async function (socket, data) {
async function ignoreOrWatch(fn, socket, data) { async function ignoreOrWatch(fn, socket, data) {
let targetUid = socket.uid; let targetUid = socket.uid;
const cids = [parseInt(data.cid, 10)]; const cids = Array.isArray(data.cid) ? data.cid.map(cid => parseInt(cid, 10)) : [parseInt(data.cid, 10)];
if (data.hasOwnProperty('uid')) { if (data.hasOwnProperty('uid')) {
targetUid = data.uid; targetUid = data.uid;
} }
@@ -137,7 +137,7 @@ async function ignoreOrWatch(fn, socket, data) {
} }
} while (cat); } while (cat);
await Promise.all(cids.map(cid => fn(targetUid, cid))); await fn(targetUid, cids);
await topics.pushUnreadCount(targetUid); await topics.pushUnreadCount(targetUid);
return cids; return cids;
} }

9
src/user/categories.js
View File

@@ -6,7 +6,7 @@ const db = require('../database');
const categories = require('../categories'); const categories = require('../categories');
module.exports = function (User) { module.exports = function (User) {
User.setCategoryWatchState = async function (uid, cid, state) { User.setCategoryWatchState = async function (uid, cids, state) {
if (!(parseInt(uid, 10) > 0)) { if (!(parseInt(uid, 10) > 0)) {
return; return;
} }
@@ -14,11 +14,12 @@ module.exports = function (User) {
if (!isStateValid) { if (!isStateValid) {
throw new Error('[[error:invalid-watch-state]]'); throw new Error('[[error:invalid-watch-state]]');
} }
const exists = await categories.exists(cid); cids = Array.isArray(cids) ? cids : [cids];
if (!exists) { const exists = await categories.exists(cids);
if (exists.includes(false)) {
throw new Error('[[error:no-category]]'); throw new Error('[[error:no-category]]');
} }
await db.sortedSetAdd('cid:' + cid + ':uid:watch:state', state, uid); await db.sortedSetsAdd(cids.map(cid => 'cid:' + cid + ':uid:watch:state'), state, uid);
}; };
User.getCategoryWatchState = async function (uid) { User.getCategoryWatchState = async function (uid) {