diff --git a/migrations/takeThis.js b/migrations/users/takeThis.js similarity index 91% rename from migrations/takeThis.js rename to migrations/users/takeThis.js index d276727a70..f7b5b0af8c 100644 --- a/migrations/takeThis.js +++ b/migrations/users/takeThis.js @@ -1,4 +1,4 @@ -let migrationName = '20180102_takeThis.js'; // Update per month +let migrationName = '20180702_takeThis.js'; // Update per month let authorName = 'Sabe'; // in case script author needs to know when their ... let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done @@ -6,15 +6,16 @@ let authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; // ... own data is done * Award Take This ladder items to participants in this month's challenge */ -let monk = require('monk'); -let connectionString = 'mongodb://localhost:27017/habitrpg?auto_reconnect=true'; // FOR TEST DATABASE -let dbUsers = monk(connectionString).get('users', { castIds: false }); +import monk from 'monk'; +import nconf from 'nconf'; +const CONNECTION_STRING = nconf.get('MIGRATION_CONNECT_STRING'); // FOR TEST DATABASE +let dbUsers = monk(CONNECTION_STRING).get('users', { castIds: false }); function processUsers (lastId) { // specify a query to limit the affected users (empty for all users): let query = { migration: {$ne: migrationName}, - challenges: {$in: ['5f70ce5b-2d82-4114-8e44-ca65615aae62']}, // Update per month + challenges: {$in: ['f0481f95-1dde-4ae7-a876-d19502a45d61']}, // Update per month }; if (lastId) { diff --git a/website/raw_sprites/spritesmith_large/scene_party_healing.png b/website/raw_sprites/spritesmith_large/scene_party_healing.png new file mode 100644 index 0000000000..5a4765d580 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_party_healing.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 0b005cd1e8..951ab60a04 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'LAST CHANCE FOR ALLURING ANGLERFISH SET AND AQUATIC AMIGOS QUEST BUNDLE; FEATURED WIKI ON GUILD CREATION'; +const LAST_ANNOUNCEMENT_TITLE = 'JULY HABITICA CHALLENGES: RESOLUTION SUCCESS AND TAKE THIS'; const worldDmg = { // @TODO bailey: false, }; @@ -30,30 +30,26 @@ api.getNews = {

${res.t('newStuff')}

-

6/26/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

7/2/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-

Last Chance for Alluring Anglerfish Set

-

Reminder: this weekend is your last chance to subscribe and receive the Alluring Anglerfish Set! Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems you get!

-

Thanks so much for your support! You help keep Habitica running.

-
by Beffymaroo
+

The Habitica team has launched a special official Challenge series hosted in the Official New Year's Resolution Guild. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses. For this month's Challenge, Convene Your Companions, we're focusing on building accountability with your friends in Habitica's social spaces! It has a 15 Gem prize, which will be awarded to five lucky winners on August 1st.

+

Congratulations to the winners of the June Challenge, Pyrrh Pianissimo, Stephable, Lizzie, zoefcunningham, and Tortoise!

-
+
-
-

Last Chance for Aquatic Amigos Pet Quest Bundle

-

This is also the final weekend to buy the discounted Aquatic Amigos Pet Quest Bundle, featuring the Axolotl, Cuttlefish, and Octopus quests all for seven Gems! Be sure to check it out in the Quest Shop before it floats away!

-
+
+
-

Blog Post: Guild Creation and Maintenance Tips

-

This month's featured Wiki article is about Guild Creation and Maintenance! We hope that it will help you as explore Habitica's social spaces. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.

-
by shanaqui and the Wiki Wizards
+

The next Take This Challenge has also launched, "Multi-Player Co-Op Exercise!", with a focus on partnering up with others for fitness accountability. Be sure to check it out to earn additional pieces of the Take This armor set!

-
+

Take This 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.

+

Congratulations to the winners of the last Take This Challenge, "Hero's Triumph!": grand prize winner StormyMudd, and runners-up MrPandaChao, likesevenspoon, Maira Severo, Laylah, and panzerkroete. Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't completed it already. It is located in your Rewards column. Enjoy!

+
by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
`, });