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 13:38:17 -07:00
parent a0230609f5 0e21d6eb30
commit fd06b81088
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/models/user.js
View File

@ -6,6 +6,7 @@ import { saveUser, observeMethod } from '../../server/utils/rx';
import { blacklistedUsernames } from '../../server/utils/constants';
const debug = debugFactory('freecc:user:remote');
const BROWNIEPOINTS_TIMEOUT = [30, 'seconds'];
function getAboutProfile({
username,
@ -213,7 +214,10 @@ module.exports = function(User) {
cb(new TypeError('giver should be a string but got %s'));
});
}
const oneHourAgo = moment().subtract(1, 'hour').valueOf();
let temp = moment();
const browniePoints = temp
.subtract.apply(temp, BROWNIEPOINTS_TIMEOUT)
.valueOf();
const user$ = findUser({ where: { username: receiver }});
user$
@ -229,7 +233,7 @@ module.exports = function(User) {
.filter((timestamp) => !!timestamp || typeof timestamp === 'object')
// filterout timestamps older then an hour
.filter(({ timestamp = 0 }) => {
return timestamp >= oneHourAgo;
return timestamp >= browniePoints;
})
// filter out brownie points given by giver
.filter((browniePoint) => {