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
},