From ee15c8e72a70587604491d4bef6ede89260d5e62 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Mon, 7 May 2018 11:12:10 +0800 Subject: [PATCH] feat(core): add mongoose to 5.0.17 support --- .../server/controllers/forums.server.controller.js | 8 ++++---- .../server/controllers/torrents.server.controller.js | 12 ++++++------ .../torrents/server/models/torrent.server.model.js | 4 ++-- modules/users/server/models/user.server.model.js | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js index fe331f45..2c868c39 100644 --- a/modules/forums/server/controllers/forums.server.controller.js +++ b/modules/forums/server/controllers/forums.server.controller.js @@ -65,7 +65,7 @@ exports.list = function (req, res) { var forumsTopicsCount = function (callback) { - Topic.aggregate({ + Topic.aggregate([{ // $match: condition, $project: { 'forum': '$forum', @@ -90,7 +90,7 @@ exports.list = function (req, res) { _id: '$forum', count: {$sum: 1} } - }).exec(function (err, counts) { + }]).exec(function (err, counts) { if (err) { callback(err, null); } else { @@ -100,7 +100,7 @@ exports.list = function (req, res) { }; var forumsRepliesCount = function (callback) { - Topic.aggregate({ + Topic.aggregate([{ $unwind: '$_replies' }, { $project: { @@ -126,7 +126,7 @@ exports.list = function (req, res) { _id: '$forum', count: {$sum: 1} } - }).exec(function (err, counts) { + }]).exec(function (err, counts) { if (err) { callback(err, null); } else { diff --git a/modules/torrents/server/controllers/torrents.server.controller.js b/modules/torrents/server/controllers/torrents.server.controller.js index e6bf6540..3982760f 100644 --- a/modules/torrents/server/controllers/torrents.server.controller.js +++ b/modules/torrents/server/controllers/torrents.server.controller.js @@ -1935,13 +1935,13 @@ exports.siteInfo = function (req, res) { }; var totalUpDown = function (callback) { - User.aggregate({ + User.aggregate([{ $group: { _id: null, uploaded: {$sum: '$uploaded'}, downloaded: {$sum: '$downloaded'} } - }).exec(function (err, total) { + }]).exec(function (err, total) { if (err) { callback(err, null); } else { @@ -1951,14 +1951,14 @@ exports.siteInfo = function (req, res) { }; var totalTorrentsSize = function (callback) { - Torrent.aggregate({ + Torrent.aggregate([{ $group: { _id: null, size: {$sum: '$torrent_size'}, seeders: {$sum: '$torrent_seeds'}, leechers: {$sum: '$torrent_leechers'} } - }).exec(function (err, total) { + }]).exec(function (err, total) { if (err) { callback(err, null); } else { @@ -1978,12 +1978,12 @@ exports.siteInfo = function (req, res) { }; var totalForumReplies = function (callback) { - Topic.aggregate({ + Topic.aggregate([{ $group: { _id: null, replies: {$sum: '$replyCount'} } - }).exec(function (err, total) { + }]).exec(function (err, total) { if (err) { callback(err, null); } else { diff --git a/modules/torrents/server/models/torrent.server.model.js b/modules/torrents/server/models/torrent.server.model.js index ec48fd71..95283f94 100644 --- a/modules/torrents/server/models/torrent.server.model.js +++ b/modules/torrents/server/models/torrent.server.model.js @@ -199,7 +199,7 @@ function writeIsSaling(torrent) { TorrentSchema.methods.updateSeedLeechNumbers = function (callback) { var torrent = this; - Peer.aggregate({ + Peer.aggregate([{ $match: { torrent: torrent._id, last_announce_at: {$gt: new Date(Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime)} @@ -209,7 +209,7 @@ TorrentSchema.methods.updateSeedLeechNumbers = function (callback) { _id: '$peer_status', count: {$sum: 1} } - }).exec(function (err, counts) { + }]).exec(function (err, counts) { if (!err) { var sc = 0; var lc = 0; diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js index c36d9b38..26ff171f 100644 --- a/modules/users/server/models/user.server.model.js +++ b/modules/users/server/models/user.server.model.js @@ -446,7 +446,7 @@ UserSchema.methods.globalUpdateMethod = function (cb) { UserSchema.methods.updateSeedLeechNumbers = function (callback) { var user = this; - Peer.aggregate({ + Peer.aggregate([{ $match: { user: user._id, last_announce_at: {$gt: new Date(Date.now() - announceConfig.announceInterval - announceConfig.announceIdleTime)} @@ -456,7 +456,7 @@ UserSchema.methods.updateSeedLeechNumbers = function (callback) { _id: '$peer_status', count: {$sum: 1} } - }).exec(function (err, counts) { + }]).exec(function (err, counts) { if (!err) { var sc = 0; var lc = 0;