krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

notifications: fixes

Browse Source
This commit is contained in:
Matteo Pagliazzi
2018-02-04 13:28:05 +01:00
parent 2af99d7c65
commit 4efbbd7bac
15 changed files with 118 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/server/models/user/hooks.js
View File

@@ -4,6 +4,9 @@ import moment from 'moment';
import Bluebird from 'bluebird';
import baseModel from '../../libs/baseModel';
import * as Tasks from '../task';
import {
model as UserNotification,
} from '../userNotification';
import schema from './schema';
@@ -15,6 +18,8 @@ schema.plugin(baseModel, {
plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs
delete plainObj.filters;
plainObj.notifications = UserNotification.convertNotificationsToSafeJson(originalDoc.notifications);
return plainObj;
},
});
@@ -255,7 +260,7 @@ schema.pre('save', true, function preSaveUser (next, done) {
// Sometimes there can be more than 1 notification
const existingNotifications = this.notifications.filter(notification => {
return notification.type === 'UNALLOCATED_STATS_POINTS';
return notification && notification.type === 'UNALLOCATED_STATS_POINTS';
});
const existingNotificationsLength = existingNotifications.length;
@@ -277,7 +282,7 @@ schema.pre('save', true, function preSaveUser (next, done) {
let notificationsRemoved = 0;
this.notifications = this.notifications.filter(notification => {
if (notification.type !== 'UNALLOCATED_STATS_POINTS') return true;
if (notification && notification.type !== 'UNALLOCATED_STATS_POINTS') return true;
if (notificationsRemoved === notificationsToRemove) return true;
notificationsRemoved++;