diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js index 0f81163391..d2370ac9d2 100644 --- a/src/controllers/accounts/edit.js +++ b/src/controllers/accounts/edit.js @@ -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) { diff --git a/src/controllers/accounts/notifications.js b/src/controllers/accounts/notifications.js index 3ec7c893c8..9ef4ece4cf 100644 --- a/src/controllers/accounts/notifications.js +++ b/src/controllers/accounts/notifications.js @@ -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, diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js index 83d4c0ef01..6b433ea00a 100644 --- a/src/controllers/accounts/profile.js +++ b/src/controllers/accounts/profile.js @@ -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) { diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 758650d75c..ad3b219ee4 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -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), ]); diff --git a/src/image.js b/src/image.js index e7e4652fed..1f12144e67 100644 --- a/src/image.js +++ b/src/image.js @@ -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); } diff --git a/src/plugins/hooks.js b/src/plugins/hooks.js index 7f9e303857..e6d7067df9 100644 --- a/src/plugins/hooks.js +++ b/src/plugins/hooks.js @@ -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 = {