Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

This commit is contained in:
Quincy Larson
2015-07-31 14:38:43 -07:00
2 changed files with 6 additions and 8 deletions

View File

@ -206,12 +206,14 @@ module.exports = function(User) {
const findUser = observeMethod(User, 'findOne'); const findUser = observeMethod(User, 'findOne');
if (!receiver) { if (!receiver) {
return nextTick(() => { return nextTick(() => {
cb(new TypeError('receiver should be a string but got %s', receiver)); cb(
new TypeError(`receiver should be a string but got ${ receiver }`)
);
}); });
} }
if (!giver) { if (!giver) {
return nextTick(() => { return nextTick(() => {
cb(new TypeError('giver should be a string but got %s')); cb(new TypeError(`giver should be a string but got ${ giver }`));
}); });
} }
let temp = moment(); let temp = moment();
@ -223,7 +225,7 @@ module.exports = function(User) {
user$ user$
.tapOnNext((user) => { .tapOnNext((user) => {
if (!user) { if (!user) {
throw new Error('count not find receiver for %s', receiver); throw new Error(`could not find receiver for ${ receiver }`);
} }
}) })
.flatMap(({ progressTimestamps = [] }) => { .flatMap(({ progressTimestamps = [] }) => {
@ -255,7 +257,7 @@ module.exports = function(User) {
}); });
} }
return Observable.throw( return Observable.throw(
new Error('giver already gave receiver points') new Error(`${ giver } already gave ${ receiver } points`)
); );
}) })
.subscribe( .subscribe(

View File

@ -264,10 +264,6 @@ module.exports = function(app) {
} }
return saveUser(user); return saveUser(user);
}) })
.flatMap(function() {
req.user.progressTimestamps.push(Date.now());
return saveUser(req.user);
})
.flatMap(function() { .flatMap(function() {
return story$; return story$;
}) })