Compare commits

..

21 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
bd9f0077c1 perf: bypass getMultipleUserSettings 2021-07-07 10:06:34 -04:00
Barış Soner Uşaklı
b9d0219499 Merge branch 'paginate-notifications-fix-backport' of https://github.com/NodeBB/NodeBB into paginate-notifications-fix-backport 2021-07-05 10:12:06 -04:00
Barış Soner Uşaklı
7282e39e74 fix: conflicts 2021-07-05 10:11:42 -04:00
Barış Soner Uşaklı
dd04e56e00 fix: #9629, translate content property of meta tags 2021-06-23 11:04:50 -04:00
Barış Soner Uşaklı
9bc3faacde fix: toPid check 2021-06-23 10:14:39 -04:00
Barış Soner Uşaklı
44d9ac2a95 merge: fix conflicts 2021-06-22 15:32:22 -04:00
Barış Soner Uşaklı
be01951c41 merge 2021-06-18 12:43:18 -04:00
Barış Soner Uşaklı
9095057223 merge 2021-06-18 12:41:51 -04:00
Barış Soner Uşaklı
efc4fc3ddc fix: merge 2021-06-18 09:57:28 -04:00
Barış Soner Uşaklı
18a5f7d568 fix: keep query params when switching chat 2021-06-16 09:55:45 -04:00
Barış Soner Uşaklı
38b0b3e5f7 fix: lint 2021-06-01 11:32:18 -04:00
Barış Soner Uşaklı
8e23b9d766 feat: allow modifying default category privileges 2021-06-01 11:31:40 -04:00
Barış Soner Uşaklı
f6370cd6f5 fix: return null 2021-05-28 12:33:13 -04:00
Barış Soner Uşaklı
becff8bc22 feat: add filter:notifications.create 2021-05-28 12:32:15 -04:00
Barış Soner Uşaklı
d168790612 feat: add filter:categories.getSelectCategories
pass query to emits
2021-05-28 11:28:44 -04:00
Barış Soner Uşaklı
a852b374e9 feat: pass req.query to getUnreadData 2021-05-27 10:17:16 -04:00
Barış Soner Uşaklı
55835b3b72 feat: merge 2021-05-25 12:54:12 -04:00
Barış Soner Uşaklı
a79707ef9a fix: merge 2021-05-25 12:13:26 -04:00
Barış Soner Uşaklı
a68fc1dc50 feat: add req.query to flags.list/getCount 2021-05-19 10:11:37 -04:00
Barış Soner Uşaklı
536b66dc89 feat: add filter:flags.getFlagIdsWithFilters 2021-05-18 11:00:26 -04:00
Barış Soner Uşaklı
75d60bfaf2 feat: add filter:user.getWatchedCategories 2021-05-17 12:12:57 -04:00
25 changed files with 282 additions and 176 deletions

View File

@@ -99,7 +99,7 @@ define('admin/manage/categories', [
}
Categories.throwCreateModal = function () {
socket.emit('categories.getSelectCategories', {}, function (err, categories) {
socket.emit('categories.getSelectCategories', { query: utils.params() }, function (err, categories) {
if (err) {
return app.alertError(err.message);
}

View File

@@ -114,7 +114,7 @@ define('admin/manage/category', [
});
$('.copy-settings').on('click', function () {
socket.emit('categories.getSelectCategories', {}, function (err, allCategories) {
socket.emit('categories.getSelectCategories', { query: utils.params() }, function (err, allCategories) {
if (err) {
return app.alertError(err.message);
}
@@ -261,7 +261,7 @@ define('admin/manage/category', [
}
Category.launchParentSelector = function () {
socket.emit('categories.getSelectCategories', {}, function (err, allCategories) {
socket.emit('categories.getSelectCategories', { query: utils.params() }, function (err, allCategories) {
if (err) {
return app.alertError(err.message);
}

View File

@@ -229,22 +229,25 @@ ajaxify = window.ajaxify || {};
.forEach(function (el) {
document.head.removeChild(el);
});
// Add new meta tags
ajaxify.data._header.tags.meta
.filter(function (tagObj) {
var name = tagObj.name || tagObj.property;
return metaWhitelist.some(function (exp) {
return !!exp.test(name);
require(['translator'], function (translator) {
// Add new meta tags
ajaxify.data._header.tags.meta
.filter(function (tagObj) {
var name = tagObj.name || tagObj.property;
return metaWhitelist.some(function (exp) {
return !!exp.test(name);
});
}).forEach(async function (tagObj) {
if (tagObj.content) {
tagObj.content = await translator.translate(tagObj.content);
}
var metaEl = document.createElement('meta');
Object.keys(tagObj).forEach(function (prop) {
metaEl.setAttribute(prop, tagObj[prop]);
});
document.head.appendChild(metaEl);
});
})
.forEach(function (tagObj) {
var metaEl = document.createElement('meta');
Object.keys(tagObj).forEach(function (prop) {
metaEl.setAttribute(prop, tagObj[prop]);
});
document.head.appendChild(metaEl);
});
});
// Delete the old link tags
Array.prototype.slice

View File

@@ -416,7 +416,7 @@ define('forum/chats', [
roomid = '';
}
var url = 'user/' + ajaxify.data.userslug + '/chats/' + roomid;
var url = 'user/' + ajaxify.data.userslug + '/chats/' + roomid + window.location.search;
if (self.fetch) {
fetch(config.relative_path + '/api/' + url, { credentials: 'include' })
.then(function (response) {

View File

@@ -12,7 +12,7 @@ define('forum/topic/move', ['categorySelector', 'alerts'], function (categorySel
Move.onComplete = onComplete;
Move.moveAll = !tids;
socket.emit('categories.getMoveCategories', onCategoriesLoaded);
socket.emit('categories.getMoveCategories', { query: utils.params() }, onCategoriesLoaded);
};
function onCategoriesLoaded(err, categories) {

View File

@@ -10,6 +10,13 @@ const socketHelpers = require('../socket.io/helpers');
const websockets = require('../socket.io');
const events = require('../events');
exports.setDefaultPostData = function (reqOrSocket, data) {
data.uid = reqOrSocket.uid;
data.req = exports.buildReqObject(reqOrSocket, { ...data });
data.timestamp = Date.now();
data.fromQueue = false;
};
// creates a slimmed down version of the request object
exports.buildReqObject = (req, payload) => {
req = req || {};

View File

@@ -33,10 +33,7 @@ topicsAPI.create = async function (caller, data) {
const payload = { ...data };
payload.tags = payload.tags || [];
payload.uid = caller.uid;
payload.req = apiHelpers.buildReqObject(caller);
payload.timestamp = Date.now();
payload.fromQueue = false;
apiHelpers.setDefaultPostData(caller, payload);
// Blacklist & Post Queue
await meta.blacklist.test(caller.ip);
@@ -57,16 +54,8 @@ topicsAPI.create = async function (caller, data) {
};
topicsAPI.reply = async function (caller, data) {
var payload = {
tid: data.tid,
uid: caller.uid,
req: apiHelpers.buildReqObject(caller), // For IP recording
content: data.content,
timestamp: Date.now(),
fromQueue: false,
};
if (data.toPid) { payload.toPid = data.toPid; }
const payload = { ...data };
apiHelpers.setDefaultPostData(caller, payload);
// Blacklist & Post Queue
await meta.blacklist.test(caller.ip);

View File

@@ -45,16 +45,6 @@ module.exports = function (Categories) {
category.backgroundImage = data.backgroundImage;
}
const result = await plugins.hooks.fire('filter:category.create', { category: category, data: data });
category = result.category;
await db.setObject('category:' + category.cid, category);
if (!category.descriptionParsed) {
await Categories.parseDescription(category.cid, category.description);
}
await db.sortedSetsAdd(['categories:cid', 'cid:' + parentCid + ':children'], category.order, category.cid);
const defaultPrivileges = [
'groups:find',
'groups:read',
@@ -70,12 +60,35 @@ module.exports = function (Categories) {
'groups:topics:delete',
];
const modPrivileges = defaultPrivileges.concat([
'groups:topics:schedule',
'groups:posts:view_deleted',
'groups:purge',
]);
await privileges.categories.give(defaultPrivileges, category.cid, 'registered-users');
await privileges.categories.give(modPrivileges, category.cid, ['administrators', 'Global Moderators']);
await privileges.categories.give(['groups:find', 'groups:read', 'groups:topics:read'], category.cid, ['guests', 'spiders']);
const guestPrivileges = ['groups:find', 'groups:read', 'groups:topics:read'];
const result = await plugins.hooks.fire('filter:category.create', {
category: category,
data: data,
defaultPrivileges: defaultPrivileges,
modPrivileges: modPrivileges,
guestPrivileges: guestPrivileges,
});
category = result.category;
await db.setObject(`category:${category.cid}`, category);
if (!category.descriptionParsed) {
await Categories.parseDescription(category.cid, category.description);
}
await db.sortedSetAddBulk([
['categories:cid', category.order, category.cid],
[`cid:${parentCid}:children`, category.order, category.cid],
['categories:name', 0, `${data.name.substr(0, 200).toLowerCase()}:${category.cid}`],
]);
await privileges.categories.give(result.defaultPrivileges, category.cid, 'registered-users');
await privileges.categories.give(result.modPrivileges, category.cid, ['administrators', 'Global Moderators']);
await privileges.categories.give(result.guestPrivileges, category.cid, ['guests', 'spiders']);
cache.del(['categories:cid', 'cid:' + parentCid + ':children']);
if (data.cloneFromCid && parseInt(data.cloneFromCid, 10)) {

View File

@@ -7,6 +7,7 @@ const validator = require('validator');
const meta = require('../meta');
const plugins = require('../plugins');
const middleware = require('../middleware');
const helpers = require('../middleware/helpers');
exports.handle404 = function handle404(req, res) {
const relativePath = nconf.get('relative_path');
@@ -22,7 +23,13 @@ exports.handle404 = function handle404(req, res) {
if (isClientScript.test(req.url)) {
res.type('text/javascript').status(404).send('Not Found');
} else if (req.path.startsWith(relativePath + '/assets/uploads') || (req.get('accept') && !req.get('accept').includes('text/html')) || req.path === '/favicon.ico') {
} else if (
!res.locals.isAPI && (
req.path.startsWith(`${relativePath}/assets/uploads`) ||
(req.get('accept') && !req.get('accept').includes('text/html')) ||
req.path === '/favicon.ico'
)
) {
meta.errors.log404(req.path || '');
res.sendStatus(404);
} else if (req.accepts('html')) {
@@ -41,8 +48,16 @@ exports.send404 = async function (req, res) {
res.status(404);
const path = String(req.path || '');
if (res.locals.isAPI) {
return res.json({ path: validator.escape(path.replace(/^\/api/, '')), title: '[[global:404.title]]' });
return res.json({
path: validator.escape(path.replace(/^\/api/, '')),
title: '[[global:404.title]]',
bodyClass: helpers.buildBodyClass(req, res),
});
}
await middleware.buildHeaderAsync(req, res);
res.render('404', { path: validator.escape(path), title: '[[global:404.title]]' });
await res.render('404', {
path: validator.escape(path),
title: '[[global:404.title]]',
bodyClass: helpers.buildBodyClass(req, res),
});
};

View File

@@ -3,6 +3,7 @@
const nconf = require('nconf');
const validator = require('validator');
const qs = require('querystring');
const db = require('../database');
const privileges = require('../privileges');
@@ -42,7 +43,7 @@ categoryController.get = async function (req, res, next) {
return next();
}
if (topicIndex < 0) {
return helpers.redirect(res, '/category/' + categoryFields.slug);
return helpers.redirect(res, `/category/${categoryFields.slug}?${qs.stringify(req.query)}`);
}
if (!userPrivileges.read) {
@@ -50,7 +51,7 @@ categoryController.get = async function (req, res, next) {
}
if (!res.locals.isAPI && !req.params.slug && (categoryFields.slug && categoryFields.slug !== `${cid}/`)) {
return helpers.redirect(res, `/category/${categoryFields.slug}`, true);
return helpers.redirect(res, `/category/${categoryFields.slug}?${qs.stringify(req.query)}`, true);
}
if (categoryFields.link) {
@@ -86,7 +87,7 @@ categoryController.get = async function (req, res, next) {
}
if (topicIndex > Math.max(categoryData.topic_count - 1, 0)) {
return helpers.redirect(res, '/category/' + categoryData.slug + '/' + categoryData.topic_count);
return helpers.redirect(res, `/category/${categoryData.slug}/${categoryData.topic_count}?${qs.stringify(req.query)}`);
}
const pageCount = Math.max(1, Math.ceil(categoryData.topic_count / userSettings.topicsPerPage));
if (userSettings.usePagination && currentPage > pageCount) {

View File

@@ -1,10 +1,11 @@
'use strict';
var nconf = require('nconf');
var winston = require('winston');
var validator = require('validator');
var plugins = require('../plugins');
var middleware = require('../middleware');
const nconf = require('nconf');
const winston = require('winston');
const validator = require('validator');
const plugins = require('../plugins');
const middleware = require('../middleware');
const helpers = require('../middleware/helpers');
exports.handleURIErrors = async function handleURIErrors(err, req, res, next) {
// Handle cases where malformed URIs are passed in
@@ -56,12 +57,17 @@ exports.handleErrors = function handleErrors(err, req, res, next) { // eslint-di
res.status(status || 500);
var path = String(req.path || '');
const path = String(req.path || '');
const data = {
path: validator.escape(path),
error: validator.escape(String(err.message)),
bodyClass: helpers.buildBodyClass(req, res),
};
if (res.locals.isAPI) {
res.json({ path: validator.escape(path), error: err.message });
res.json(data);
} else {
await middleware.buildHeaderAsync(req, res);
res.render('500', { path: validator.escape(path), error: validator.escape(String(err.message)) });
res.render('500', data);
}
};

View File

@@ -106,6 +106,7 @@ modsController.flags.list = async function (req, res, next) {
filters: filters,
sort: sort,
uid: req.uid,
query: req.query,
}),
analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30),
categories.buildForSelect(req.uid, 'read'),

View File

@@ -121,13 +121,13 @@ Flags.get = async function (flagId) {
return data.flag;
};
Flags.getCount = async function ({ uid, filters }) {
Flags.getCount = async function ({ uid, filters, query }) {
filters = filters || {};
const flagIds = await Flags.getFlagIdsWithFilters({ filters, uid });
const flagIds = await Flags.getFlagIdsWithFilters({ filters, uid, query });
return flagIds.length;
};
Flags.getFlagIdsWithFilters = async function ({ filters, uid }) {
Flags.getFlagIdsWithFilters = async function ({ filters, uid, query }) {
let sets = [];
const orSets = [];
@@ -164,7 +164,13 @@ Flags.getFlagIdsWithFilters = async function ({ filters, uid }) {
}
}
return flagIds;
const result = await plugins.hooks.fire('filter:flags.getFlagIdsWithFilters', {
filters,
uid,
query,
flagIds,
});
return result.flagIds;
};
Flags.list = async function (data) {
@@ -172,6 +178,7 @@ Flags.list = async function (data) {
let flagIds = await Flags.getFlagIdsWithFilters({
filters,
uid: data.uid,
query: data.query,
});
flagIds = await Flags.sort(flagIds, data.sort);

View File

@@ -109,6 +109,7 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
unreadCount: templateValues.unreadCount,
} = await appendUnreadCounts({
uid: req.uid,
query: req.query,
navigation: results.navigation,
unreadData,
}));
@@ -152,16 +153,17 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
return await req.app.renderAsync('header', hookReturn.templateValues);
};
async function appendUnreadCounts({ uid, navigation, unreadData }) {
async function appendUnreadCounts({ uid, navigation, unreadData, query }) {
const originalRoutes = navigation.map(nav => nav.originalRoute);
const calls = {
unreadData: topics.getUnreadData({ uid: uid }),
unreadData: topics.getUnreadData({ uid: uid, query: query }),
unreadChatCount: messaging.getUnreadCount(uid),
unreadNotificationCount: user.notifications.getUnreadCount(uid),
unreadFlagCount: (async function () {
if (originalRoutes.includes('/flags') && await user.isPrivileged(uid)) {
return flags.getCount({
uid,
query,
filters: {
quick: 'unresolved',
cid: (await user.isAdminOrGlobalMod(uid)) ? [] : (await user.getModeratedCids(uid)),

View File

@@ -1,5 +1,9 @@
'use strict';
const winston = require('winston');
const validator = require('validator');
const slugify = require('../slugify');
const helpers = module.exports;
helpers.try = function (middleware) {
@@ -20,3 +24,34 @@ helpers.try = function (middleware) {
}
};
};
helpers.buildBodyClass = function (req, res, templateData = {}) {
const clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, '');
const parts = clean.split('/').slice(0, 3);
parts.forEach((p, index) => {
try {
p = slugify(decodeURIComponent(p));
} catch (err) {
winston.error(err.stack);
p = '';
}
p = validator.escape(String(p));
parts[index] = index ? `${parts[0]}-${p}` : `page-${p || 'home'}`;
});
if (templateData.template && templateData.template.topic) {
parts.push(`page-topic-category-${templateData.category.cid}`);
parts.push(`page-topic-category-${slugify(templateData.category.name)}`);
}
if (Array.isArray(templateData.breadcrumbs)) {
templateData.breadcrumbs.forEach((crumb) => {
if (crumb && crumb.hasOwnProperty('cid')) {
parts.push(`parent-category-${crumb.cid}`);
}
});
}
parts.push(`page-status-${res.statusCode}`);
return parts.join(' ');
};

View File

@@ -2,88 +2,96 @@
const nconf = require('nconf');
const validator = require('validator');
const winston = require('winston');
const plugins = require('../plugins');
const meta = require('../meta');
const translator = require('../translator');
const widgets = require('../widgets');
const utils = require('../utils');
const slugify = require('../slugify');
const helpers = require('./helpers');
const relative_path = nconf.get('relative_path');
module.exports = function (middleware) {
middleware.processRender = function processRender(req, res, next) {
// res.render post-processing, modified from here: https://gist.github.com/mrlannigan/5051687
const render = res.render;
const { render } = res;
res.render = async function renderOverride(template, options, fn) {
const self = this;
const req = this.req;
options = options || {};
if (typeof options === 'function') {
fn = options;
options = {};
}
options.loggedIn = req.uid > 0;
options.relative_path = relative_path;
options.template = { name: template, [template]: true };
options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
options.bodyClass = buildBodyClass(req, res, options);
const buildResult = await plugins.hooks.fire(`filter:${template}.build`, { req: req, res: res, templateData: options });
if (res.headersSent) {
return;
}
const templateToRender = buildResult.templateData.templateToRender || template;
const renderResult = await plugins.hooks.fire('filter:middleware.render', { req: req, res: res, templateData: buildResult.templateData });
if (res.headersSent) {
return;
}
options = renderResult.templateData;
options._header = {
tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),
};
options.widgets = await widgets.render(req.uid, {
template: template + '.tpl',
url: options.url,
templateData: options,
req: req,
res: res,
});
res.locals.template = template;
options._locals = undefined;
if (res.locals.isAPI) {
if (req.route && req.route.path === '/api/') {
options.title = '[[pages:home]]';
const { req } = this;
async function renderMethod(template, options, fn) {
options = options || {};
if (typeof options === 'function') {
fn = options;
options = {};
}
options.loggedIn = req.uid > 0;
options.relative_path = relative_path;
options.template = { name: template, [template]: true };
options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
options.bodyClass = helpers.buildBodyClass(req, res, options);
const buildResult = await plugins.hooks.fire(`filter:${template}.build`, { req: req, res: res, templateData: options });
if (res.headersSent) {
return;
}
const templateToRender = buildResult.templateData.templateToRender || template;
const renderResult = await plugins.hooks.fire('filter:middleware.render', { req: req, res: res, templateData: buildResult.templateData });
if (res.headersSent) {
return;
}
options = renderResult.templateData;
options._header = {
tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),
};
options.widgets = await widgets.render(req.uid, {
template: `${template}.tpl`,
url: options.url,
templateData: options,
req: req,
res: res,
});
res.locals.template = template;
options._locals = undefined;
if (res.locals.isAPI) {
if (req.route && req.route.path === '/api/') {
options.title = '[[pages:home]]';
}
req.app.set('json spaces', global.env === 'development' || req.query.pretty ? 4 : 0);
return res.json(options);
}
const results = await utils.promiseParallel({
header: renderHeaderFooter('renderHeader', req, res, options),
content: renderContent(render, templateToRender, req, res, options),
footer: renderHeaderFooter('renderFooter', req, res, options),
});
const str = `${results.header +
(res.locals.postHeader || '') +
results.content
}<script id="ajaxify-data" type="application/json">${
JSON.stringify(options).replace(/<\//g, '<\\/')
}</script>${
res.locals.preFooter || ''
}${results.footer}`;
if (typeof fn !== 'function') {
self.send(str);
} else {
fn(null, str);
}
req.app.set('json spaces', global.env === 'development' || req.query.pretty ? 4 : 0);
return res.json(options);
}
const results = await utils.promiseParallel({
header: renderHeaderFooter('renderHeader', req, res, options),
content: renderContent(render, templateToRender, req, res, options),
footer: renderHeaderFooter('renderFooter', req, res, options),
});
const str = results.header +
(res.locals.postHeader || '') +
results.content +
'<script id="ajaxify-data" type="application/json">' +
JSON.stringify(options).replace(/<\//g, '<\\/') +
'</script>' +
(res.locals.preFooter || '') +
results.footer;
if (typeof fn !== 'function') {
self.send(str);
} else {
fn(null, str);
try {
await renderMethod(template, options, fn);
} catch (err) {
next(err);
}
};
@@ -123,34 +131,4 @@ module.exports = function (middleware) {
const translated = await translator.translate(str, language);
return translator.unescape(translated);
}
function buildBodyClass(req, res, templateData) {
const clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, '');
const parts = clean.split('/').slice(0, 3);
parts.forEach(function (p, index) {
try {
p = slugify(decodeURIComponent(p));
} catch (err) {
winston.error(err.stack);
p = '';
}
p = validator.escape(String(p));
parts[index] = index ? parts[0] + '-' + p : 'page-' + (p || 'home');
});
if (templateData.template.topic) {
parts.push('page-topic-category-' + templateData.category.cid);
parts.push('page-topic-category-' + slugify(templateData.category.name));
}
if (templateData.breadcrumbs) {
templateData.breadcrumbs.forEach(function (crumb) {
if (crumb.hasOwnProperty('cid')) {
parts.push('parent-category-' + crumb.cid);
}
});
}
parts.push('page-status-' + res.statusCode);
return parts.join(' ');
}
};

View File

@@ -123,6 +123,12 @@ Notifications.create = async function (data) {
}
const now = Date.now();
data.datetime = now;
const result = await plugins.hooks.fire('filter:notifications.create', {
data: data,
});
if (!result.data) {
return null;
}
await Promise.all([
db.sortedSetAdd('notifications', now, data.nid),
db.setObject('notifications:' + data.nid, data),

View File

@@ -282,7 +282,7 @@ async function getWatchedCids(data) {
if (!data.categories.includes('watched')) {
return [];
}
return await user.getCategoriesByStates(data.uid, [categories.watchStates.watching]);
return await user.getWatchedCategories(data.uid);
}
async function getChildrenCids(data) {

View File

@@ -6,6 +6,7 @@ const user = require('../user');
const topics = require('../topics');
const api = require('../api');
const sockets = require('.');
const plugins = require('../plugins');
const SocketCategories = module.exports;
@@ -94,12 +95,17 @@ SocketCategories.getMoveCategories = async function (socket, data) {
return await SocketCategories.getSelectCategories(socket, data);
};
SocketCategories.getSelectCategories = async function (socket) {
SocketCategories.getSelectCategories = async function (socket, data) {
const [isAdmin, categoriesData] = await Promise.all([
user.isAdministrator(socket.uid),
categories.buildForSelect(socket.uid, 'find', ['disabled', 'link']),
]);
return categoriesData.filter(category => category && (!category.disabled || isAdmin) && !category.link);
const result = await plugins.hooks.fire('filter:categories.getSelectCategories', {
categories: categoriesData,
isAdmin: isAdmin,
query: data.query || {},
});
return result.categories.filter(category => category && (!category.disabled || isAdmin) && !category.link);
};
SocketCategories.setWatchState = async function (socket, data) {

View File

@@ -18,10 +18,8 @@ const apiHelpers = require('../api/helpers');
const SocketHelpers = module.exports;
SocketHelpers.setDefaultPostData = function (data, socket) {
data.uid = socket.uid;
data.req = apiHelpers.buildReqObject(socket);
data.timestamp = Date.now();
data.fromQueue = false;
websockets.warnDeprecated(socket, 'apiHelpers.setDefaultPostData');
apiHelpers.setDefaultPostData(socket, data);
};
SocketHelpers.notifyNew = async function (uid, type, result) {

View File

@@ -10,6 +10,7 @@ const user = require('../user');
const socketHelpers = require('./helpers');
const utils = require('../utils');
const api = require('../api');
const apiHelpers = require('../api/helpers');
const sockets = require('.');
const SocketPosts = module.exports;
@@ -28,7 +29,7 @@ SocketPosts.reply = async function (socket, data) {
throw new Error('[[error:invalid-data]]');
}
socketHelpers.setDefaultPostData(data, socket);
apiHelpers.setDefaultPostData(socket, data);
await meta.blacklist.test(data.req.ip);
const shouldQueue = await posts.shouldQueue(socket.uid, data);
if (shouldQueue) {

View File

@@ -39,7 +39,18 @@ module.exports = function (Topics) {
if (!isAdminOrMod) {
throw new Error('[[error:no-privileges]]');
}
const tid = await Topics.create({ uid: postData.uid, title: title, cid: cid });
const params = {
uid: postData.uid,
title: title,
cid: cid,
};
const result = await plugins.hooks.fire('filter:topic.fork', {
params: params,
tid: postData.tid,
});
const tid = await Topics.create(result.params);
await Topics.updateTopicBookmarks(fromTid, pids);
await async.eachSeries(pids, async function (pid) {

View File

@@ -76,10 +76,21 @@ Topics.getTopicsByTids = async function (tids, options) {
return postData.map(p => p.handle);
}
async function loadShowfullnameSettings() {
if (meta.config.hideFullname) {
return uids.map(() => ({ showfullname: false }));
}
const data = await db.getObjectsFields(uids.map(uid => `user:${uid}:settings`), ['showfullname']);
data.forEach((settings) => {
settings.showfullname = parseInt(settings.showfullname, 10) === 1;
});
return data;
}
const [teasers, users, userSettings, categoriesData, guestHandles, thumbs] = await Promise.all([
Topics.getTeasers(topics, options),
user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status']),
user.getMultipleUserSettings(uids),
loadShowfullnameSettings(),
categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'backgroundImage', 'imageClass', 'bgColor', 'color', 'disabled']),
loadGuestHandles(),
Topics.thumbs.get(tids),
@@ -87,7 +98,7 @@ Topics.getTopicsByTids = async function (tids, options) {
users.forEach((userObj, idx) => {
// Hide fullname if needed
if (meta.config.hideFullname || !userSettings[idx].showfullname) {
if (!userSettings[idx].showfullname) {
userObj.fullname = undefined;
}
});

View File

@@ -45,11 +45,16 @@ module.exports = function (Topics) {
async function createNewTopic(title, oldestTid) {
const topicData = await Topics.getTopicFields(oldestTid, ['uid', 'cid']);
const tid = await Topics.create({
const params = {
uid: topicData.uid,
cid: topicData.cid,
title: title,
};
const result = await plugins.hooks.fire('filter:topic.mergeCreateNewTopic', {
oldestTid: oldestTid,
params: params,
});
const tid = await Topics.create(result.params);
return tid;
}

View File

@@ -4,6 +4,7 @@ const _ = require('lodash');
const db = require('../database');
const categories = require('../categories');
const plugins = require('../plugins');
module.exports = function (User) {
User.setCategoryWatchState = async function (uid, cids, state) {
@@ -36,14 +37,24 @@ module.exports = function (User) {
if (!(parseInt(uid, 10) > 0)) {
return [];
}
return await User.getCategoriesByStates(uid, [categories.watchStates.ignoring]);
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.getWatchedCategories = async function (uid) {
if (!(parseInt(uid, 10) > 0)) {
return [];
}
return await User.getCategoriesByStates(uid, [categories.watchStates.watching]);
const cids = await User.getCategoriesByStates(uid, [categories.watchStates.watching]);
const result = await plugins.hooks.fire('filter:user.getWatchedCategories', {
uid: uid,
cids: cids,
});
return result.cids;
};
User.getCategoriesByStates = async function (uid, states) {