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

Fix notifications in user pre save hook (#10348)

Browse Source
This commit is contained in:
Matteo Pagliazzi
2018-05-09 19:19:08 +02:00
committed by GitHub
parent a8655d923a
commit 042ac6ac73
2 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,41 +248,45 @@ schema.pre('save', true, function preSaveUser (next, done) {
// this.items.pets['JackOLantern-Base'] = 5; // this.items.pets['JackOLantern-Base'] = 5;
} }
// Manage unallocated stats points notifications // Filter notifications, remove unvalid and not necessary, handle the ones that have special requirements
if (this.isDirectSelected('stats') && this.isDirectSelected('notifications') && this.isDirectSelected('flags') && this.isDirectSelected('preferences')) { if ( // Make sure all the data is loaded
this.isDirectSelected('notifications') &&
this.isDirectSelected('stats') &&
this.isDirectSelected('flags') &&
this.isDirectSelected('preferences')
) {
const unallocatedPointsNotifications = [];
this.notifications = this.notifications.filter(notification => {
// Remove corrupt notifications
if (!notification || !notification.type) return false;
// Remove all unsallocated stats points
if (notification && notification.type === 'UNALLOCATED_STATS_POINTS') {
unallocatedPointsNotifications.push(notification);
return false;
}
// Keep all the others
return true;
});
// Handle unallocated stats points notifications (keep only one and up to date)
const pointsToAllocate = this.stats.points; const pointsToAllocate = this.stats.points;
const classNotEnabled = !this.flags.classSelected || this.preferences.disableClasses; const classNotEnabled = !this.flags.classSelected || this.preferences.disableClasses;
// Sometimes there can be more than 1 notification
const existingNotifications = this.notifications.filter(notification => {
return notification && notification.type === 'UNALLOCATED_STATS_POINTS';
});
const existingNotificationsLength = existingNotifications.length;
// Take the most recent notification // Take the most recent notification
const lastExistingNotification = existingNotificationsLength > 0 ? existingNotifications[existingNotificationsLength - 1] : null; const lastExistingNotification = unallocatedPointsNotifications[unallocatedPointsNotifications.length - 1];
// Decide if it's outdated or not // Decide if it's outdated or not
const outdatedNotification = !lastExistingNotification || lastExistingNotification.data.points !== pointsToAllocate; const outdatedNotification = !lastExistingNotification || lastExistingNotification.data.points !== pointsToAllocate;
// If the notification is outdated, remove all the existing notifications, otherwise all of them except the last
let notificationsToRemove = outdatedNotification ? existingNotificationsLength : existingNotificationsLength - 1;
// If there are points to allocate and the notification is outdated, add a new notifications // If there are points to allocate and the notification is outdated, add a new notifications
if (pointsToAllocate > 0 && !classNotEnabled && outdatedNotification) { if (pointsToAllocate > 0 && !classNotEnabled) {
if (outdatedNotification) {
this.addNotification('UNALLOCATED_STATS_POINTS', { points: pointsToAllocate }); this.addNotification('UNALLOCATED_STATS_POINTS', { points: pointsToAllocate });
} else { // otherwise add back the last one
this.notifications.push(lastExistingNotification);
} }
// Remove the outdated notifications
if (notificationsToRemove > 0) {
let notificationsRemoved = 0;
this.notifications = this.notifications.filter(notification => {
if (notification && notification.type !== 'UNALLOCATED_STATS_POINTS') return true;
if (notificationsRemoved === notificationsToRemove) return true;
notificationsRemoved++;
return false;
});
} }
} }

1
website/server/models/user/schema.js
View File

@@ -597,6 +597,7 @@ let schema = new Schema({
type: {type: String}, type: {type: String},
}], }],
}, { }, {
skipVersioning: { notifications: true },
strict: true, strict: true,
minimize: false, // So empty objects are returned minimize: false, // So empty objects are returned
}); });