mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-17 22:10:23 +01:00
feat: remove deprecated hooks
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
|
||||
const user = require('../../user');
|
||||
const meta = require('../../meta');
|
||||
const plugins = require('../../plugins');
|
||||
const helpers = require('../helpers');
|
||||
const groups = require('../../groups');
|
||||
const accountHelpers = require('./helpers');
|
||||
@@ -67,9 +66,7 @@ editController.get = async function (req, res, next) {
|
||||
},
|
||||
]);
|
||||
userData.editButtons = [];
|
||||
|
||||
const result = await plugins.fireHook('filter:user.account.edit', userData);
|
||||
res.render('account/edit', result);
|
||||
res.render('account/edit', userData);
|
||||
};
|
||||
|
||||
editController.password = async function (req, res, next) {
|
||||
|
||||
@@ -56,11 +56,9 @@ notificationsController.get = async function (req, res, next) {
|
||||
nids = nids.slice(start, stop + 1);
|
||||
|
||||
const notifications = await user.notifications.getNotifications(nids, req.uid);
|
||||
const data = await plugins.fireHook('filter:notifications.get', {
|
||||
notifications: notifications,
|
||||
});
|
||||
|
||||
res.render('notifications', {
|
||||
notifications: data.notifications,
|
||||
notifications: notifications,
|
||||
pagination: pagination.create(page, pageCount, req.query),
|
||||
filters: allFilters,
|
||||
regularFilters: regularFilters,
|
||||
|
||||
@@ -6,7 +6,6 @@ const db = require('../../database');
|
||||
const user = require('../../user');
|
||||
const posts = require('../../posts');
|
||||
const categories = require('../../categories');
|
||||
const plugins = require('../../plugins');
|
||||
const meta = require('../../meta');
|
||||
const accountHelpers = require('./helpers');
|
||||
const helpers = require('../helpers');
|
||||
@@ -58,8 +57,7 @@ profileController.get = async function (req, res, next) {
|
||||
userData.selectedGroup = userData.groups.filter(group => group && userData.groupTitleArray.includes(group.name))
|
||||
.sort((a, b) => userData.groupTitleArray.indexOf(a.name) - userData.groupTitleArray.indexOf(b.name));
|
||||
|
||||
const results = await plugins.fireHook('filter:user.account', { userData: userData, uid: req.uid });
|
||||
res.render('account/profile', results.userData);
|
||||
res.render('account/profile', userData);
|
||||
};
|
||||
|
||||
async function incrementProfileViews(req, userData) {
|
||||
|
||||
@@ -8,7 +8,6 @@ const meta = require('../meta');
|
||||
const topics = require('../topics');
|
||||
const posts = require('../posts');
|
||||
const privileges = require('../privileges');
|
||||
const plugins = require('../plugins');
|
||||
const helpers = require('./helpers');
|
||||
const pagination = require('../pagination');
|
||||
const utils = require('../utils');
|
||||
@@ -69,8 +68,6 @@ topicsController.get = async function getTopic(req, res, callback) {
|
||||
|
||||
topics.modifyPostsByPrivilege(topicData, userPrivileges);
|
||||
|
||||
const hookData = await plugins.fireHook('filter:controllers.topic.get', { topicData: topicData, uid: req.uid });
|
||||
|
||||
topicData.privileges = userPrivileges;
|
||||
topicData.topicStaleDays = meta.config.topicStaleDays;
|
||||
topicData['reputation:disabled'] = meta.config['reputation:disabled'];
|
||||
@@ -91,7 +88,7 @@ topicsController.get = async function getTopic(req, res, callback) {
|
||||
topicData.postIndex = postIndex;
|
||||
|
||||
await Promise.all([
|
||||
buildBreadcrumbs(hookData.topicData),
|
||||
buildBreadcrumbs(topicData),
|
||||
addTags(topicData, req, res),
|
||||
]);
|
||||
|
||||
|
||||
@@ -26,10 +26,6 @@ function requireSharp() {
|
||||
|
||||
image.isFileTypeAllowed = async function (path) {
|
||||
const plugins = require('./plugins');
|
||||
// deprecated: remove in 1.14.0
|
||||
if (plugins.hasListeners('filter:file.isFileTypeAllowed')) {
|
||||
return await plugins.fireHook('filter:file.isFileTypeAllowed', path);
|
||||
}
|
||||
if (plugins.hasListeners('filter:image.isFileTypeAllowed')) {
|
||||
return await plugins.fireHook('filter:image.isFileTypeAllowed', path);
|
||||
}
|
||||
|
||||
@@ -6,11 +6,7 @@ const utils = require('../utils');
|
||||
|
||||
module.exports = function (Plugins) {
|
||||
Plugins.deprecatedHooks = {
|
||||
'filter:controllers.topic.get': 'filter:topic.build',
|
||||
'filter:user.account': 'filter:account/profile.build',
|
||||
'filter:user.account.edit': 'filter:account/edit.build',
|
||||
'filter:notifications.get': 'filter:notifications.build',
|
||||
'filter:file.isFileTypeAllowed': 'filter:image.isFileTypeAllowed',
|
||||
|
||||
};
|
||||
|
||||
Plugins.internals = {
|
||||
|
||||
Reference in New Issue
Block a user