Merge remote-tracking branch 'origin/develop' into negue/ui/setting

website/server/models/group.js

@@ -91,6 +91,7 @@ export const schema = new Schema({
   },
   memberCount: { $type: Number, default: 1 },
   challengeCount: { $type: Number, default: 0 },
+  chatLimitCount: { $type: Number },
   balance: { $type: Number, default: 0 },
   logo: String,
   leaderMessage: String,
@@ -871,6 +872,7 @@ function _getUserUpdateForQuestReward (itemToAward, allAwardedItems) {
   let updates = {
     $set: {},
     $inc: {},
+    $pull: {},
   };
   const dropK = itemToAward.key;
 
@@ -878,6 +880,7 @@ function _getUserUpdateForQuestReward (itemToAward, allAwardedItems) {
     case 'gear': {
       // TODO This means they can lose their new gear on death, is that what we want?
       updates.$set[`items.gear.owned.${dropK}`] = true;
+      updates.$pull.pinnedItems = { path: `gear.flat.${dropK}` };
       break;
     }
     case 'eggs':

website/server/models/message.js

@@ -67,8 +67,11 @@ export function setUserStyles (newMessage, user) {
 
   if (userCopy.items) {
     userStyles.items.gear = {};
-    userStyles.items.gear.costume = { ...userCopy.items.gear.costume };
-    userStyles.items.gear.equipped = { ...userCopy.items.gear.equipped };
+    if (userCopy.preferences && userCopy.preferences.costume) {
+      userStyles.items.gear.costume = { ...userCopy.items.gear.costume };
+    } else {
+      userStyles.items.gear.equipped = { ...userCopy.items.gear.equipped };
+    }
 
     userStyles.items.currentMount = userCopy.items.currentMount;
     userStyles.items.currentPet = userCopy.items.currentPet;

website/server/models/user/hooks.js

@@ -150,10 +150,10 @@ function _setUpNewUser (user) {
   user.items.quests.dustbunnies = 1;
   user.purchased.background.violet = true;
   user.preferences.background = 'violet';
-  if (moment().isBetween('2022-11-22T08:00-05:00', '2022-11-27T20:00-05:00')) {
-    user.migration = '20221122_harvest_feast';
-    user.items.pets['Turkey-Base'] = 5;
-    user.items.currentPet = 'Turkey-Base';
+  if (moment().isBetween('2022-12-27T08:00-05:00', '2023-01-02T20:00-05:00')) {
+    user.migration = '20221227_nye';
+    user.items.gear.owned.head_special_nye = true;
+    user.items.gear.equipped.head = 'head_special_nye';
   }
 
   user.markModified('items achievements');

website/server/models/user/schema.js

@@ -152,6 +152,7 @@ export const UserSchema = new Schema({
     reptacularRumble: Boolean,
     woodlandWizard: Boolean,
     boneToPick: Boolean,
+    polarPro: Boolean,
     // Onboarding Guide
     createdTask: Boolean,
     completedTask: Boolean,