diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js index 4a2e767884..4c460d5172 100644 --- a/server/boot/randomAPIs.js +++ b/server/boot/randomAPIs.js @@ -193,15 +193,15 @@ module.exports = function(app) { users: function(callback) { User.find( { - where: { 'profile.username': { nlike: '' } }, - fields: { 'profile.username': true } + where: { username: { nlike: '' } }, + fields: { username: true } }, function(err, users) { if (err) { debug('User err: ', err); callback(err); } else { - Rx.Observable.from(users) + Rx.Observable.from(users, null, null, Rx.Scheduler.default) .map(function(user) { return user.username; }) @@ -224,7 +224,7 @@ module.exports = function(app) { debug('Challenge err: ', err); callback(err); } else { - Rx.Observable.from(challenges) + Rx.Observable.from(challenges, null, null, Rx.Scheduler.default) .map(function(challenge) { return challenge.name; }) @@ -244,7 +244,7 @@ module.exports = function(app) { debug('Story err: ', err); callback(err); } else { - Rx.Observable.from(stories) + Rx.Observable.from(stories, null, null, Rx.Scheduler.default) .map(function(story) { return story.link; }) @@ -265,7 +265,7 @@ module.exports = function(app) { debug('User err: ', err); callback(err); } else { - Rx.Observable.from(nonprofits) + Rx.Observable.from(nonprofits, null, null, Rx.Scheduler.default) .map(function(nonprofit) { return nonprofit.name; }) @@ -285,7 +285,12 @@ module.exports = function(app) { debug('User err: ', err); callback(err); } else { - Rx.Observable.from(fieldGuides) + Rx.Observable.from( + fieldGuides, + null, + null, + Rx.Scheduler.default + ) .map(function(fieldGuide) { return fieldGuide.name; }) @@ -301,7 +306,7 @@ module.exports = function(app) { if (err) { return next(err); } - setTimeout(function() { + process.nextTick(function() { res.header('Content-Type', 'application/xml'); res.render('resources/sitemap', { appUrl: appUrl, @@ -312,7 +317,7 @@ module.exports = function(app) { nonprofits: results.nonprofits, fieldGuides: results.fieldGuides }); - }, 0); + }); } ); } @@ -383,7 +388,7 @@ module.exports = function(app) { } function unsubscribe(req, res, next) { - User.findOne({ email: req.params.email }, function(err, user) { + User.findOne({ where: { email: req.params.email } }, function(err, user) { if (user) { if (err) { return next(err);