Merge branch 'develop' into fix-antidotes-from-revert

website/server/controllers/api-v3/members.js

@@ -330,7 +330,7 @@ function _getMembersForItem (type) {
       }
 
       if (req.query.search) {
-        query['profile.name'] = { $regex: req.query.search };
+        query['auth.local.username'] = { $regex: req.query.search };
       }
     } else if (type === 'group-members') {
       if (group.type === 'guild') {

website/server/controllers/api-v3/news.js

@@ -4,7 +4,7 @@ const api = {};
 
 // @TODO export this const, cannot export it from here because only routes are exported from
 // controllers
-const LAST_ANNOUNCEMENT_TITLE = 'OCTOBER SUBSCRIBER ITEMS AND BLOG POSTS!';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW DINOSAUR PET QUEST BUNDLE AND WIKI SPOTLIGHT';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,43 +31,38 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>10/24/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>11/14/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_mystery_201910 center-block"></div>
-        <h3>October Subscriber Items Revealed!</h3>
-        <p>The October Subscriber Item has been revealed: the Cryptic Flame Item Set! You only
-          have until October 31 to <a href='/user/settings/subscription'>receive the item set when
-          you subscribe</a>. If you're already an active subscriber, reload the site and then head
-          to Inventory > Items to claim your gear!</p>
-        <p>Subscribers also receive the ability to buy Gems for Gold -- the longer you subscribe,
-          the more Gems you can buy per month! There are other perks as well, such as longer
-          access to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us
-          keep Habitica running. Thank you very much for your support -- it means a lot to us.</p>
-        <div class="small mb-3">by Beffymaroo</div>
-        <div class="scene_arts_crafts center-block"></div>
-        <h3>Use Case Spotlight: Habitica Events!</h3>
-        <p>This month's <a href='https://habitica.wordpress.com/2019/10/24/
-          use-case-spotlight-using-habitican-events-for-motivation/' target='_blank'>Use Case
-          Spotlight</a> is about Using Habitica Events for Motivation! It features a number of
-          great suggestions submitted by Habiticans in the
-          <a href='/groups/guild/1d3a10bf-60aa-4806-a38b-82d1084a59e6'>Use Case Spotlights
-            Guild</a>. We hope it helps any of you who might be looking for new ways to
-            incentivize yourselves.</p>
-        <p>Plus, we're collecting user submissions for the next spotlight! How do you gamify your
-          tasks? We’ll be featuring player-submitted examples in Use Case Spotlights on the
-          Habitica Blog next month, so post your suggestions in the Use Case Spotlight Guild now.
-          We look forward to learning more about how you use Habitica to improve your life and get
-          things done!</p>
-        <div class="small mb-3">by shanaqui</div>
-        <h3>Guild Spotlight: More New and Notable Guilds!</h3>
-        <p>There's a new <a href='https://habitica.wordpress.com/2019/10/24/
-          new-and-notable-guild-spotlight-10/' target='_blank'>Guild Spotlight on the blog</a>
-          that highlights yet another selection of the upcoming Guilds in Habitica dedicated to a
-          variety of topics! Check it out now to find some of Habitica's best new communities.</p>
-        <div class="small mb-3">by shanaqui</div>
-        <div class="promo_seasonal_shop_fall center-block"></div>
+        <div class="promo_delightful_dinos center-block"></div>
+        <h3>New Pet Quest Bundle: Delightful Dinos</h3>
+        <p>
+          If you are looking to add some dinosaur pets to your Habitica stable, life, uh, finds a
+          way! From now until November 30, you can purchase the Delightful Dinos Pet Quest Bundle
+          and receive the Pterodactyl, Triceratops, and T-Rex (The Dinosaur Unearthed) quests, all
+          for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them
+          separately. Check it out in the <a href='/shops/quests'>Quest Shop</a> today!
+        </p>
+        <div class="small">by SabreCat and Beffymaroo</div>
+        <div class="small">Art by Baconsaur, Eevachu, UncommonCriminal, Kiwibot, McCoyly,
+          plumilla, Seraphina, PainterProphet, Stefalupagus, Katy133, Edge, Willow The Witty,
+          Lilith of Alfheim, Procyon, GeraldThePixel, and Archeia
+        </div>
+        <div class="small mb-3">Writing by Lemoness, Daniel the Bard, Lilith of Alfheim, and Ali
+          Stewart
+        </div>
+        <div class="scene_habitica_map center-block"></div>
+        <h3>Blog Post: Places in Habitica</h3>
+        <p>This month's <a href='https://habitica.wordpress.com/2019/11/14/places-in-habitica/'
+          target='_blank'>featured Wiki article</a> is about Places in Habitica! We hope that it
+          will help you as you gamify your tasks. Be sure to check it out, and let us know what 
+          you think by reaching out on <a href='https://twitter.com/habitica'
+          target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com'
+          target='_blank'>Tumblr</a>, and <a href='https://facebook.com/habitica'
+          target='_blank'>Facebook</a>.
+        </p>
+        <div class="small mb-3">by shanaqui and the Wiki Wizards</div>
       </div>
       `,
     });

website/server/controllers/api-v3/webhook.js

@@ -179,7 +179,8 @@ api.updateWebhook = {
       webhook.url = url;
     }
 
-    if (label) {
+    // using this check to allow the setting of empty labels
+    if (label !== null && label !== undefined) {
       webhook.label = label;
     }
 

website/server/libs/invites/index.js

@@ -175,7 +175,7 @@ async function inviteByEmail (invite, group, inviter, req, res) {
       sentAt: Date.now(), // so we can let it expire
       cancelledPlan,
     });
-    const link = `/static/front?groupInvite=${encrypt(groupQueryString)}`;
+    const link = `/static/home?groupInvite=${encrypt(groupQueryString)}`;
 
     const variables = [
       { name: 'LINK', content: link },

website/server/libs/taskManager.js

@@ -116,7 +116,7 @@ export async function createTasks (req, res, options = {}) {
 
     // Otherwise update the user/challenge/group
     if (!taskOrderToAdd[`${taskType}s`]) taskOrderToAdd[`${taskType}s`] = [];
-    taskOrderToAdd[`${taskType}s`].unshift(newTask._id);
+    if (!owner.tasksOrder[`${taskType}s`].includes(newTask._id)) taskOrderToAdd[`${taskType}s`].unshift(newTask._id);
 
     return newTask;
   });

website/server/models/user/hooks.js

@@ -127,11 +127,11 @@ function _setUpNewUser (user) {
   const iterableFlags = user.flags.toObject();
 
   user.items.quests.dustbunnies = 1;
-  user.markModified('items.quests');
-
   user.purchased.background.violet = true;
   user.preferences.background = 'violet';
 
+  user.markModified('items');
+
   if (user.registeredThrough === 'habitica-web') {
     taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];