feat: remove deprecated hooks

v1.18.x
Barış Soner Uşaklı 5 years ago
parent 8c498fa1c9
commit 4eae927d14

@ -2,7 +2,6 @@
const user = require('../../user'); const user = require('../../user');
const meta = require('../../meta'); const meta = require('../../meta');
const plugins = require('../../plugins');
const helpers = require('../helpers'); const helpers = require('../helpers');
const groups = require('../../groups'); const groups = require('../../groups');
const accountHelpers = require('./helpers'); const accountHelpers = require('./helpers');
@ -67,9 +66,7 @@ editController.get = async function (req, res, next) {
}, },
]); ]);
userData.editButtons = []; userData.editButtons = [];
res.render('account/edit', userData);
const result = await plugins.fireHook('filter:user.account.edit', userData);
res.render('account/edit', result);
}; };
editController.password = async function (req, res, next) { editController.password = async function (req, res, next) {

@ -56,11 +56,9 @@ notificationsController.get = async function (req, res, next) {
nids = nids.slice(start, stop + 1); nids = nids.slice(start, stop + 1);
const notifications = await user.notifications.getNotifications(nids, req.uid); const notifications = await user.notifications.getNotifications(nids, req.uid);
const data = await plugins.fireHook('filter:notifications.get', {
notifications: notifications,
});
res.render('notifications', { res.render('notifications', {
notifications: data.notifications, notifications: notifications,
pagination: pagination.create(page, pageCount, req.query), pagination: pagination.create(page, pageCount, req.query),
filters: allFilters, filters: allFilters,
regularFilters: regularFilters, regularFilters: regularFilters,

@ -6,7 +6,6 @@ const db = require('../../database');
const user = require('../../user'); const user = require('../../user');
const posts = require('../../posts'); const posts = require('../../posts');
const categories = require('../../categories'); const categories = require('../../categories');
const plugins = require('../../plugins');
const meta = require('../../meta'); const meta = require('../../meta');
const accountHelpers = require('./helpers'); const accountHelpers = require('./helpers');
const helpers = 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)) 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)); .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', userData);
res.render('account/profile', results.userData);
}; };
async function incrementProfileViews(req, userData) { async function incrementProfileViews(req, userData) {

@ -8,7 +8,6 @@ const meta = require('../meta');
const topics = require('../topics'); const topics = require('../topics');
const posts = require('../posts'); const posts = require('../posts');
const privileges = require('../privileges'); const privileges = require('../privileges');
const plugins = require('../plugins');
const helpers = require('./helpers'); const helpers = require('./helpers');
const pagination = require('../pagination'); const pagination = require('../pagination');
const utils = require('../utils'); const utils = require('../utils');
@ -69,8 +68,6 @@ topicsController.get = async function getTopic(req, res, callback) {
topics.modifyPostsByPrivilege(topicData, userPrivileges); topics.modifyPostsByPrivilege(topicData, userPrivileges);
const hookData = await plugins.fireHook('filter:controllers.topic.get', { topicData: topicData, uid: req.uid });
topicData.privileges = userPrivileges; topicData.privileges = userPrivileges;
topicData.topicStaleDays = meta.config.topicStaleDays; topicData.topicStaleDays = meta.config.topicStaleDays;
topicData['reputation:disabled'] = meta.config['reputation:disabled']; topicData['reputation:disabled'] = meta.config['reputation:disabled'];
@ -91,7 +88,7 @@ topicsController.get = async function getTopic(req, res, callback) {
topicData.postIndex = postIndex; topicData.postIndex = postIndex;
await Promise.all([ await Promise.all([
buildBreadcrumbs(hookData.topicData), buildBreadcrumbs(topicData),
addTags(topicData, req, res), addTags(topicData, req, res),
]); ]);

@ -26,10 +26,6 @@ function requireSharp() {
image.isFileTypeAllowed = async function (path) { image.isFileTypeAllowed = async function (path) {
const plugins = require('./plugins'); 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')) { if (plugins.hasListeners('filter:image.isFileTypeAllowed')) {
return await plugins.fireHook('filter:image.isFileTypeAllowed', path); return await plugins.fireHook('filter:image.isFileTypeAllowed', path);
} }

@ -6,11 +6,7 @@ const utils = require('../utils');
module.exports = function (Plugins) { module.exports = function (Plugins) {
Plugins.deprecatedHooks = { 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 = { Plugins.internals = {

Loading…
Cancel
Save