From f5fe91286e4ae12a3173066b1aeef66d426eb2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 20 Oct 2018 17:23:15 -0400 Subject: [PATCH] closes #6851 --- src/categories/data.js | 6 ------ src/controllers/accounts/helpers.js | 6 ------ src/groups/data.js | 6 ------ src/socket.io/helpers.js | 5 ----- src/topics/recent.js | 6 ------ src/topics/teaser.js | 16 ---------------- src/user/data.js | 5 ----- 7 files changed, 50 deletions(-) diff --git a/src/categories/data.js b/src/categories/data.js index 3b64d9fe7f..f41fb06906 100644 --- a/src/categories/data.js +++ b/src/categories/data.js @@ -2,7 +2,6 @@ var async = require('async'); var validator = require('validator'); -var winston = require('winston'); var db = require('../database'); @@ -53,11 +52,6 @@ module.exports = function (Categories) { }); }; - Categories.getMultipleCategoryFields = function (cids, fields, callback) { - winston.warn('[deprecated] Categories.getMultipleCategoryFields is deprecated please use Categories.getCategoriesFields'); - Categories.getCategoriesFields(cids, fields, callback); - }; - Categories.getAllCategoryFields = function (fields, callback) { async.waterfall([ async.apply(db.getSortedSetRange, 'categories:cid', 0, -1), diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index 12f7674563..4cab153dd7 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -208,12 +208,6 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) { ], callback); }; - -helpers.getBaseUser = function (userslug, callerUID, callback) { - winston.warn('helpers.getBaseUser deprecated please use helpers.getUserDataByUserSlug'); - helpers.getUserDataByUserSlug(userslug, callerUID, callback); -}; - function filterLinks(links, states) { return links.filter(function (link, index) { // "public" is the old property, if visibility is defined, discard `public` diff --git a/src/groups/data.js b/src/groups/data.js index 22b1bd1215..bd15bd6b72 100644 --- a/src/groups/data.js +++ b/src/groups/data.js @@ -2,7 +2,6 @@ var async = require('async'); var validator = require('validator'); -var winston = require('winston'); var db = require('../database'); var plugins = require('../plugins'); @@ -80,11 +79,6 @@ module.exports = function (Groups) { }), fields, callback); }; - Groups.getMultipleGroupFields = function (groups, fields, callback) { - winston.warn('[deprecated] Groups.getMultipleGroupFields is deprecated please use Groups.getGroupsFields'); - Groups.getGroupsFields(groups, fields, callback); - }; - Groups.setGroupField = function (groupName, field, value, callback) { async.waterfall([ function (next) { diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.js index 775e3820e3..06fede5181 100644 --- a/src/socket.io/helpers.js +++ b/src/socket.io/helpers.js @@ -15,11 +15,6 @@ var utils = require('../utils'); var SocketHelpers = module.exports; -SocketHelpers.notifyOnlineUsers = function (uid, result) { - winston.warn('[deprecated] SocketHelpers.notifyOnlineUsers, consider using socketHelpers.notifyNew(uid, \'newPost\', result);'); - SocketHelpers.notifyNew(uid, 'newPost', result); -}; - SocketHelpers.notifyNew = function (uid, type, result) { async.waterfall([ function (next) { diff --git a/src/topics/recent.js b/src/topics/recent.js index 8e5f287f0a..433a25b1b6 100644 --- a/src/topics/recent.js +++ b/src/topics/recent.js @@ -3,7 +3,6 @@ 'use strict'; var async = require('async'); -var winston = require('winston'); var db = require('../database'); var plugins = require('../plugins'); @@ -101,11 +100,6 @@ module.exports = function (Topics) { }); }; - Topics.updateTimestamp = function (tid, lastposttime, callback) { - winston.warn('[deprecated] Topics.updateTimestamp is deprecated please use Topics.updateLastPostTime'); - Topics.updateLastPostTime(tid, lastposttime, callback); - }; - Topics.updateRecent = function (tid, timestamp, callback) { callback = callback || function () {}; diff --git a/src/topics/teaser.js b/src/topics/teaser.js index a5dafcaaa1..4b71ac6d65 100644 --- a/src/topics/teaser.js +++ b/src/topics/teaser.js @@ -3,7 +3,6 @@ var async = require('async'); var _ = require('lodash'); -var winston = require('winston'); var db = require('../database'); var meta = require('../meta'); @@ -16,11 +15,6 @@ module.exports = function (Topics) { var stripTeaserTags = utils.stripTags.concat(['img']); Topics.getTeasers = function (topics, uid, callback) { - if (typeof uid === 'function') { - winston.warn('[Topics.getTeasers] this usage is deprecated please provide uid'); - callback = uid; - uid = 0; - } if (!Array.isArray(topics) || !topics.length) { return callback(null, []); } @@ -171,11 +165,6 @@ module.exports = function (Topics) { } Topics.getTeasersByTids = function (tids, uid, callback) { - if (typeof uid === 'function') { - winston.warn('[Topics.getTeasersByTids] this usage is deprecated please provide uid'); - callback = uid; - uid = 0; - } if (!Array.isArray(tids) || !tids.length) { return callback(null, []); } @@ -190,11 +179,6 @@ module.exports = function (Topics) { }; Topics.getTeaser = function (tid, uid, callback) { - if (typeof uid === 'function') { - winston.warn('[Topics.getTeaser] this usage is deprecated please provide uid'); - callback = uid; - uid = 0; - } Topics.getTeasersByTids([tid], uid, function (err, teasers) { callback(err, Array.isArray(teasers) && teasers.length ? teasers[0] : null); }); diff --git a/src/user/data.js b/src/user/data.js index d80a115ef3..a789252d35 100644 --- a/src/user/data.js +++ b/src/user/data.js @@ -99,11 +99,6 @@ module.exports = function (User) { }); }; - User.getMultipleUserFields = function (uids, fields, callback) { - winston.warn('[deprecated] User.getMultipleUserFields is deprecated please use User.getUsersFields'); - User.getUsersFields(uids, fields, callback); - }; - User.getUserData = function (uid, callback) { User.getUsersData([uid], function (err, users) { callback(err, users ? users[0] : null);