diff --git a/modules/torrents/server/controllers/peers.server.controller.js b/modules/torrents/server/controllers/peers.server.controller.js index 1975a303..86e37758 100644 --- a/modules/torrents/server/controllers/peers.server.controller.js +++ b/modules/torrents/server/controllers/peers.server.controller.js @@ -18,6 +18,8 @@ var path = require('path'), const PEERSTATE_SEEDER = 'seeder'; const PEERSTATE_LEECHER = 'leecher'; +var announceConfig = config.meanTorrentConfig.announce; + /** * list my seeding torrents * @param req @@ -26,7 +28,8 @@ const PEERSTATE_LEECHER = 'leecher'; exports.getMySeeding = function (req, res) { Peer.find({ user: req.user._id, - peer_status: PEERSTATE_SEEDER + peer_status: PEERSTATE_SEEDER, + last_announce_at: {$gt: Date.now() - announceConfig.announceInterval * 2} }).sort('-peer_uploaded') .populate({ path: 'torrent', @@ -54,7 +57,8 @@ exports.getMySeeding = function (req, res) { exports.getMyDownloading = function (req, res) { Peer.find({ user: req.user._id, - peer_status: PEERSTATE_LEECHER + peer_status: PEERSTATE_LEECHER, + last_announce_at: {$gt: Date.now() - announceConfig.announceInterval * 2} }).sort('-peer_downloaded') .populate({ path: 'torrent', diff --git a/modules/users/server/controllers/admin.server.controller.js b/modules/users/server/controllers/admin.server.controller.js index 5fef61cd..3db56aad 100644 --- a/modules/users/server/controllers/admin.server.controller.js +++ b/modules/users/server/controllers/admin.server.controller.js @@ -23,6 +23,7 @@ var mtDebug = require(path.resolve('./config/lib/debug')); var appConfig = config.meanTorrentConfig.app; var serverMessage = require(path.resolve('./config/lib/server-message')); var serverNoticeConfig = config.meanTorrentConfig.serverNotice; +var announceConfig = config.meanTorrentConfig.announce; /** * Show the current user @@ -513,7 +514,8 @@ exports.resetVIPData = function (req, res) { exports.getUserSeeding = function (req, res) { Peer.find({ user: req.model._id, - peer_status: PEERSTATE_SEEDER + peer_status: PEERSTATE_SEEDER, + last_announce_at: {$gt: Date.now() - announceConfig.announceInterval * 2} }).sort('-peer_uploaded') .populate({ path: 'torrent', @@ -541,7 +543,8 @@ exports.getUserSeeding = function (req, res) { exports.getUserLeeching = function (req, res) { Peer.find({ user: req.model._id, - peer_status: PEERSTATE_LEECHER + peer_status: PEERSTATE_LEECHER, + last_announce_at: {$gt: Date.now() - announceConfig.announceInterval * 2} }).sort('-peer_downloaded') .populate({ path: 'torrent',