diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index f106503c6e..2bf0595d69 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -4,11 +4,6 @@ define('admin/settings', ['uploader', 'mousetrap'], function (uploader, mousetrap) { var Settings = {}; - Settings.init = function () { - console.warn('[deprecation] require(\'admin/settings\').init() has been deprecated, please call require(\'admin/settings\').prepare() directly instead.'); - Settings.prepare(); - }; - Settings.populateTOC = function () { $('.settings-header').each(function () { var header = $(this).text(); diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js index 15de6dce76..7c6675ba98 100644 --- a/public/src/modules/taskbar.js +++ b/public/src/modules/taskbar.js @@ -212,10 +212,5 @@ define('taskbar', ['benchpress', 'translator'], function (Benchpress, translator element.data(data); }; - taskbar.updateTitle = function (module, uuid, newTitle) { - console.warn('[taskbar] .updateTitle() is deprecated, use .update() instead'); - taskbar.tasklist.find('[data-module="' + module + '"][data-uuid="' + uuid + '"] [component="taskbar/title"]').text(newTitle); - }; - return taskbar; }); diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index 817de9dd01..b56a725bc8 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -1,7 +1,6 @@ 'use strict'; const validator = require('validator'); -const winston = require('winston'); const nconf = require('nconf'); const user = require('../../user'); @@ -204,12 +203,6 @@ async function parseAboutMe(userData) { function filterLinks(links, states) { return links.filter(function (link, index) { - // "public" is the old property, if visibility is defined, discard `public` - if (link.hasOwnProperty('public') && !link.hasOwnProperty('visibility')) { - winston.warn('[account/profileMenu (' + link.id + ')] Use of the `.public` property is deprecated, use `visibility` now'); - return link && (link.public || states.self); - } - // Default visibility link.visibility = { self: true, other: true, diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index fae498e17a..a916ba62db 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -3,8 +3,6 @@ const path = require('path'); const nconf = require('nconf'); const validator = require('validator'); -const winston = require('winston'); -const util = require('util'); const db = require('../database'); const meta = require('../meta'); @@ -26,12 +24,6 @@ uploadsController.upload = async function (req, res, filesIterator) { files = files[0]; } - // backwards compatibility - if (filesIterator.constructor && filesIterator.constructor.name !== 'AsyncFunction') { - winston.warn('[deprecated] uploadsController.upload, use an async function as iterator'); - filesIterator = util.promisify(filesIterator); - } - try { const images = []; for (const fileObj of files) { diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js index 25c3ba0d90..d1ae771c60 100644 --- a/src/socket.io/admin/categories.js +++ b/src/socket.io/admin/categories.js @@ -19,6 +19,7 @@ Categories.create = async function (socket, data) { return await categories.create(data); }; +// DEPRECATED: @1.14.3, remove in version >=1.16 Categories.getAll = async function () { winston.warn('[deprecated] admin.categories.getAll deprecated, data is returned in the api route'); const cids = await categories.getAllCidsFromSet('categories:cid'); diff --git a/src/widgets/index.js b/src/widgets/index.js index 1b11dc5b83..7a0754ae59 100644 --- a/src/widgets/index.js +++ b/src/widgets/index.js @@ -76,12 +76,8 @@ async function renderWidget(widget, uid, options) { if (!data) { return; } - let html = data; - if (typeof html !== 'string') { - html = data.html; - } else { - winston.warn('[widgets.render] passing a string is deprecated!, filter:widget.render:' + widget.widget + '. Please set hookData.html in your plugin.'); - } + + let html = data.html; if (widget.data.container && widget.data.container.match('{body}')) { html = await Benchpress.compileRender(widget.data.container, { @@ -91,11 +87,11 @@ async function renderWidget(widget, uid, options) { }); } - if (html !== undefined) { + if (html) { html = await translator.translate(html, userLang); } - return { html: html }; + return { html }; } async function checkVisibility(widget, uid) {