gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Quincy Larson
2015-07-31 14:38:43 -07:00
parent 2ccd6e3ee3 6454f37079
commit 2833e96091
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/models/user.js
View File

@ -206,12 +206,14 @@ module.exports = function(User) {
const findUser = observeMethod(User, 'findOne');
if (!receiver) {
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) {
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();
@ -223,7 +225,7 @@ module.exports = function(User) {
user$
.tapOnNext((user) => {
if (!user) {
throw new Error('count not find receiver for %s', receiver);
throw new Error(`could not find receiver for ${ receiver }`);
}
})
.flatMap(({ progressTimestamps = [] }) => {
@ -255,7 +257,7 @@ module.exports = function(User) {
});
}
return Observable.throw(
new Error('giver already gave receiver points')
new Error(`${ giver } already gave ${ receiver } points`)
);
})
.subscribe(

4
server/boot/story.js
View File

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