Merge develop

This commit is contained in:
SabreCat
2022-06-16 13:25:56 -05:00
parent ce67f06bab
commit 4a3a7db52a
142 changed files with 3172 additions and 3138 deletions
@@ -344,6 +344,10 @@ function _getSpecialAchievements (user, language) {
_addSimple(result, user, { path: 'kickstarter2019', language });
}
if (user.achievements.groupsBeta2022) {
_addSimple(result, user, { path: 'groupsBeta2022', language });
}
return result;
}
+1 -1
View File
@@ -11,7 +11,7 @@ function equipmentStatBonusComputed (stat, user) {
// toObject is required here due to lodash values not working well with mongoose doc objects.
// if toObject doesn't exist, we can assume the object is already plain JSON
// see http://stackoverflow.com/questions/25767334/underscore-js-keys-and-omit-not-working-as-expected
// see https://stackoverflow.com/questions/25767334/underscore-js-keys-and-omit-not-working-as-expected
const { equipped } = user.items.gear;
const equippedKeys = values(!equipped.toObject ? equipped : equipped.toObject());