Skip to content

Fix filter function #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feross merged 2 commits into from
Apr 30, 2018
Merged

Fix filter function #272

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ad210b
Fix filter function
qqdaiyu55 Apr 23, 2018
2ba6946
standard
qqdaiyu55 Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,32 +659,27 @@ Server.prototype._onAnnounce = function (params, cb) {

self.getSwarm(params.info_hash, function (err, swarm) {
if (err) return cb(err)
if (swarm) {
announce(swarm)
} else {
createSwarm()
}
})

function createSwarm () {
if (self._filter) {
self._filter(params.info_hash, params, function (err) {
// Precense of err means that this info_hash is disallowed
if (err) {
cb(err)
} else {
self.createSwarm(params.info_hash, function (err, swarm) {
if (err) return cb(err)
announce(swarm)
})
// Precense of err means that this torrent or user is disallowd
if (err) cb(err)
else {
if (swarm) announce(swarm)
else createSwarm()
}
})
} else {
self.createSwarm(params.info_hash, function (err, swarm) {
if (err) return cb(err)
announce(swarm)
})
if (swarm) announce(swarm)
else createSwarm()
}
})

function createSwarm () {
self.createSwarm(params.info_hash, function (err, swarm) {
if (err) return cb(err)
announce(swarm)
})
}

function announce (swarm) {
Expand Down