Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.128.2",
+  "version": "4.128.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.128.2",
+  "version": "4.128.3",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.7.7",

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 = 'JANUARY SUBSCRIBER ITEMS AND OFFICIAL HABITICA CHALLENGES!';
+const LAST_ANNOUNCEMENT_TITLE = 'LAST CHANCE TO GIFT A SUBSCRIPTION AND GET ONE FREE!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,69 +31,31 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>1/1/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>1/6/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_mystery_202001 center-block"></div>
+        <div class="promo_g1g1_2019 center-block"></div>
-        <h3>January Subscriber Items Revealed!</h3>
         <p>
-          The January Subscriber Items have been revealed: the Fabled Fox Item Set! You'll receive
+          Today is your last chance to take advantage of our promotion where if you gift somebody
-          this set if you <a href='/user/settings/subscription'>subscribe to Habitica</a> by
+          a subscription, you get the same subscription for yourself for free!
-          January 31. 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 with Gold and other awesome perks! Plus,
+          Subscribers get tons of perks every month, including exclusive items, the ability to buy
-          our Gift-One-Get-One promotion is running now, so it's the perfect time to check it out.
+          Gems with Gold, and a cute exclusive Jackalope Pet. Plus, it helps keep Habitica running
-          Gift-One-Get-One runs until January 6.
+          :) To gift a subscription to someone, just open their profile and click on the present
-        </p>
+          icon in the upper right.
-        <p>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_list center-block"></div>
-        <h3>January 2020 Resolution Success Challenge and Take This Challenge</h3>
-        <p>
-          The Habitica team has launched a special official Challenge series hosted in the <a
-          href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99' target='_blank'>Official New
-          Year's Resolution Guild</a>. These Challenges are designed to help you build and maintain
-          goals that are destined for success and then stick with them as 2020 progresses.
         </p>
         <p>
-          Check out the first New Year's Resolution Challenge of the year to start your path to
+          If you've been curious about trying out a subscription, now's the time! Make a friend
-          resolution success! In <a href='/challenges/463efbbf-8d98-413d-9bdc-708ab336414e'>Begin
+          happy and use all your new Gems to go questing together.
-          Your Quest</a>, we're focusing on choosing realistic and achievable resolutions! One
-          grand-prize winner will receive their choice of a one-month gift subscription to Habitica
-          or 25 Gems when it closes on February 3rd. Four lucky runners-up will get a 15 Gem prize.
         </p>
         <p>
-          Congratulations to the winners of December's Challenge, @AndoJun, @SilverSquirrel,
+          Please note that if you or your gift recipient already have a recurring subscription,
-          @CathB, @IntegrationAsh, and @DerRue!
+          the gifted subscription will only start after that subscription is cancelled or has
+          expired. Thanks so much for your support! <3
         </p>
-        <div class="promo_take_this center-block"></div>
+        <div class="small mb-3">by the Habitica Team</div>
-        <p>
-          The next Take This Challenge has also launched, <a
-          href='/challenges/8a4beff7-ce41-48de-b963-7194f85b656e'>Hero's Triumph</a>, with a focus
-          on volunteering. Be sure to check it out to earn additional pieces of the Take This armor
-          set!
-        </p>
-        <p>
-          <a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that
-          seeks to inform the gamer community about mental health issues, to provide education
-          about mental disorders and mental illness prevention, and to reduce the stigma of mental
-          illness.
-        </p>
-        <p>
-          Congratulations to the winners of the last Take This Challenge, "Test Thy Courage!":
-          grand prize winner @r-flan2020, and runners-up @SPLOOean, @Bobette37, @WizardGnome,
-          @pearlygeek, and @drilcipher! Plus, all participants in that Challenge have received a
-          piece of the <a
-          href='http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set' target=
-          '_blank'>Take This item set</a> if they hadn't completed it already. It is located in
-          your Rewards column. Enjoy!
-        </p>
-        <div class="small mb-3">
-          by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
-        </div>
       </div>
       `,
     });