From 715e2f27186685229db38340d2b8892e978b026f Mon Sep 17 00:00:00 2001 From: OldHawk Date: Sun, 13 May 2018 16:48:15 +0800 Subject: [PATCH] fix(announce): fixed score count issue --- config/env/torrents.js | 10 +- config/lib/score.js | 6 +- .../controllers/makers.server.controller.js | 10 +- .../collections.server.controller.js | 6 +- modules/core/client/less/home.less | 127 ++++++++++-------- .../core/client/views/home.client.view.html | 48 +++---- .../forums.admin.server.controller.js | 4 +- .../controllers/forums.server.controller.js | 36 ++--- .../controllers/requests.server.controller.js | 10 +- .../completes.server.controller.js | 4 +- .../controllers/torrents.server.controller.js | 26 ++-- .../controllers/traces.server.controller.js | 4 +- .../users/server/config/strategies/local.js | 2 +- .../server/config/users.server.config.js | 2 +- .../controllers/admin.server.controller.js | 4 +- .../users.authorization.server.controller.js | 2 +- .../users/users.follow.server.controller.js | 8 +- .../users/server/models/user.server.model.js | 2 +- 18 files changed, 168 insertions(+), 143 deletions(-) diff --git a/config/env/torrents.js b/config/env/torrents.js index 0d8afd34..1e9a9017 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -435,8 +435,6 @@ module.exports = { action: { defaultAction: {name: 'defaultAction', value: 0, enable: true}, - checkInEveryDay: {name: 'checkInEveryDay', value: 10, enable: true}, - checkInConsDay: {name: 'checkInConsDay', value: 2, enable: true}, uploadTorrent: {name: 'uploadTorrent', value: 50, enable: true}, uploadTorrentBeDeleted: {name: 'uploadTorrentBeDeleted', value: -50, enable: true}, uploadTorrentBeRecommend: {name: 'uploadTorrentBeRecommend', value: 10, enable: true}, @@ -453,6 +451,14 @@ module.exports = { scoreToRemoveWarning: {name: 'scoreToRemoveWarning', value: 0, enable: true}, //value used hitAndRun.scoreToRemoveWarning activeIdleAccount: {name: 'activeIdleAccount', value: 0, enable: true}, //value used sign.idle.activeIdleAccountBasicScore + dailyCheckIn: { + enable: true, + name: 'dailyCheckIn', + dailyBasicScore: 10, + dailyStepScore: 1, + dailyMaxScore: 100 + }, + seedUpDownload: { name: 'seedUpDownload', additionSize: 1024 * 1024 * 1024 * 10, //10G diff --git a/config/lib/score.js b/config/lib/score.js index 5b9c17f8..8b5c1f02 100644 --- a/config/lib/score.js +++ b/config/lib/score.js @@ -40,7 +40,11 @@ module.exports.update = function (req, user, action, value, writeLog = true) { user.markModified('examinationData'); } - user.score += v; + + mtDebug.info('Old: user.score=' + user.score); + user.score = Math.max(user.score + v, 0); + mtDebug.info('New: user.score=' + user.score); + user.save(function () { traceLogCreate(req, traceConfig.action.userScoreChange, { user: user._id, diff --git a/modules/about/server/controllers/makers.server.controller.js b/modules/about/server/controllers/makers.server.controller.js index e267bc51..c23a03e8 100644 --- a/modules/about/server/controllers/makers.server.controller.js +++ b/modules/about/server/controllers/makers.server.controller.js @@ -153,8 +153,8 @@ exports.delete = function (req, res) { exports.list = function (req, res) { Maker.find() .sort('-torrent_count') - .populate('user', 'username displayName profileImageURL isVip') - .populate('members', 'username displayName profileImageURL isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('members', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, makers) { if (err) { return res.status(422).send({ @@ -323,9 +323,9 @@ exports.makerByID = function (req, res, next, id) { } Maker.findById(id) - .populate('user', 'username displayName profileImageURL isVip') - .populate('members', 'username displayName profileImageURL isVip') - .populate('_ratings.user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('members', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('_ratings.user', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, maker) { if (err) { return next(err); diff --git a/modules/collections/server/controllers/collections.server.controller.js b/modules/collections/server/controllers/collections.server.controller.js index f01de5a4..aee77af3 100644 --- a/modules/collections/server/controllers/collections.server.controller.js +++ b/modules/collections/server/controllers/collections.server.controller.js @@ -279,7 +279,7 @@ exports.list = function (req, res) { var findQuery = function (callback) { Collection.find(condition) .sort('-recommend_level -ordered_at -created_at') - .populate('user', 'username displayName profileImageURL isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('torrents') .skip(skip) .limit(limit) @@ -312,12 +312,12 @@ exports.collectionByID = function (req, res, next, id) { } Collection.findById(id) - .populate('user', 'username displayName profileImageURL isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate({ path: 'torrents', populate: [{ path: 'user', - select: 'username displayName profileImageURL isVip' + select: 'username displayName profileImageURL isVip score uploaded downloaded' }, { path: 'maker', select: 'name' diff --git a/modules/core/client/less/home.less b/modules/core/client/less/home.less index c9bf80cb..1fa413c0 100644 --- a/modules/core/client/less/home.less +++ b/modules/core/client/less/home.less @@ -378,75 +378,88 @@ vertical-align: middle; } } - .search-panel { + .top-panel { min-height: 120px; padding: 20px 0; text-shadow: 0 0 0.1em #000,-0 -0 0.1em #000; - .search-title { - color: #fff; - font-size: 2em; - font-weight: 400; - margin-bottom: 0 !important; - } - .search-sub-title { - margin-top: 10px; - color: #aaa; - text-shadow: 0 0 0.1em #000, 0 0 0.1em #000; - } - .search-group { - max-width: 50em; - margin-right: auto; - margin-left: auto; - display: block; - input { - color: #eee; - background-color: #ccc; - background-color: rgba(255, 255, 255, 0.2); - border-radius: 17px; - position: inherit; - z-index: 2; - float: none; - width: 100%; - margin-bottom: 0; - padding-right: 105px; + .home-search { + .search-title { + color: #fff; + font-size: 2em; + font-weight: 400; + margin-bottom: 0 !important; } - .btn-search { - border-top-right-radius: 17px; - border-bottom-right-radius: 17px; - position: absolute; - right: 1px; - top: 1px; - bottom: 1px; - opacity: 0.6; - z-index: 3; - &:hover, - &:focus { - outline: none; - opacity: 1; + .search-sub-title { + margin-top: 10px; + color: #aaa; + text-shadow: 0 0 0.1em #000, 0 0 0.1em #000; + } + .search-group { + max-width: 50em; + margin-right: auto; + margin-left: auto; + display: block; + input { + color: #eee; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.2); + border-radius: 17px; + position: inherit; + z-index: 2; + float: none; + width: 100%; + margin-bottom: 0; + padding-right: 105px; + } + .btn-search { + border-top-right-radius: 17px; + border-bottom-right-radius: 17px; + position: absolute; + right: 1px; + top: 1px; + bottom: 1px; + opacity: 0.6; + z-index: 3; + &:hover, + &:focus { + outline: none; + opacity: 1; + } } } - } - .search-type { - color: #aaa; - text-shadow: 0 0 0.1em #000, 0 0 0.1em #000; - input { - opacity: 0.6; - &:hover, - &:checked, - &:focus { - opacity: 1; + .search-type { + color: #aaa; + text-shadow: 0 0 0.1em #000, 0 0 0.1em #000; + input { + opacity: 0.6; + &:hover, + &:checked, + &:focus { + opacity: 1; + } + } + .radio-inline + .radio-inline, + .checkbox-inline + .checkbox-inline { + margin-top: 0; + margin-left: 50px; // space out consecutive inline controls } - } - .radio-inline + .radio-inline, - .checkbox-inline + .checkbox-inline { - margin-top: 0; - margin-left: 50px; // space out consecutive inline controls - } + } } } } +.home-check-in { + background-color: #2a2a2a; + background-color: rgba(0,0,0, 0.5); + .check-in-title { + color: #fff; + font-size: 2em; + font-weight: 400; + margin-bottom: 0 !important; + } +} + .view-footer { color: #aaa; font-size: 12px; diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index 751ad1a8..4df018de 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -37,34 +37,36 @@
-
+
-

- -
- +
+

+ +
+ - -
-
- - + +
+
+ + +
diff --git a/modules/forums/server/controllers/forums.admin.server.controller.js b/modules/forums/server/controllers/forums.admin.server.controller.js index 61ccae33..191aece0 100644 --- a/modules/forums/server/controllers/forums.admin.server.controller.js +++ b/modules/forums/server/controllers/forums.admin.server.controller.js @@ -43,7 +43,7 @@ exports.list = function (req, res) { Forum.find() .sort('order -createdat') .populate('lastTopic') - .populate('moderators', 'username displayName profileImageURL uploaded downloaded') + .populate('moderators', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, forums) { if (err) { return res.status(422).send({ @@ -182,7 +182,7 @@ exports.forumByID = function (req, res, next, id) { Forum.findById(id) .populate('lastTopic') - .populate('moderators', 'username displayName profileImageURL uploaded downloaded') + .populate('moderators', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, forum) { if (err) { return next(err); diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js index 2c868c39..34e1b74d 100644 --- a/modules/forums/server/controllers/forums.server.controller.js +++ b/modules/forums/server/controllers/forums.server.controller.js @@ -50,10 +50,10 @@ exports.list = function (req, res) { path: 'lastTopic', populate: { path: 'user lastUser', - select: 'username displayName profileImageURL isVip uploaded downloaded' + select: 'username displayName profileImageURL isVip score uploaded downloaded' } }) - .populate('moderators', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('moderators', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, forums) { if (err) { callback(err, null); @@ -225,8 +225,8 @@ exports.forumsSearch = function (req, res) { var findQuery = function (callback) { Topic.find(condition) .sort('-lastReplyAt -createdAt') - .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('forum', 'name category') .skip(skip) .limit(limit) @@ -281,8 +281,8 @@ exports.listTopics = function (req, res) { forum: req.params.forumId }) .sort('-isTop -lastReplyAt -createdAt') - .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, topics) { @@ -316,7 +316,7 @@ exports.getHomeHelpTopic = function (req, res) { isHomeHelp: true }) .sort('-pushHomeAt') - .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, topics) { @@ -341,7 +341,7 @@ exports.getHomeNoticeTopic = function (req, res) { isHomeNotice: true }) .sort('-pushHomeAt') - .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, topics) { @@ -364,7 +364,7 @@ exports.getHomeNewTopic = function (req, res) { Topic.find() .sort('-createdAt') - .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, topics) { @@ -408,8 +408,8 @@ exports.globalTopics = function (req, res) { }) .sort('-createdAt') .populate('forum', 'name') - .populate('user', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, topics) { if (err) { return res.status(422).send({ @@ -1209,13 +1209,13 @@ exports.topicById = function (req, res, next, id) { } Topic.findById(id) - .populate('user', 'username displayName profileImageURL isVip uploaded downloaded score signature') - .populate('lastUser', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('updatedBy', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('_thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('_replies.user', 'username displayName profileImageURL isVip uploaded downloaded signature') - .populate('_replies.updatedBy', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('_replies._thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded signature') + .populate('lastUser', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('updatedBy', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('_thumbs.user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('_replies.user', 'username displayName profileImageURL isVip score uploaded downloaded signature') + .populate('_replies.updatedBy', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('_replies._thumbs.user', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, topic) { if (err) { return next(err); diff --git a/modules/requests/server/controllers/requests.server.controller.js b/modules/requests/server/controllers/requests.server.controller.js index b2648eb0..90829411 100644 --- a/modules/requests/server/controllers/requests.server.controller.js +++ b/modules/requests/server/controllers/requests.server.controller.js @@ -267,7 +267,7 @@ exports.list = function (req, res) { var findQuery = function (callback) { Request.find(condition) .sort('-createdAt') - .populate('user', 'username displayName profileImageURL isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, requests) { @@ -302,12 +302,12 @@ exports.requestByID = function (req, res, next, id) { } Request.findById(id) - .populate('user', 'username displayName profileImageURL isVip score') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate({ path: 'torrents', populate: [{ path: 'user', - select: 'username displayName profileImageURL isVip' + select: 'username displayName profileImageURL isVip score uploaded downloaded' }, { path: 'maker', select: 'name' @@ -315,12 +315,12 @@ exports.requestByID = function (req, res, next, id) { }) .populate({ path: 'comments.user', - select: 'username displayName profileImageURL isVip uploaded downloaded', + select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User' }) .populate({ path: 'comments._replies.user', - select: 'username displayName profileImageURL isVip uploaded downloaded', + select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User' }) .exec(function (err, request) { diff --git a/modules/torrents/server/controllers/completes.server.controller.js b/modules/torrents/server/controllers/completes.server.controller.js index 776ff2d8..035c08f4 100644 --- a/modules/torrents/server/controllers/completes.server.controller.js +++ b/modules/torrents/server/controllers/completes.server.controller.js @@ -109,8 +109,8 @@ exports.completeByID = function (req, res, next, id) { } Complete.findById(id) - .populate('user', 'username displayName profileImageURL') - .populate('remove_by', 'username displayName profileImageURL') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('remove_by', 'username displayName profileImageURL isVip score uploaded downloaded') .exec(function (err, complete) { if (err) { return next(err); diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js index 2de7082e..8fd79916 100644 --- a/modules/torrents/server/controllers/torrents.server.controller.js +++ b/modules/torrents/server/controllers/torrents.server.controller.js @@ -1399,7 +1399,7 @@ exports.getTorrentsHomeList = function (req, res) { } else { Torrent.populate(orderList, [ - {path: 'typeTorrents.user', select: 'username displayName isVip', model: 'User'}, + {path: 'typeTorrents.user', select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User'}, {path: 'typeTorrents.maker', select: 'name', model: 'Maker'} ], function (err, items) { if (err) { @@ -1452,7 +1452,7 @@ exports.getTorrentsHomeList = function (req, res) { } else { Torrent.populate(newestList, [ - {path: 'typeTorrents.user', select: 'username displayName isVip', model: 'User'}, + {path: 'typeTorrents.user', select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User'}, {path: 'typeTorrents.maker', select: 'name', model: 'Maker'} ], function (err, items) { if (err) { @@ -1714,7 +1714,7 @@ exports.list = function (req, res) { Torrent.populate(ntorrents, [ - {path: 'user', select: 'username displayName isVip'}, + {path: 'user', select: 'username displayName profileImageURL isVip score uploaded downloaded'}, {path: 'maker', select: 'name'} ], function (err, ts) { if (err) { @@ -1849,7 +1849,7 @@ exports.makeRss = function (req, res) { Torrent.find(condition) .sort(sort) - .populate('user', 'username displayName isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('maker', 'name') .limit(limit) .exec(function (err, torrents) { @@ -2085,7 +2085,7 @@ exports.getSeederUsers = function (req, res) { last_announce_at: {$gt: Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime} }) .sort('-peer_uploaded') - .populate('user', 'username displayName profileImageURL isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, peers) { @@ -2146,7 +2146,7 @@ exports.getLeecherUsers = function (req, res) { last_announce_at: {$gt: Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime} }) .sort('-peer_downloaded') - .populate('user', 'username displayName profileImageURL isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .skip(skip) .limit(limit) .exec(function (err, peers) { @@ -2181,25 +2181,25 @@ exports.torrentByID = function (req, res, next, id) { var findTorrents = function (callback) { Torrent.find({_id: id}, {'_peers': 0}) - .populate('user', 'username displayName profileImageURL isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('maker', 'name') - .populate('_thumbs.user', 'username displayName profileImageURL isVip uploaded downloaded') - .populate('_ratings.user', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('_thumbs.user', 'username displayName profileImageURL isVip score uploaded downloaded') + .populate('_ratings.user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate({ path: '_replies.user', - select: 'username displayName profileImageURL isVip uploaded downloaded', + select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User' }) .populate({ path: '_replies._replies.user', - select: 'username displayName profileImageURL isVip uploaded downloaded', + select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User' }) .populate({ path: '_subtitles', populate: { path: 'user', - select: 'username displayName profileImageURL isVip' + select: 'username displayName profileImageURL isVip score uploaded downloaded' } }) .exec(function (err, torrent) { @@ -2225,7 +2225,7 @@ exports.torrentByID = function (req, res, next, id) { Torrent.find(condition, fields) .sort('-createdat') - .populate('user', 'username displayName isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('maker', 'name') .exec(function (err, torrents) { if (err) { diff --git a/modules/traces/server/controllers/traces.server.controller.js b/modules/traces/server/controllers/traces.server.controller.js index 79eb56be..cf35ae4d 100644 --- a/modules/traces/server/controllers/traces.server.controller.js +++ b/modules/traces/server/controllers/traces.server.controller.js @@ -69,10 +69,10 @@ exports.list = function (req, res) { var findQuery = function (callback) { Trace.find(condition) .sort('-createdat') - .populate('user', 'username displayName isVip') + .populate('user', 'username displayName profileImageURL isVip score uploaded downloaded') .populate({ path: 'content.user', - select: 'username displayName', + select: 'username displayName profileImageURL isVip score uploaded downloaded', model: 'User' }) .populate({ diff --git a/modules/users/server/config/strategies/local.js b/modules/users/server/config/strategies/local.js index 32ef6c7f..dd7404b9 100644 --- a/modules/users/server/config/strategies/local.js +++ b/modules/users/server/config/strategies/local.js @@ -27,7 +27,7 @@ module.exports = function () { }, { email: usernameOrEmail.toLowerCase() }] - }).populate('invited_by', 'username displayName profileImageURL') + }).populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('makers', 'name') .exec(function (err, user) { if (err) { diff --git a/modules/users/server/config/users.server.config.js b/modules/users/server/config/users.server.config.js index 2db41289..2f9bc1d3 100644 --- a/modules/users/server/config/users.server.config.js +++ b/modules/users/server/config/users.server.config.js @@ -23,7 +23,7 @@ module.exports = function (app) { User.findOne({ _id: id }, '-salt -password') - .populate('invited_by', 'username displayName profileImageURL') + .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('makers', 'name').exec(function (err, user) { done(err, user); }); diff --git a/modules/users/server/controllers/admin.server.controller.js b/modules/users/server/controllers/admin.server.controller.js index 18a3eba0..947bc778 100644 --- a/modules/users/server/controllers/admin.server.controller.js +++ b/modules/users/server/controllers/admin.server.controller.js @@ -191,7 +191,7 @@ exports.list = function (req, res) { var findQuery = function (callback) { User.find(condition, '-salt -password -providerData') .sort('-created') - .populate('invited_by', 'username displayName profileImageURL isVip uploaded downloaded') + .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('makers', 'name') .skip(skip) .limit(limit) @@ -662,7 +662,7 @@ exports.userByID = function (req, res, next, id) { } User.findById(id, '-salt -password -providerData') - .populate('invited_by', 'username displayName profileImageURL') + .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('makers', 'user name') .exec(function (err, user) { if (err) { diff --git a/modules/users/server/controllers/users/users.authorization.server.controller.js b/modules/users/server/controllers/users/users.authorization.server.controller.js index 665e0adf..e01e1d81 100644 --- a/modules/users/server/controllers/users/users.authorization.server.controller.js +++ b/modules/users/server/controllers/users/users.authorization.server.controller.js @@ -20,7 +20,7 @@ exports.userByID = function (req, res, next, id) { User.findOne({ _id: id }) - .populate('invited_by', 'username displayName profileImageURL') + .populate('invited_by', 'username displayName profileImageURL isVip score uploaded downloaded') .populate('makers', 'name') .exec(function (err, user) { if (err) { diff --git a/modules/users/server/controllers/users/users.follow.server.controller.js b/modules/users/server/controllers/users/users.follow.server.controller.js index bba5fee1..77fd7f12 100644 --- a/modules/users/server/controllers/users/users.follow.server.controller.js +++ b/modules/users/server/controllers/users/users.follow.server.controller.js @@ -73,7 +73,7 @@ exports.myFollowers = function (req, res) { User.populate(user, { path: 'followers', - select: 'username displayName profileImageURL uploaded downloaded isVip score' + select: 'username displayName profileImageURL isVip score uploaded downloaded' }, function (err, u) { if (err) { return res.status(422).send({ @@ -104,7 +104,7 @@ exports.myFollowing = function (req, res) { User.populate(user, { path: 'following', - select: 'username displayName profileImageURL uploaded downloaded isVip score' + select: 'username displayName profileImageURL isVip score uploaded downloaded' }, function (err, u) { if (err) { return res.status(422).send({ @@ -137,7 +137,7 @@ exports.getUserFollowers = function (req, res) { if (me.followers.indexOf(user._id) >= 0 || me.following.indexOf(user._id) >= 0 || me.isOper) { User.populate(user, { path: 'followers', - select: 'username displayName profileImageURL uploaded downloaded isVip score' + select: 'username displayName profileImageURL isVip score uploaded downloaded' }, function (err, u) { if (err) { return res.status(422).send({ @@ -175,7 +175,7 @@ exports.getUserFollowing = function (req, res) { if (me.followers.indexOf(user._id) >= 0 || me.following.indexOf(user._id) >= 0 || me.isOper) { User.populate(user, { path: 'following', - select: 'username displayName profileImageURL uploaded downloaded isVip score' + select: 'username displayName profileImageURL isVip score uploaded downloaded' }, function (err, u) { if (err) { return res.status(422).send({ diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js index e67bbc94..492f5d55 100644 --- a/modules/users/server/models/user.server.model.js +++ b/modules/users/server/models/user.server.model.js @@ -171,7 +171,7 @@ var UserSchema = new Schema({ type: Schema.Types.Decimal128, set: setNumberValueToZero, get: function (v) { - return parseFloat(v) || 0; + return parseFloat(parseFloat(v).toFixed(2)) || 0; }, default: 0 },