From 86efb02358c52d5254a084ce94ee82be9beb0662 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 18 Apr 2023 15:43:35 -0500 Subject: [PATCH 01/17] fix(api): address issues caused by 3p tools and flag accounts that use them --- website/common/script/constants.js | 2 ++ website/common/script/index.js | 2 ++ website/server/controllers/api-v3/user.js | 7 ++++++ website/server/middlewares/auth.js | 4 ++++ website/server/models/user/schema.js | 29 ++++++++++++----------- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/website/common/script/constants.js b/website/common/script/constants.js index b3510378e0..248560f28a 100644 --- a/website/common/script/constants.js +++ b/website/common/script/constants.js @@ -25,6 +25,8 @@ export const SUPPORTED_SOCIAL_NETWORKS = [ { key: 'apple', name: 'Apple' }, ]; +export const OFFICIAL_PLATFORMS = ['habitica-web', 'habitica-ios', 'habitica-android']; + export const GUILDS_PER_PAGE = 30; // number of guilds to return per page when using pagination export const PARTY_LIMIT_MEMBERS = 29; diff --git a/website/common/script/index.js b/website/common/script/index.js index 3045e012ee..3c6b5b0d6c 100644 --- a/website/common/script/index.js +++ b/website/common/script/index.js @@ -22,6 +22,7 @@ import { TAVERN_ID, MAX_MESSAGE_LENGTH, MAX_GIFT_MESSAGE_LENGTH, + OFFICIAL_PLATFORMS, } from './constants'; import content from './content/index'; import * as count from './count'; @@ -124,6 +125,7 @@ api.constants = { MAX_MESSAGE_LENGTH, MAX_GIFT_MESSAGE_LENGTH, MAX_LEVEL_HARD_CAP, + OFFICIAL_PLATFORMS, }; // TODO Move these under api.constants api.maxLevel = MAX_LEVEL; diff --git a/website/server/controllers/api-v3/user.js b/website/server/controllers/api-v3/user.js index c422541705..c5e1acbc8e 100644 --- a/website/server/controllers/api-v3/user.js +++ b/website/server/controllers/api-v3/user.js @@ -22,6 +22,7 @@ import { } from '../../libs/email'; import * as inboxLib from '../../libs/inbox'; import * as userLib from '../../libs/user'; +import { OFFICIAL_PLATFORMS } from '../../../common/script/constants'; const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS_TECH_ASSISTANCE_EMAIL'); const DELETE_CONFIRMATION = 'DELETE'; @@ -494,6 +495,9 @@ api.buy = { let quantity = 1; if (req.body.quantity) quantity = req.body.quantity; req.quantity = quantity; + if (OFFICIAL_PLATFORMS.indexOf(req.headers['x-client']) === -1) { + res.analytics = undefined; + } const buyRes = await common.ops.buy(user, req, res.analytics); await user.save(); @@ -584,6 +588,9 @@ api.buyArmoire = { const { user } = res.locals; req.type = 'armoire'; req.params.key = 'armoire'; + if (OFFICIAL_PLATFORMS.indexOf(req.headers['x-client']) === -1) { + res.analytics = undefined; + } const buyArmoireResponse = await common.ops.buy(user, req, res.analytics); await user.save(); res.respond(200, ...buyArmoireResponse); diff --git a/website/server/middlewares/auth.js b/website/server/middlewares/auth.js index 7332ba30c3..dfc01ed99e 100644 --- a/website/server/middlewares/auth.js +++ b/website/server/middlewares/auth.js @@ -55,6 +55,7 @@ export function authWithHeaders (options = {}) { return function authWithHeadersHandler (req, res, next) { const userId = req.header('x-api-user'); const apiToken = req.header('x-api-key'); + const client = req.header('x-client'); const optional = options.optional || false; if (!userId || !apiToken) { @@ -90,6 +91,9 @@ export function authWithHeaders (options = {}) { req.session.userId = user._id; stackdriverTraceUserId(user._id); user.auth.timestamps.updated = new Date(); + if (common.constants.OFFICIAL_PLATFORMS.indexOf(client) === -1 && !user.flags.thirdPartyTools) { + User.updateOne(userQuery, { $set: { 'flags.thirdPartyTools': true }}).exec(); + } return next(); }) .catch(next); diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 7c9ab11a59..2af2b88e66 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -306,6 +306,7 @@ export default new Schema({ cardReceived: { $type: Boolean, default: false }, warnedLowHealth: { $type: Boolean, default: false }, verifiedUsername: { $type: Boolean, default: false }, + thirdPartyTools: { $type: Boolean, default: false }, }, history: { @@ -613,10 +614,10 @@ export default new Schema({ }, }, stats: { - hp: { $type: Number, default: shared.maxHealth }, - mp: { $type: Number, default: 10 }, - exp: { $type: Number, default: 0 }, - gp: { $type: Number, default: 0 }, + hp: { $type: Number, default: shared.maxHealth, min: 0 }, + mp: { $type: Number, default: 10, min: 0 }, + exp: { $type: Number, default: 0, min: 0 }, + gp: { $type: Number, default: 0, min: 0 }, lvl: { $type: Number, default: 1, @@ -628,17 +629,17 @@ export default new Schema({ class: { $type: String, enum: ['warrior', 'rogue', 'wizard', 'healer'], default: 'warrior', required: true, }, - points: { $type: Number, default: 0 }, - str: { $type: Number, default: 0 }, - con: { $type: Number, default: 0 }, - int: { $type: Number, default: 0 }, - per: { $type: Number, default: 0 }, + points: { $type: Number, default: 0, min: 0 }, + str: { $type: Number, default: 0, min: 0 }, + con: { $type: Number, default: 0, min: 0 }, + int: { $type: Number, default: 0, min: 0 }, + per: { $type: Number, default: 0, min: 0 }, buffs: { - str: { $type: Number, default: 0 }, - int: { $type: Number, default: 0 }, - per: { $type: Number, default: 0 }, - con: { $type: Number, default: 0 }, - stealth: { $type: Number, default: 0 }, + str: { $type: Number, default: 0, min: 0 }, + int: { $type: Number, default: 0, min: 0 }, + per: { $type: Number, default: 0, min: 0 }, + con: { $type: Number, default: 0, min: 0 }, + stealth: { $type: Number, default: 0, min: 0 }, streaks: { $type: Boolean, default: false }, snowball: { $type: Boolean, default: false }, spookySparkles: { $type: Boolean, default: false }, From 3cf5b90f0421b589732cbb1609dd0b19f3cea172 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 19 Apr 2023 09:33:03 -0500 Subject: [PATCH 02/17] fix(3p): bad import, change flag format --- website/common/script/constants.js | 2 -- website/common/script/index.js | 2 -- website/server/controllers/api-v3/user.js | 2 +- website/server/middlewares/auth.js | 5 +++-- website/server/models/user/schema.js | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/website/common/script/constants.js b/website/common/script/constants.js index 248560f28a..b3510378e0 100644 --- a/website/common/script/constants.js +++ b/website/common/script/constants.js @@ -25,8 +25,6 @@ export const SUPPORTED_SOCIAL_NETWORKS = [ { key: 'apple', name: 'Apple' }, ]; -export const OFFICIAL_PLATFORMS = ['habitica-web', 'habitica-ios', 'habitica-android']; - export const GUILDS_PER_PAGE = 30; // number of guilds to return per page when using pagination export const PARTY_LIMIT_MEMBERS = 29; diff --git a/website/common/script/index.js b/website/common/script/index.js index 3c6b5b0d6c..3045e012ee 100644 --- a/website/common/script/index.js +++ b/website/common/script/index.js @@ -22,7 +22,6 @@ import { TAVERN_ID, MAX_MESSAGE_LENGTH, MAX_GIFT_MESSAGE_LENGTH, - OFFICIAL_PLATFORMS, } from './constants'; import content from './content/index'; import * as count from './count'; @@ -125,7 +124,6 @@ api.constants = { MAX_MESSAGE_LENGTH, MAX_GIFT_MESSAGE_LENGTH, MAX_LEVEL_HARD_CAP, - OFFICIAL_PLATFORMS, }; // TODO Move these under api.constants api.maxLevel = MAX_LEVEL; diff --git a/website/server/controllers/api-v3/user.js b/website/server/controllers/api-v3/user.js index c5e1acbc8e..c26a0802eb 100644 --- a/website/server/controllers/api-v3/user.js +++ b/website/server/controllers/api-v3/user.js @@ -22,8 +22,8 @@ import { } from '../../libs/email'; import * as inboxLib from '../../libs/inbox'; import * as userLib from '../../libs/user'; -import { OFFICIAL_PLATFORMS } from '../../../common/script/constants'; +const OFFICIAL_PLATFORMS = ['habitica-web', 'habitica-ios', 'habitica-android']; const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS_TECH_ASSISTANCE_EMAIL'); const DELETE_CONFIRMATION = 'DELETE'; diff --git a/website/server/middlewares/auth.js b/website/server/middlewares/auth.js index dfc01ed99e..b69cbb41ac 100644 --- a/website/server/middlewares/auth.js +++ b/website/server/middlewares/auth.js @@ -10,6 +10,7 @@ import gcpStackdriverTracer from '../libs/gcpTraceAgent'; import common from '../../common'; import { getLanguageFromUser } from '../libs/language'; +const OFFICIAL_PLATFORMS = ['habitica-web', 'habitica-ios', 'habitica-android']; const COMMUNITY_MANAGER_EMAIL = nconf.get('EMAILS_COMMUNITY_MANAGER_EMAIL'); const USER_FIELDS_ALWAYS_LOADED = ['_id', 'notifications', 'preferences', 'auth', 'flags', 'permissions']; @@ -91,8 +92,8 @@ export function authWithHeaders (options = {}) { req.session.userId = user._id; stackdriverTraceUserId(user._id); user.auth.timestamps.updated = new Date(); - if (common.constants.OFFICIAL_PLATFORMS.indexOf(client) === -1 && !user.flags.thirdPartyTools) { - User.updateOne(userQuery, { $set: { 'flags.thirdPartyTools': true }}).exec(); + if (OFFICIAL_PLATFORMS.indexOf(client) === -1 && !user.flags.thirdPartyTools) { + User.updateOne(userQuery, { $set: { 'flags.thirdPartyTools': new Date() } }).exec(); } return next(); }) diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 2af2b88e66..6e462b9e35 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -306,7 +306,7 @@ export default new Schema({ cardReceived: { $type: Boolean, default: false }, warnedLowHealth: { $type: Boolean, default: false }, verifiedUsername: { $type: Boolean, default: false }, - thirdPartyTools: { $type: Boolean, default: false }, + thirdPartyTools: { $type: Date }, }, history: { From 0ac2f534050c0f62b8a7dfdbeabbec67d933b82c Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 20 Apr 2023 15:19:05 -0500 Subject: [PATCH 03/17] fix(3p): update timing 1/day at most --- website/server/middlewares/auth.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/server/middlewares/auth.js b/website/server/middlewares/auth.js index b69cbb41ac..cf7804cf20 100644 --- a/website/server/middlewares/auth.js +++ b/website/server/middlewares/auth.js @@ -1,3 +1,4 @@ +import moment from 'moment'; import nconf from 'nconf'; import url from 'url'; import { @@ -92,7 +93,9 @@ export function authWithHeaders (options = {}) { req.session.userId = user._id; stackdriverTraceUserId(user._id); user.auth.timestamps.updated = new Date(); - if (OFFICIAL_PLATFORMS.indexOf(client) === -1 && !user.flags.thirdPartyTools) { + if (OFFICIAL_PLATFORMS.indexOf(client) === -1 + && (!user.flags.thirdPartyTools || moment().diff(user.flags.thirdPartyTools, 'days') > 0) + ) { User.updateOne(userQuery, { $set: { 'flags.thirdPartyTools': new Date() } }).exec(); } return next(); From 92b4a8029d7e463745c344e1ca7c9011f5424e1c Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 25 Apr 2023 15:14:59 -0500 Subject: [PATCH 04/17] fix(links): handle meta key --- website/client/src/mixins/externalLinks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/src/mixins/externalLinks.js b/website/client/src/mixins/externalLinks.js index 8acbbeddf5..2a2c0a7b8c 100644 --- a/website/client/src/mixins/externalLinks.js +++ b/website/client/src/mixins/externalLinks.js @@ -20,7 +20,7 @@ export default { && !some(TRUSTED_DOMAINS.split(','), domain => link.href.indexOf(domain) === domainIndex)) { link.classList.add('external-link'); link.addEventListener('click', e => { - if (e.ctrlKey) { + if (e.ctrlKey || e.metaKey) { return; } e.stopPropagation(); From 57027a1a62bbff273e2a35e1bedc113de7c55814 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 25 Apr 2023 15:50:55 -0500 Subject: [PATCH 05/17] 4.267.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index dff929a631..5d83e8151c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.267.1", + "version": "4.267.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bb6bce7c68..5041df3909 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.267.1", + "version": "4.267.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12", From 61e41b539d1ab5bd7f8146526a09bad8882b1620 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 26 Apr 2023 16:13:42 -0500 Subject: [PATCH 06/17] feat(admin): show 3p note in panel --- .../src/components/admin-panel/user-support/cronAndAuth.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/client/src/components/admin-panel/user-support/cronAndAuth.vue b/website/client/src/components/admin-panel/user-support/cronAndAuth.vue index 8b107ebf21..624992ae70 100644 --- a/website/client/src/components/admin-panel/user-support/cronAndAuth.vue +++ b/website/client/src/components/admin-panel/user-support/cronAndAuth.vue @@ -22,6 +22,10 @@ Account created: {{ hero.auth.timestamps.created | formatDate }} +
+ User has employed third party tools. Last known usage: + {{ hero.flags.thirdPartyTools | formatDate }} +
"lastCron" value: {{ hero.lastCron | formatDate }} From 6cb3dcd76a3d52937b837aaf7dfaf3f3fc231b61 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 27 Apr 2023 15:21:37 -0500 Subject: [PATCH 07/17] fix(fcv): disallow negative values --- test/helpers/api-integration/requester.js | 3 ++- website/client/src/components/settings/restoreModal.vue | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/helpers/api-integration/requester.js b/test/helpers/api-integration/requester.js index ad01f35978..61c0b2fabf 100644 --- a/test/helpers/api-integration/requester.js +++ b/test/helpers/api-integration/requester.js @@ -53,7 +53,8 @@ function _requestMaker (user, method, additionalSets = {}) { if (user && user._id && user.apiToken) { request .set('x-api-user', user._id) - .set('x-api-key', user.apiToken); + .set('x-api-key', user.apiToken) + .set('x-client', 'habitica-web'); } if (!isEmpty(additionalSets)) { diff --git a/website/client/src/components/settings/restoreModal.vue b/website/client/src/components/settings/restoreModal.vue index de185f7226..bbd86f000a 100644 --- a/website/client/src/components/settings/restoreModal.vue +++ b/website/client/src/components/settings/restoreModal.vue @@ -179,7 +179,9 @@ export default { let valid = true; for (const stat of canRestore) { - if (this.restoreValues.stats[stat] === '') { + if (this.restoreValues.stats[stat] === '' + || this.restoreValues.stats[stat] < 0 + ) { this.restoreValues.stats[stat] = this.user.stats[stat]; valid = false; } From 33f0a11f19112b14fed7b26dc368a7fbab1d3c21 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 27 Apr 2023 15:35:55 -0500 Subject: [PATCH 08/17] 4.267.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5d83e8151c..814d2704df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.267.2", + "version": "4.267.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5041df3909..2e031b74bb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.267.2", + "version": "4.267.3", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12", From c931823f624131fdbae76a3668cf291d693d52fb Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 28 Apr 2023 15:55:06 -0500 Subject: [PATCH 09/17] chore(subproj): update habitica-images --- habitica-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 4ec7469f72..311cb01059 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 4ec7469f72f59f0fdac74710d32add59958a540e +Subproject commit 311cb010591a9de368a1ab5db7506d2d3efbb10b From 76845f5f20bc2afedf0838f3679d05e0175f502f Mon Sep 17 00:00:00 2001 From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Fri, 28 Apr 2023 17:18:45 -0400 Subject: [PATCH 10/17] feat(content): add May subscriber items (#14613) Co-authored-by: SabreCat --- .../assets/css/sprites/spritesmith-main.css | 25 +++++++++++++++++++ website/common/locales/en/gear.json | 4 +++ website/common/locales/en/subscriber.json | 1 + .../script/content/gear/sets/mystery.js | 2 ++ 4 files changed, 32 insertions(+) diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index c2c9f08756..8a5531760f 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -27905,6 +27905,31 @@ width: 114px; height: 90px; } +.back_mystery_202305 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202305.png'); + width: 114px; + height: 90px; +} +.headAccessory_mystery_202305 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_mystery_202305.png'); + width: 114px; + height: 90px; +} +.shop_back_mystery_202305 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_back_mystery_202305.png'); + width: 68px; + height: 68px; +} +.shop_headAccessory_mystery_202305 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_mystery_202305.png'); + width: 68px; + height: 68px; +} +.shop_set_mystery_202305 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202305.png'); + width: 68px; + height: 68px; +} .broad_armor_mystery_301404 { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png'); width: 90px; diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 6c7ba8a703..dde67616f2 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -2717,6 +2717,8 @@ "backMystery202301Notes": "These fluffy tails contain ethereal power and also a high level of charm! Confers no benefit. January 2023 Subscriber Item.", "backMystery202302Text": "Trickster Tabby Tail", "backMystery202302Notes": "Anytime you wear this tail it's sure to be a frabjous day! Callooh! Callay! Confers no benefit. February 2023 Subscriber Item.", + "backMystery202305Text": "Eventide Wings", + "backMystery202305Notes": "Catch the sparkle of the evening star and soar to strange realms on these wings. Confers no benefit. May 2023 Subscriber Item.", "backSpecialWonderconRedText": "Mighty Cape", "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.", @@ -2928,6 +2930,8 @@ "headAccessoryMystery202212Notes": "Magnify your warmth and friendship to new heights with this ornate golden tiara. Confers no benefit. December 2022 Subscriber Item.", "headAccessoryMystery202302Text": "Trickster Tabby Ears", "headAccessoryMystery202302Notes": "The purr-fect accessory to set off your enchanting grin. Confers no benefit. February 2023 Subscriber Item.", + "headAccessoryMystery202305Text": "Eventide Horns", + "headAccessoryMystery202305Notes": "These horns glow with reflected moonlight. Confers no benefit. May 2023 Subscriber Item.", "headAccessoryMystery301405Text": "Headwear Goggles", "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 3708259a86..df5f49cb68 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -149,6 +149,7 @@ "mysterySet202302": "Trickster Tabby Set", "mysterySet202303": "Mane Character Set", "mysterySet202304": "Tiptop Teapot Set", + "mysterySet202305": "Eventide Dragon Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySet301703": "Peacock Steampunk Set", diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index 7d44bfa83d..0800c2363d 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -99,6 +99,7 @@ const back = { 202206: { }, 202301: { }, 202302: { }, + 202305: { }, }; const body = { @@ -233,6 +234,7 @@ const headAccessory = { 202212: { }, 202205: { }, 202302: { }, + 202305: { }, 301405: { }, }; From 6ed5a0f44b1839331fce51e9b63faa6c3ef2a2a0 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 28 Apr 2023 16:19:07 -0500 Subject: [PATCH 11/17] 4.268.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 814d2704df..3599dd6be2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.267.3", + "version": "4.268.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2e031b74bb..2dad237d4a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.267.3", + "version": "4.268.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12", From 5aa2d9c68d4682dee05fe8113d9f69c1b72c88e9 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 1 May 2023 10:47:42 -0500 Subject: [PATCH 12/17] fix(stats): allow negative HP --- website/server/models/user/schema.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 6e462b9e35..1a39c01f31 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -614,7 +614,7 @@ export default new Schema({ }, }, stats: { - hp: { $type: Number, default: shared.maxHealth, min: 0 }, + hp: { $type: Number, default: shared.maxHealth }, mp: { $type: Number, default: 10, min: 0 }, exp: { $type: Number, default: 0, min: 0 }, gp: { $type: Number, default: 0, min: 0 }, From c1532996d84fc2b3520468771bb6e8daa1f39f71 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 1 May 2023 10:47:53 -0500 Subject: [PATCH 13/17] 4.268.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3599dd6be2..936c950279 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.268.0", + "version": "4.268.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2dad237d4a..329651e2e9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.268.0", + "version": "4.268.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12", From 9e0777bb42eff952f1677a1ac7d888b4a4fad747 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 1 May 2023 16:30:21 -0500 Subject: [PATCH 14/17] fix(group-plans): tokenize and update ad text --- .../client/src/components/groups/groupPlan.vue | 18 +++++++++--------- website/common/locales/ach/groups.json | 2 +- website/common/locales/af/groups.json | 2 +- website/common/locales/ar/groups.json | 2 +- website/common/locales/be/groups.json | 2 +- website/common/locales/bn/groups.json | 2 +- website/common/locales/ca/groups.json | 2 +- website/common/locales/cs/groups.json | 2 +- website/common/locales/el/groups.json | 2 +- website/common/locales/en@lolcat/groups.json | 2 +- website/common/locales/en@pirate/groups.json | 2 +- website/common/locales/en_GB/groups.json | 2 +- website/common/locales/eo/groups.json | 2 +- website/common/locales/et/groups.json | 2 +- website/common/locales/fa_IR/groups.json | 2 +- website/common/locales/fi/groups.json | 2 +- website/common/locales/fil/groups.json | 2 +- website/common/locales/fy/groups.json | 2 +- website/common/locales/ga/groups.json | 2 +- website/common/locales/haw/groups.json | 2 +- website/common/locales/hi_IN/groups.json | 2 +- website/common/locales/id/groups.json | 2 +- website/common/locales/is/groups.json | 2 +- website/common/locales/jbo/groups.json | 2 +- website/common/locales/jv/groups.json | 2 +- website/common/locales/ko/groups.json | 2 +- website/common/locales/ku_IQ/groups.json | 2 +- website/common/locales/la/groups.json | 2 +- website/common/locales/ln/groups.json | 2 +- website/common/locales/lt/groups.json | 2 +- website/common/locales/lv/groups.json | 2 +- website/common/locales/mk/groups.json | 2 +- website/common/locales/ml/groups.json | 2 +- website/common/locales/mn/groups.json | 2 +- website/common/locales/mr/groups.json | 2 +- website/common/locales/ms/groups.json | 2 +- website/common/locales/nn/groups.json | 2 +- website/common/locales/no/groups.json | 2 +- website/common/locales/ro/groups.json | 2 +- website/common/locales/sco/groups.json | 2 +- website/common/locales/si/groups.json | 2 +- website/common/locales/sk/groups.json | 2 +- website/common/locales/sl/groups.json | 2 +- website/common/locales/sr/groups.json | 2 +- website/common/locales/su/groups.json | 2 +- website/common/locales/sv/groups.json | 2 +- website/common/locales/sw/groups.json | 2 +- website/common/locales/ta/groups.json | 2 +- website/common/locales/th/groups.json | 2 +- website/common/locales/tl_PH/groups.json | 2 +- website/common/locales/tlh/groups.json | 2 +- website/common/locales/ur_PK/groups.json | 2 +- website/common/locales/vi/groups.json | 2 +- website/common/locales/zh_HK/groups.json | 2 +- 54 files changed, 62 insertions(+), 62 deletions(-) diff --git a/website/client/src/components/groups/groupPlan.vue b/website/client/src/components/groups/groupPlan.vue index c628774d9e..6d84aecfc5 100644 --- a/website/client/src/components/groups/groupPlan.vue +++ b/website/client/src/components/groups/groupPlan.vue @@ -4,12 +4,12 @@
-

- Need more for your Group? +

+ {{ $t('groupPlanTitle') }}

-

+

{{ $t('groupBenefitsDescription') }}

@@ -24,8 +24,8 @@ src="~@/assets/images/group-plans/group-14@3x.png" >
-

{{ $t('teamBasedTasks') }}

-

Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!

+

{{ $t('teamBasedTasks') }}

+

{{ $t('teamBasedTasksListDesc') }}

@@ -35,8 +35,8 @@ src="~@/assets/images/group-plans/group-12@3x.png" >
-

Group Management Controls

-

Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.

+

{{ $t('groupManagementControls') }}

+

{{ $t('groupManagementControlsDesc') }}

@@ -46,8 +46,8 @@ src="~@/assets/images/group-plans/group-13@3x.png" >
-

In-Game Benefits

-

Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.

+

{{ $t('inGameBenefits') }}

+

{{ $t('inGameBenefitsDesc') }}

diff --git a/website/common/locales/ach/groups.json b/website/common/locales/ach/groups.json index dc8fe6cf15..a7787ef6af 100755 --- a/website/common/locales/ach/groups.json +++ b/website/common/locales/ach/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/af/groups.json b/website/common/locales/af/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/af/groups.json +++ b/website/common/locales/af/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ar/groups.json b/website/common/locales/ar/groups.json index bae6fe9703..5bfd5f3ac0 100755 --- a/website/common/locales/ar/groups.json +++ b/website/common/locales/ar/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/be/groups.json b/website/common/locales/be/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/be/groups.json +++ b/website/common/locales/be/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/bn/groups.json b/website/common/locales/bn/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/bn/groups.json +++ b/website/common/locales/bn/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ca/groups.json b/website/common/locales/ca/groups.json index d6ec243743..51b312b769 100755 --- a/website/common/locales/ca/groups.json +++ b/website/common/locales/ca/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/cs/groups.json b/website/common/locales/cs/groups.json index a716163f12..b1e4900ee1 100644 --- a/website/common/locales/cs/groups.json +++ b/website/common/locales/cs/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/el/groups.json b/website/common/locales/el/groups.json index 103c919b55..ccfdf7f45c 100755 --- a/website/common/locales/el/groups.json +++ b/website/common/locales/el/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/en@lolcat/groups.json b/website/common/locales/en@lolcat/groups.json index 9b1fed53ba..c22686bcbd 100755 --- a/website/common/locales/en@lolcat/groups.json +++ b/website/common/locales/en@lolcat/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/en@pirate/groups.json b/website/common/locales/en@pirate/groups.json index 4d8c8c7665..87c73e1920 100644 --- a/website/common/locales/en@pirate/groups.json +++ b/website/common/locales/en@pirate/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Squadron members git an exclusive Jackalope Steed, as well as full subscr'ption benefits, includin' special monthly equipment sets an' th' ability t' buy sapphires wit' gold.", "inspireYourParty": "Inspire yer crew, gamify life togeth'r.", diff --git a/website/common/locales/en_GB/groups.json b/website/common/locales/en_GB/groups.json index d4149b13cb..ad83edfeac 100644 --- a/website/common/locales/en_GB/groups.json +++ b/website/common/locales/en_GB/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/eo/groups.json b/website/common/locales/eo/groups.json index 69cf278e3e..7c9d5ebe87 100755 --- a/website/common/locales/eo/groups.json +++ b/website/common/locales/eo/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/et/groups.json b/website/common/locales/et/groups.json index 17504a3626..0bd43f4116 100755 --- a/website/common/locales/et/groups.json +++ b/website/common/locales/et/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/fa_IR/groups.json b/website/common/locales/fa_IR/groups.json index 0d3d60c7a9..6ccd5f29ec 100755 --- a/website/common/locales/fa_IR/groups.json +++ b/website/common/locales/fa_IR/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/fi/groups.json b/website/common/locales/fi/groups.json index 0577168ddf..8708e0e7eb 100755 --- a/website/common/locales/fi/groups.json +++ b/website/common/locales/fi/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/fil/groups.json b/website/common/locales/fil/groups.json index 149ac6088f..09ad0a4ae6 100755 --- a/website/common/locales/fil/groups.json +++ b/website/common/locales/fil/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/fy/groups.json b/website/common/locales/fy/groups.json index 774b9c8ce1..de4e7a2bb7 100755 --- a/website/common/locales/fy/groups.json +++ b/website/common/locales/fy/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ga/groups.json b/website/common/locales/ga/groups.json index 381bda387c..7c9bf3e04c 100755 --- a/website/common/locales/ga/groups.json +++ b/website/common/locales/ga/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/haw/groups.json b/website/common/locales/haw/groups.json index 916473f3f0..7fb977e6d4 100755 --- a/website/common/locales/haw/groups.json +++ b/website/common/locales/haw/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/hi_IN/groups.json b/website/common/locales/hi_IN/groups.json index c104f5b4a3..39dde79f41 100755 --- a/website/common/locales/hi_IN/groups.json +++ b/website/common/locales/hi_IN/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/id/groups.json b/website/common/locales/id/groups.json index 9edc0a1afa..1531aa3719 100644 --- a/website/common/locales/id/groups.json +++ b/website/common/locales/id/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/is/groups.json b/website/common/locales/is/groups.json index 0acd03a6ee..1049893f5b 100755 --- a/website/common/locales/is/groups.json +++ b/website/common/locales/is/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/jbo/groups.json b/website/common/locales/jbo/groups.json index 9c8d9292a1..ef9ff31f08 100755 --- a/website/common/locales/jbo/groups.json +++ b/website/common/locales/jbo/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/jv/groups.json b/website/common/locales/jv/groups.json index 7193f4f939..2a468abe88 100755 --- a/website/common/locales/jv/groups.json +++ b/website/common/locales/jv/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ko/groups.json b/website/common/locales/ko/groups.json index f677068d38..a0d6036146 100755 --- a/website/common/locales/ko/groups.json +++ b/website/common/locales/ko/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ku_IQ/groups.json b/website/common/locales/ku_IQ/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/ku_IQ/groups.json +++ b/website/common/locales/ku_IQ/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/la/groups.json b/website/common/locales/la/groups.json index 417679ab07..5ae56b82f7 100755 --- a/website/common/locales/la/groups.json +++ b/website/common/locales/la/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ln/groups.json b/website/common/locales/ln/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/ln/groups.json +++ b/website/common/locales/ln/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/lt/groups.json b/website/common/locales/lt/groups.json index de7e5982ed..a2e532b4de 100755 --- a/website/common/locales/lt/groups.json +++ b/website/common/locales/lt/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/lv/groups.json b/website/common/locales/lv/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/lv/groups.json +++ b/website/common/locales/lv/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/mk/groups.json b/website/common/locales/mk/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/mk/groups.json +++ b/website/common/locales/mk/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ml/groups.json b/website/common/locales/ml/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/ml/groups.json +++ b/website/common/locales/ml/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/mn/groups.json b/website/common/locales/mn/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/mn/groups.json +++ b/website/common/locales/mn/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/mr/groups.json b/website/common/locales/mr/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/mr/groups.json +++ b/website/common/locales/mr/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ms/groups.json b/website/common/locales/ms/groups.json index f6ce396288..190329634d 100755 --- a/website/common/locales/ms/groups.json +++ b/website/common/locales/ms/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/nn/groups.json b/website/common/locales/nn/groups.json index 141b929886..0b66e6e03c 100755 --- a/website/common/locales/nn/groups.json +++ b/website/common/locales/nn/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/no/groups.json b/website/common/locales/no/groups.json index 4fb08507c4..3a1d18c456 100755 --- a/website/common/locales/no/groups.json +++ b/website/common/locales/no/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ro/groups.json b/website/common/locales/ro/groups.json index afbf97d017..a8a3802a68 100644 --- a/website/common/locales/ro/groups.json +++ b/website/common/locales/ro/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/sco/groups.json b/website/common/locales/sco/groups.json index ac3a24265d..b06477cd41 100755 --- a/website/common/locales/sco/groups.json +++ b/website/common/locales/sco/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/si/groups.json b/website/common/locales/si/groups.json index 58d8393d8f..7c308e45a0 100755 --- a/website/common/locales/si/groups.json +++ b/website/common/locales/si/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/sk/groups.json b/website/common/locales/sk/groups.json index 3365f1434f..a1e22a5e97 100644 --- a/website/common/locales/sk/groups.json +++ b/website/common/locales/sk/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/sl/groups.json b/website/common/locales/sl/groups.json index 0e8b76cf96..b16f92815c 100755 --- a/website/common/locales/sl/groups.json +++ b/website/common/locales/sl/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/sr/groups.json b/website/common/locales/sr/groups.json index e1c69b0cac..7555eb9205 100644 --- a/website/common/locales/sr/groups.json +++ b/website/common/locales/sr/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/su/groups.json b/website/common/locales/su/groups.json index 58d8393d8f..7c308e45a0 100755 --- a/website/common/locales/su/groups.json +++ b/website/common/locales/su/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/sv/groups.json b/website/common/locales/sv/groups.json index e275921dda..240f27a508 100644 --- a/website/common/locales/sv/groups.json +++ b/website/common/locales/sv/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/sw/groups.json b/website/common/locales/sw/groups.json index 58d8393d8f..7c308e45a0 100755 --- a/website/common/locales/sw/groups.json +++ b/website/common/locales/sw/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ta/groups.json b/website/common/locales/ta/groups.json index 1dc75de04a..d92f1c53f7 100755 --- a/website/common/locales/ta/groups.json +++ b/website/common/locales/ta/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/th/groups.json b/website/common/locales/th/groups.json index 79e42418b5..ec1a790a02 100755 --- a/website/common/locales/th/groups.json +++ b/website/common/locales/th/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/tl_PH/groups.json b/website/common/locales/tl_PH/groups.json index de8683261a..0568d37a65 100755 --- a/website/common/locales/tl_PH/groups.json +++ b/website/common/locales/tl_PH/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/tlh/groups.json b/website/common/locales/tlh/groups.json index f49a5ae8d9..7717970c16 100755 --- a/website/common/locales/tlh/groups.json +++ b/website/common/locales/tlh/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/ur_PK/groups.json b/website/common/locales/ur_PK/groups.json index 0593a46e22..cd305543fd 100755 --- a/website/common/locales/ur_PK/groups.json +++ b/website/common/locales/ur_PK/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/vi/groups.json b/website/common/locales/vi/groups.json index ce518bc66a..a69d64f062 100755 --- a/website/common/locales/vi/groups.json +++ b/website/common/locales/vi/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", diff --git a/website/common/locales/zh_HK/groups.json b/website/common/locales/zh_HK/groups.json index c6df339b49..7681b3b62c 100755 --- a/website/common/locales/zh_HK/groups.json +++ b/website/common/locales/zh_HK/groups.json @@ -312,7 +312,7 @@ "teamBasedTasksList": "Team-Based Task List", "teamBasedTasksListDesc": "Set up an easily-viewed shared task list for the group. Assign tasks to your fellow group members, or let them claim their own tasks to make it clear what everyone is working on!", "groupManagementControls": "Group Management Controls", - "groupManagementControlsDesc": "Use task approvals to verify that a task that was really completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", + "groupManagementControlsDesc": "View task status to verify that a task that was completed, add Group Managers to share responsibilities, and enjoy a private group chat for all team members.", "inGameBenefits": "In-Game Benefits", "inGameBenefitsDesc": "Group members get an exclusive Jackalope Mount, as well as full subscription benefits, including special monthly equipment sets and the ability to buy gems with gold.", "inspireYourParty": "Inspire your party, gamify life together.", From e9e426554536ba33f30138856be5ea99828e21a7 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 2 May 2023 09:51:33 -0500 Subject: [PATCH 15/17] Squashed commit of the following: commit 00affb306655a543f5d29b3af6361e686b577a97 Author: SabreCat Date: Tue May 2 09:47:25 2023 -0500 fix(tests): account for invite limit changes commit 47661117f9fd661b8bc8f63b7cc7c8d5f8fa0fd7 Author: SabreCat Date: Mon May 1 17:39:29 2023 -0500 fix(lfp): final polish commit 6a1e5af1db0dd90be3ced7e223f53c9183a206f5 Merge: 728ed2ddad 9e0777bb42 Author: SabreCat Date: Mon May 1 16:54:12 2023 -0500 Merge branch 'release' into sabrecat/party-seeking commit 728ed2ddad7f0962d28f1ab0a271e3555b19296c Author: SabreCat Date: Thu Apr 27 16:51:06 2023 -0500 fix(lfp): loading layout and page visit event commit 8a56ab329bff922e05963e3ef78fbc26ff273924 Author: SabreCat Date: Wed Apr 26 16:54:46 2023 -0500 fix(faq): copy and style updates commit 6fd00d7f30150a1802e5a37edbb914ef120caf9a Author: SabreCat Date: Fri Apr 21 17:12:52 2023 -0500 feat(lfp): fixes, analytics, FAQ commit 4b5d7304ad7cfc5f72320b23456ed2898e53caac Author: SabreCat Date: Mon Apr 17 15:13:03 2023 -0500 fix(lfp): smol tweaks commit 9a5476a2558eb17a603f4aae1b5b2d35773be8b4 Author: SabreCat Date: Thu Apr 13 16:03:33 2023 -0500 feat(lfp): refresh button commit aa58f5018469f38a9a9d31c3bffa26bb88a8c672 Merge: bbb03d006e c8adf20804 Author: SabreCat Date: Tue Apr 11 17:44:56 2023 -0500 Merge branch 'release' into sabrecat/party-seeking commit bbb03d006e8b122bb7206bdc778a31de422167bb Author: SabreCat Date: Tue Apr 4 18:30:50 2023 -0500 fix(lint): whitespace and const commit 23683ad29a4cce0b0da061ad6c030982034c0a9c Author: SabreCat Date: Tue Apr 4 17:02:57 2023 -0500 chore(LFP): add analytics also re-fix loading state commit 4477d84f5266c87f5583368029b72153f00f0568 Author: SabreCat Date: Mon Apr 3 16:24:26 2023 -0500 fix(LFP): address issues with loading commit bdc5154f24bb5e50963376c3c0c9cc73c0b05ccc Merge: 81923eef6f 229ed46425 Author: SabreCat Date: Mon Apr 3 15:58:12 2023 -0500 Merge branch 'release' into sabrecat/party-seeking commit 81923eef6f0c627d079475a28f9d93d8e4628934 Author: SabreCat Date: Thu Mar 30 16:44:49 2023 -0500 feat(LFP): release candidate commit fe1f8939fc6b09d36cfaf0b6e5838df04e41009d Author: SabreCat Date: Wed Mar 29 17:35:54 2023 -0500 WIP(LFP): fixes commit afc361f5a9f806cbd814ad910d1274e3a6609efd Merge: d6b5cbdebc 7ede3acd01 Author: SabreCat Date: Wed Mar 29 16:24:39 2023 -0500 Merge branch 'release' into sabrecat/party-seeking commit d6b5cbdebc2829e9325ea57fb5deeccc128c1635 Author: SabreCat Date: Tue Mar 28 16:13:18 2023 -0500 WIP(LFP): change copy, add close X, fix API response commit 4274a4625862351ef0ecf33c8a3249ca5ebec7cb Author: SabreCat Date: Mon Mar 27 17:07:36 2023 -0500 fix(LFP): layout, unset when stopping commit 95abfcfa5f13c9cce6385206947a47f85b76d11d Merge: 4a360eedd8 53c536b525 Author: SabreCat Date: Mon Mar 27 16:32:46 2023 -0500 Merge branch 'release' into sabrecat/party-seeking commit 4a360eedd8b9cf41d3a0fe7a4cfaa72c5bd7bd26 Author: SabreCat Date: Thu Mar 23 16:54:49 2023 -0500 feat(LFP): completed style and infinite scroll commit bbc439d9d03c9631a450236eb33af66f0428fa50 Author: SabreCat Date: Tue Mar 21 10:40:26 2023 -0500 WIP(LFP): nicer layout, buffs fix commit 1658688597456663477ab19da61ae1b9bc85cf2a Merge: 664507434f 027e61a93e Author: SabreCat Date: Tue Mar 21 09:29:02 2023 -0500 Merge branch 'release' into sabrecat/party-seeking commit 664507434f2f76e6bf3b61cdc9e3daddb81204af Author: SabreCat Date: Fri Mar 17 17:13:08 2023 -0500 WIP(LFP): API and client adjustments commit 2f0b6f2517f9e2d634cb23ee303cfb4542e998ce Merge: 0db1704325 a16098ccda Author: SabreCat Date: Fri Mar 17 16:45:13 2023 -0500 Merge branch 'release' into sabrecat/party-seeking commit 0db1704325c3555f0b5d9c8d1dfc44177e90c093 Author: SabreCat Date: Mon Mar 13 14:48:10 2023 -0500 fix(modal): scrollbar for squashed viewports commit 733c35192e0a4e31e1bebfdd7488cfc1f7587f36 Author: SabreCat Date: Thu Mar 9 12:51:02 2023 -0600 WIP(party): seekers functional rough commit d4b854410b557db26eec6e6a26b6d174c02cee3a Merge: 7fe919825a 0b6b967753 Author: SabreCat Date: Thu Mar 9 10:07:28 2023 -0600 Merge branch 'release' into sabrecat/party-seeking commit 7fe919825abfb6d518cb93b91f5997d3831bd0b5 Author: SabreCat Date: Thu Mar 2 14:40:09 2023 -0600 feat(party): several adjustments to seeking feature commit c93900efcf925f7aaa4c4cb56b4451f19adfb1b3 Author: SabreCat Date: Wed Mar 1 20:37:11 2023 -0600 feat(party): initial Seeking API commit 8bb784daeceb14c23992a6f3af1054a900fc26c1 Merge: e19a661a21 f327795761 Author: SabreCat Date: Wed Mar 1 18:58:20 2023 -0600 Merge branch 'release' into sabrecat/party-seeking commit e19a661a2163a50307a286379bffb44201ed392e Author: SabreCat Date: Fri Feb 24 15:51:42 2023 -0600 WIP(parties): add seeking flag and modal toggle --- .../groups/POST-groups_groupId_join.test.js | 41 -- .../groups/POST-groups_invite.test.js | 48 +-- website/client/src/assets/scss/icon.scss | 21 +- website/client/src/assets/svg/sync-2.svg | 1 + .../components/groups/createPartyModal.vue | 175 ++++++--- .../client/src/components/groups/group.vue | 3 +- .../src/components/groups/lookingForParty.vue | 351 ++++++++++++++++++ .../src/components/groups/rightSidebar.vue | 6 +- .../client/src/components/header/index.vue | 10 +- website/client/src/components/header/menu.vue | 47 ++- .../header/notifications/partyInvitation.vue | 3 + website/client/src/components/static/faq.vue | 54 ++- .../src/components/static/staticWrapper.vue | 4 - website/client/src/components/ui/closeX.vue | 46 +++ website/client/src/components/userLink.vue | 15 +- website/client/src/router/index.js | 8 +- website/client/src/store/actions/party.js | 12 + website/common/locales/en/faq.json | 70 +++- website/common/locales/en/front.json | 2 +- website/common/locales/en/generic.json | 1 + website/common/locales/en/groups.json | 26 +- website/common/locales/en/npc.json | 2 +- website/common/script/content/faq.js | 53 ++- .../common/script/errors/apiErrorMessages.js | 1 + website/server/controllers/api-v3/groups.js | 131 +++++-- website/server/libs/invites/index.js | 50 ++- website/server/libs/user/index.js | 26 +- website/server/models/group.js | 4 + website/server/models/user/schema.js | 1 + 29 files changed, 999 insertions(+), 213 deletions(-) create mode 100644 website/client/src/assets/svg/sync-2.svg create mode 100644 website/client/src/components/groups/lookingForParty.vue create mode 100644 website/client/src/components/ui/closeX.vue diff --git a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js index 92acf9023f..bbad7a8401 100644 --- a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js +++ b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js @@ -258,47 +258,6 @@ describe('POST /group/:groupId/join', () => { await expect(user.get('/user')).to.eventually.have.nested.property('items.quests.basilist', 2); }); - it('deletes previous party where the user was the only member', async () => { - const userToInvite = await generateUser(); - const oldParty = await userToInvite.post('/groups', { // add user to a party - name: 'Another Test Party', - type: 'party', - }); - - await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(true); - await user.post(`/groups/${party._id}/invite`, { - uuids: [userToInvite._id], - }); - await userToInvite.post(`/groups/${party._id}/join`); - - await expect(user.get('/user')).to.eventually.have.nested.property('party._id', party._id); - await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(false); - }); - - it('does not allow user to leave a party if a quest was active and they were the only member', async () => { - const userToInvite = await generateUser(); - const oldParty = await userToInvite.post('/groups', { // add user to a party - name: 'Another Test Party', - type: 'party', - }); - - await userToInvite.update({ - [`items.quests.${PET_QUEST}`]: 1, - }); - await userToInvite.post(`/groups/${oldParty._id}/quests/invite/${PET_QUEST}`); - - await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(true); - await user.post(`/groups/${party._id}/invite`, { - uuids: [userToInvite._id], - }); - - await expect(userToInvite.post(`/groups/${party._id}/join`)).to.eventually.be.rejected.and.eql({ - code: 401, - error: 'NotAuthorized', - message: t('messageCannotLeaveWhileQuesting'), - }); - }); - it('invites joining member to active quest', async () => { await user.update({ [`items.quests.${PET_QUEST}`]: 1, diff --git a/test/api/v3/integration/groups/POST-groups_invite.test.js b/test/api/v3/integration/groups/POST-groups_invite.test.js index 02f8c5e20c..58a478be00 100644 --- a/test/api/v3/integration/groups/POST-groups_invite.test.js +++ b/test/api/v3/integration/groups/POST-groups_invite.test.js @@ -1,6 +1,7 @@ import { v4 as generateUUID } from 'uuid'; import nconf from 'nconf'; import { + createAndPopulateGroup, generateUser, generateGroup, translate as t, @@ -581,20 +582,7 @@ describe('Post /groups/:groupId/invite', () => { }); }); - it('allow inviting a user to a party if they are partying solo', async () => { - const userToInvite = await generateUser(); - await userToInvite.post('/groups', { // add user to a party - name: 'Another Test Party', - type: 'party', - }); - - await inviter.post(`/groups/${party._id}/invite`, { - uuids: [userToInvite._id], - }); - expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id); - }); - - it('allow inviting a user to 2 different parties', async () => { + it('allows inviting a user to 2 different parties', async () => { // Create another inviter const inviter2 = await generateUser(); @@ -635,29 +623,47 @@ describe('Post /groups/:groupId/invite', () => { }); expect((await userToInvite.get('/user')).invitations.parties[0].id).to.equal(party._id); }); + }); + + describe('party size limits', () => { + let party, partyLeader; + + beforeEach(async () => { + group = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Party', + type: 'party', + privacy: 'private', + }, + // Generate party with 20 members + members: PARTY_LIMIT_MEMBERS - 10, + }); + party = group.group; + partyLeader = group.groupLeader; + }); it('allows 30 members in a party', async () => { const invitesToGenerate = []; - // Generate 29 users to invite (29 + leader = 30 members) - for (let i = 0; i < PARTY_LIMIT_MEMBERS - 1; i += 1) { + // Generate 10 new invites + for (let i = 1; i < 10; i += 1) { invitesToGenerate.push(generateUser()); } const generatedInvites = await Promise.all(invitesToGenerate); // Invite users - expect(await inviter.post(`/groups/${party._id}/invite`, { + expect(await partyLeader.post(`/groups/${party._id}/invite`, { uuids: generatedInvites.map(invite => invite._id), })).to.be.an('array'); }).timeout(10000); - it('does not allow 30+ members in a party', async () => { + it('does not allow >30 members in a party', async () => { const invitesToGenerate = []; - // Generate 30 users to invite (30 + leader = 31 members) - for (let i = 0; i < PARTY_LIMIT_MEMBERS; i += 1) { + // Generate 11 invites + for (let i = 1; i < 11; i += 1) { invitesToGenerate.push(generateUser()); } const generatedInvites = await Promise.all(invitesToGenerate); // Invite users - await expect(inviter.post(`/groups/${party._id}/invite`, { + await expect(partyLeader.post(`/groups/${party._id}/invite`, { uuids: generatedInvites.map(invite => invite._id), })) .to.eventually.be.rejected.and.eql({ diff --git a/website/client/src/assets/scss/icon.scss b/website/client/src/assets/scss/icon.scss index 92930f1124..3ab036333a 100644 --- a/website/client/src/assets/scss/icon.scss +++ b/website/client/src/assets/scss/icon.scss @@ -24,9 +24,9 @@ } } -.icon-16 { - width: 16px; - height: 16px; +.icon-10 { + width: 10px; + height: 10px; } .icon-12 { @@ -34,21 +34,26 @@ height: 12px; } +.icon-16 { + width: 16px; + height: 16px; +} + .icon-24 { width: 24px; height: 24px; } +.icon-32 { + width: 32px; + height: 32px; +} + .icon-48 { width: 48px; height: 48px; } -.icon-10 { - width: 10px; - height: 10px; -} - .inline { display: inline-block; } diff --git a/website/client/src/assets/svg/sync-2.svg b/website/client/src/assets/svg/sync-2.svg new file mode 100644 index 0000000000..61a77879df --- /dev/null +++ b/website/client/src/assets/svg/sync-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/website/client/src/components/groups/createPartyModal.vue b/website/client/src/components/groups/createPartyModal.vue index 8b00d4e06c..17c0184331 100644 --- a/website/client/src/components/groups/createPartyModal.vue +++ b/website/client/src/components/groups/createPartyModal.vue @@ -11,9 +11,12 @@
-

+

{{ $t('playInPartyTitle') }} -

+

+
-
+
-

- {{ $t('wantToJoinPartyTitle') }} -

-

-
-
- -
-
- @ -
- {{ user.auth.local.username }} -
-
-
- {{ $t('copy') }} -
-
+ {{ $t('wantToJoinPartyTitle') }} + +

+

+
+
+ {{ $t('currentlyLookingForParty') }} +
+
+
+ {{ $t('leave') }}
+
- @@ -107,15 +134,27 @@ cursor: pointer; } + .green-bar { + height: 32px; + font-size: 14px; + font-weight: bold; + line-height: 1.71; + text-align: center; + color: $green-1; + background-color: $green-100; + border-radius: 2px; + padding: 4px 0px 4px 0px; + } + .grey-row { background-color: $gray-700; color: #4e4a57; padding: 2em; - border-radius: 0px 0px 2px 2px; + border-radius: 0px 0px 8px 8px; } - h2 { - color: $gray-100; + h1 { + color: $purple-300; } .header-wrap { @@ -132,10 +171,6 @@ border-radius: 2px 2px 0 0; image-rendering: optimizequality; } - - h2 { - color: $purple-200; - } } .heading { @@ -182,6 +217,21 @@ margin: 0.75rem auto 0.75rem 0.25rem; } + p { + line-height: 1.71; + } + + .red-link { + cursor: pointer; + font-size: 14px; + line-height: 1.71; + text-align: center; + color: $maroon-50; + &:hover { + text-decoration: underline; + } + } + .small { color: $gray-200; margin: auto 0.5rem auto 0.25rem; @@ -192,21 +242,35 @@ import { mapState } from '@/libs/store'; import * as Analytics from '@/libs/analytics'; import notifications from '@/mixins/notifications'; +import closeX from '../ui/closeX'; import copyIcon from '@/assets/svg/copy.svg'; export default { + components: { + closeX, + }, mixins: [notifications], data () { return { icons: Object.freeze({ copy: copyIcon, }), + seeking: false, }; }, computed: { ...mapState({ user: 'user.data' }), }, + mounted () { + this.seeking = Boolean(this.user.party.seeking); + Analytics.track({ + eventName: 'Start a Party button', + eventAction: 'Start a Party button', + eventCategory: 'behavior', + hitType: 'event', + }, { trackOnClient: true }); + }, methods: { async createParty () { const group = { @@ -223,7 +287,10 @@ export default { }); this.$root.$emit('bv::hide::modal', 'create-party-modal'); - this.$router.push('/party'); + await this.$router.push('/party'); + }, + close () { + this.$root.$emit('bv::hide::modal', 'create-party-modal'); }, copyUsername () { if (navigator.clipboard) { @@ -238,6 +305,12 @@ export default { } this.text(this.$t('usernameCopied')); }, + seekParty () { + this.$store.dispatch('user:set', { + 'party.seeking': !this.user.party.seeking ? new Date() : null, + }); + this.seeking = !this.seeking; + }, }, }; diff --git a/website/client/src/components/groups/group.vue b/website/client/src/components/groups/group.vue index 85dbf296af..a238ef5664 100644 --- a/website/client/src/components/groups/group.vue +++ b/website/client/src/components/groups/group.vue @@ -542,7 +542,8 @@ export default { await this.$store.dispatch('guilds:leave', data); if (this.isParty) { - this.$router.push({ name: 'tasks' }); + await this.$router.push({ name: 'tasks' }); + window.location.reload(true); } }, upgradeGroup () { diff --git a/website/client/src/components/groups/lookingForParty.vue b/website/client/src/components/groups/lookingForParty.vue new file mode 100644 index 0000000000..eda06f5759 --- /dev/null +++ b/website/client/src/components/groups/lookingForParty.vue @@ -0,0 +1,351 @@ + + + + + diff --git a/website/client/src/components/groups/rightSidebar.vue b/website/client/src/components/groups/rightSidebar.vue index f5eafdcaf6..cab95cea2e 100644 --- a/website/client/src/components/groups/rightSidebar.vue +++ b/website/client/src/components/groups/rightSidebar.vue @@ -2,7 +2,7 @@
-
+
@@ -234,7 +234,7 @@ export default { }, createOrInviteParty () { if (this.user.party._id) { - this.$root.$emit('inviteModal::inviteToGroup', this.user.party); + this.$router.push('/looking-for-party'); } else { this.$root.$emit('bv::show::modal', 'create-party-modal'); } diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue index fbfdaed141..87747b7dad 100644 --- a/website/client/src/components/header/menu.vue +++ b/website/client/src/components/header/menu.vue @@ -148,7 +148,7 @@
{{ $t('party') }} +
  • +
    +
    +
    + + {{ $t('party') }} + +
    + + {{ $t('lookingForPartyTitle') }} + +
    +
    • { link.addEventListener('click', this.closeMenu); }); @@ -805,6 +837,9 @@ export default { link.addEventListener('mouseenter', this.dropdownDesktop); link.addEventListener('mouseleave', this.dropdownDesktop); }); + this.$root.$on('update-party', () => { + this.getUserParty(); + }); }, methods: { modForm () { @@ -816,6 +851,12 @@ export default { async getUserGroupPlans () { await this.$store.dispatch('guilds:getGroupPlans'); }, + async getUserParty () { + if (this.user.party._id) { + await this.$store.dispatch('party:getParty'); + this.partyLeaderId = this.$store.state.party.data.leader._id; + } + }, openPartyModal () { this.$root.$emit('bv::show::modal', 'create-party-modal'); }, diff --git a/website/client/src/components/header/notifications/partyInvitation.vue b/website/client/src/components/header/notifications/partyInvitation.vue index b919e9442a..a9dd6e7790 100644 --- a/website/client/src/components/header/notifications/partyInvitation.vue +++ b/website/client/src/components/header/notifications/partyInvitation.vue @@ -34,11 +34,13 @@ diff --git a/website/client/src/components/userLink.vue b/website/client/src/components/userLink.vue index a0591754e6..1715a13893 100644 --- a/website/client/src/components/userLink.vue +++ b/website/client/src/components/userLink.vue @@ -2,13 +2,13 @@ {{ displayName }}
    @@ -37,10 +37,15 @@ color: $gray-50; } + &[class*="tier"] .svg-icon { + margin-top: 5px; + } + &.npc .svg-icon { + margin-top: 4px; + } + .svg-icon { - width: 10px; - display: inline-block; - margin-left: .5em; + margin-left: 6px; &:empty { display: none; diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js index 09727c789e..4a478e1047 100644 --- a/website/client/src/router/index.js +++ b/website/client/src/router/index.js @@ -72,13 +72,14 @@ const ItemsPage = () => import(/* webpackChunkName: "inventory" */'@/components/ const EquipmentPage = () => import(/* webpackChunkName: "inventory" */'@/components/inventory/equipment/index'); const StablePage = () => import(/* webpackChunkName: "inventory" */'@/components/inventory/stable/index'); -// Guilds +// Guilds & Parties const GuildIndex = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/index'); const TavernPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/tavern'); const MyGuilds = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/myGuilds'); const GuildsDiscoveryPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/discovery'); const GroupPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/group'); const GroupPlansAppPage = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/groupPlan'); +const LookingForParty = () => import(/* webpackChunkName: "guilds" */ '@/components/groups/lookingForParty'); // Group Plans const GroupPlanIndex = () => import(/* webpackChunkName: "group-plans" */ '@/components/group-plans/index'); @@ -157,6 +158,7 @@ const router = new VueRouter({ ], }, { name: 'party', path: '/party', component: GroupPage }, + { name: 'lookingForParty', path: '/looking-for-party', component: LookingForParty }, { name: 'groupPlan', path: '/group-plans', component: GroupPlansAppPage }, { name: 'groupPlanDetail', @@ -433,6 +435,10 @@ router.beforeEach(async (to, from, next) => { } } + if (to.name === 'party') { + router.app.$root.$emit('update-party'); + } + // Redirect old guild urls if (to.hash.indexOf('#/options/groups/guilds/') !== -1) { const splits = to.hash.split('/'); diff --git a/website/client/src/store/actions/party.js b/website/client/src/store/actions/party.js index 37d9122add..0f095dd715 100644 --- a/website/client/src/store/actions/party.js +++ b/website/client/src/store/actions/party.js @@ -1,3 +1,4 @@ +import axios from 'axios'; import { loadAsyncResource } from '@/libs/asyncResource'; export function getMembers (store, forceLoad = false) { @@ -23,3 +24,14 @@ export function getParty (store, forceLoad = false) { forceLoad, }); } + +export async function lookingForParty (store, payload) { + let response; + if (payload && payload.page) { + response = await axios.get(`api/v4/looking-for-party?page=${payload.page}`); + } else { + response = await axios.get('api/v4/looking-for-party'); + } + + return response.data.data; +} diff --git a/website/common/locales/en/faq.json b/website/common/locales/en/faq.json index 3e53eb7327..b648b36765 100644 --- a/website/common/locales/en/faq.json +++ b/website/common/locales/en/faq.json @@ -1,5 +1,6 @@ { "frequentlyAskedQuestions": "Frequently Asked Questions", + "general": "General", "faqQuestion0": "I'm confused. Where do I get an overview?", "iosFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > Customize Avatar.\n\n Some basic ways to interact: click the (+) in the upper-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-left-hand corner, and expand and contract checklists by clicking on the checklist bubble.", @@ -26,10 +27,10 @@ "androidFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you tap a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your Party and one of your Party mates did not complete all their Dailies, the Boss will attack you.\n\n The main way to heal is to gain a level, which restores all your health. You can also buy a Health Potion with gold from the Rewards tab on the Tasks page. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a Party with a Healer, they can heal you as well.", "webFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight and didn't check them off in the screen that popped up the next morning, those unfinished Dailies will damage you. Second, if you click a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your party and one of your party mates did not complete all their Dailies, the Boss will attack you. The main way to heal is to gain a level, which restores all your Health. You can also buy a Health Potion with Gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. Other Healers can heal you as well if you are in a Party with them. Learn more by clicking \"Party\" in the navigation bar.", - "faqQuestion5": "How do I play Habitica with my friends?", + "faqQuestion5": "Can I play Habitica with others?", "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on Quests, battle monsters, and cast skills to support each other.\n\nIf you want to start your own Party, go to Menu > [Party](https://habitica.com/party) and tap \"Create New Party\". Then scroll down and tap \"Invite a Member\" to invite your friends by entering their @username. If you want to join someone else’s Party, just give them your @username and they can invite you!\n\nYou and your friends can also join Guilds, which are public chat rooms that bring people together based on shared interests! There are a lot of helpful and fun communities, be sure to check them out.\n\nIf you’re feeling more competitive, you and your friends can create or join Challenges to take on a set of tasks. There are all sorts of public Challenges available that span a wide array of interests and goals. Some public Challenges will even award Gem prizes if you’re selected as the winner.", "androidFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to the [website](https://habitica.com/) to create one if you don't already have a Party. You can also join guilds together (Social > Guilds). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many guilds as you'd like, but only one party.\n\n For more detailed info, check out the wiki pages on [Parties](https://habitica.fandom.com/wiki/Party) and [Guilds](https://habitica.fandom.com/wiki/Guilds).", - "webFaqAnswer5": "The best way is to invite them to a Party with you by clicking \"Party\" in the navigation bar! Parties can go on quests, battle monsters, and cast skills to support each other. You can also join Guilds together (click on \"Guilds\" in the navigation bar). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many Guilds as you'd like, but only one Party. For more detailed info, check out the wiki pages on [Parties](https://habitica.fandom.com/wiki/Party) and [Guilds](https://habitica.fandom.com/wiki/Guilds).", + "webFaqAnswer5": "Yes, with Parties! You can start your own Party or join an existing one. Partying with other Habitica players is a great way to take on Quests, receive buffs from Party members’ skills, and boost your motivation with additional accountability.", "faqQuestion6": "How do I get a Pet or Mount?", "iosFaqAnswer6": "Every time you complete a task, you'll have a random chance at receiving an Egg, a Hatching Potion, or a piece of Pet Food. They will be stored in Menu > Items.\n\nTo hatch a Pet, you'll need an Egg and a Hatching Potion. Tap on the Egg to determine the species you want to hatch, and select \"Hatch Egg.\" Then choose a Hatching Potion to determine its color! Go to Menu > Pets and click your new Pet to equip it to your Avatar. \n\n You can also grow your Pets into Mounts by feeding them under Menu > Pets. Tap on a Pet, and select \"Feed Pet\"! You'll have to feed a Pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](https://habitica.fandom.com/wiki/Food#Food_Preferences). Once you have a Mount, go to Menu > Mounts and tap on it to equip it to your Avatar.\n\nYou can also get Eggs for Quest Pets by completing certain Quests (to learn more about Quests, see [How do I fight monsters and go on Quests](https://habitica.com/static/faq/9)).", @@ -46,10 +47,10 @@ "androidFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.", "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in the action bar at the bottom of the screen. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.", - "faqQuestion9": "How do I fight monsters and go on Quests?", - "iosFaqAnswer9": "First, you need to join or start a Party (see [How to play Habitica with my friends](https://habitica.com/static/faq/5)). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.", - "androidFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Shop for Gold and Gems.\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.", - "webFaqAnswer9": "First, you need to join or start a Party by clicking \"Party\" in the navigation bar. Although you can battle monsters alone, we recommend playing in a group, because this will make quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating! Next, you need a Quest Scroll, which are stored under Inventory > Quests. There are four ways to get a scroll:\n * When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n * At level 15, you get a Quest-line, i.e., three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively.\n * You can buy Quests from the Quests Shop (Shops > Quests) for Gold and Gems.\n * When you check in to Habitica a certain number of times, you'll be rewarded with Quest Scrolls. You earn a Scroll during your 1st, 7th, 22nd, and 40th check-ins.\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading may be required to see the Boss's Health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.", + "faqQuestion9": "How do I take on Quests?", + "iosFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!", + "androidFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!", + "webFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!", "faqQuestion10": "What are Gems, and how do I get them?", "iosFaqAnswer10": "Gems are purchased with real money from Menu > Purchase Gems. When you buy Gems, you are helping us to keep Habitica running. We’re very grateful for every bit of support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Menu > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!", @@ -71,6 +72,63 @@ "androidFaqAnswer13": "## How do Group Plans work?\n\nA [Group Plan](/group-plans) gives your Party or Guild access to a shared task board that’s similar to your personal task board! It’s a shared Habitica experience where tasks can be created and checked off by anyone in the group.\n\nThere are also features available like member roles, status view, and task assigning that give you a more controlled experience. [Visit our wiki](https://habitica.fandom.com/wiki/Group_Plans) to learn more about our Group Plans’ features!\n\n## Who benefits from a Group Plan?\n\nGroup Plans work best when you have a small team of people who want to collaborate together. We recommend 2-5 members.\n\nGroup Plans are great for families, whether it’s a parent and child or you and a partner. Shared goals, chores, or responsibilities are easy to keep track of on one board.\n\nGroup Plans can also be useful for teams of colleagues that have shared goals, or managers that want to introduce their employees to gamification.\n\n## Quick tips for using Groups\n\nHere are some quick tips to get you started with your new Group. We’ll provide more details in the following sections:\n\n* Make a member a manager to give them the ability to create and edit tasks\n* Leave tasks unassigned if anyone can complete it and it only needs done once\n* Assign a task to one person to make sure no one else can complete their task\n* Assign a task to multiple people if they all need to complete it\n* Toggle the ability to display shared tasks on your personal board to not miss anything\n* You get rewarded for the tasks you complete, even multi-assigned\n* Task completion rewards aren’t shared or split between Team members\n* Use task color on the team board to judge the average completion rate of tasks\n* Regularly review the tasks on your Team Board to make sure they are still relevant\n* Missing a Daily won’t damage you or your team, but the task will degrade in color\n\n## How can others in the group create tasks?\n\nOnly the group leader and managers can create tasks. If you’d like a group member to be able to create tasks, then you should promote them to be a manager by going to the Group Information tab, viewing the member list, and clicking the dot icon by their name.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## How do unassigned tasks work?\n\nUnassigned tasks can be completed by anyone in the group, so leave a task unassigned to allow any member to complete it. For example, taking out the trash. Whoever takes out the trash can check off the unassigned task and it will show as completed for everyone.\n\n## How does the synchronized day reset work?\n\nShared tasks will reset at the same time for everyone to keep the shared task board in sync. This time is visible on the shared task board and is determined by the group leader’s day start time. Because shared tasks reset automatically, you will not get a chance to complete yesterday’s uncompleted shared Dailies when you check in the next morning.\n\nShared Dailies will not do damage if they are missed, however they will degrade in color to help visualize progress. We don’t want the shared experience to be a negative one!\n\n## How do I use my Group on the mobile apps?\n\nWhile the mobile apps don’t fully support all Group Plans functionality yet, you can still complete shared tasks from the iOS and Android app by copying the tasks onto your personal task board. You can switch this preference on from Settings in the mobile apps or from the group task board on the browser version. Now open and assigned shared tasks will display on your personal task board across all platforms.\n\n## What’s the difference between a Group’s shared tasks and Challenges?\n\nGroup Plan shared task boards are more dynamic than Challenges, in that they can constantly be updated and interacted with. Challenges are great if you have one set of tasks to send out to many people.\n\nGroup Plans are also a paid feature, while Challenges are available free to everyone.\n\nYou cannot assign specific tasks in Challenges, and Challenges do not have a shared day reset. In general, Challenges offer less control and direct interaction.", "webFaqAnswer13": "## How do Group Plans work?\n\nA [Group Plan](/group-plans) gives your Party or Guild access to a shared task board that’s similar to your personal task board! It’s a shared Habitica experience where tasks can be created and checked off by anyone in the group.\n\nThere are also features available like member roles, status view, and task assigning that give you a more controlled experience. [Visit our wiki](https://habitica.fandom.com/wiki/Group_Plans) to learn more about our Group Plans’ features!\n\n## Who benefits from a Group Plan?\n\nGroup Plans work best when you have a small team of people who want to collaborate together. We recommend 2-5 members.\n\nGroup Plans are great for families, whether it’s a parent and child or you and a partner. Shared goals, chores, or responsibilities are easy to keep track of on one board.\n\nGroup Plans can also be useful for teams of colleagues that have shared goals, or managers that want to introduce their employees to gamification.\n\n## Quick tips for using Groups\n\nHere are some quick tips to get you started with your new Group. We’ll provide more details in the following sections:\n\n* Make a member a manager to give them the ability to create and edit tasks\n* Leave tasks unassigned if anyone can complete it and it only needs done once\n* Assign a task to one person to make sure no one else can complete their task\n* Assign a task to multiple people if they all need to complete it\n* Toggle the ability to display shared tasks on your personal board to not miss anything\n* You get rewarded for the tasks you complete, even multi-assigned\n* Task completion rewards aren’t shared or split between Team members\n* Use task color on the team board to judge the average completion rate of tasks\n* Regularly review the tasks on your Team Board to make sure they are still relevant\n* Missing a Daily won’t damage you or your team, but the task will degrade in color\n\n## How can others in the group create tasks?\n\nOnly the group leader and managers can create tasks. If you’d like a group member to be able to create tasks, then you should promote them to be a manager by going to the Group Information tab, viewing the member list, and clicking the dot icon by their name.\n\n## How does assigning a task work?\n\nGroup Plans give you the unique ability to assign tasks to other group members. Assigning a task is great for delegating. If you assign a task to someone, then other members are prevented from completing it.\n\nYou can also assign a task to multiple people if it needs to be completed by more than one member. For example, if everyone has to brush their teeth, create a task and assign it to each group member. They will all be able to check it off and get their individual rewards for doing so. The main task will show as complete once everyone checks it off.\n\n## How do unassigned tasks work?\n\nUnassigned tasks can be completed by anyone in the group, so leave a task unassigned to allow any member to complete it. For example, taking out the trash. Whoever takes out the trash can check off the unassigned task and it will show as completed for everyone.\n\n## How does the synchronized day reset work?\n\nShared tasks will reset at the same time for everyone to keep the shared task board in sync. This time is visible on the shared task board and is determined by the group leader’s day start time. Because shared tasks reset automatically, you will not get a chance to complete yesterday’s uncompleted shared Dailies when you check in the next morning.\n\nShared Dailies will not do damage if they are missed, however they will degrade in color to help visualize progress. We don’t want the shared experience to be a negative one!\n\n## How do I use my Group on the mobile apps?\n\nWhile the mobile apps don’t fully support all Group Plans functionality yet, you can still complete shared tasks from the iOS and Android app by copying the tasks onto your personal task board. You can switch this preference on from Settings in the mobile apps or from the group task board on the browser version. Now open and assigned shared tasks will display on your personal task board across all platforms.\n\n## What’s the difference between a Group’s shared tasks and Challenges?\n\nGroup Plan shared task boards are more dynamic than Challenges, in that they can constantly be updated and interacted with. Challenges are great if you have one set of tasks to send out to many people.\n\nGroup Plans are also a paid feature, while Challenges are available free to everyone.\n\nYou cannot assign specific tasks in Challenges, and Challenges do not have a shared day reset. In general, Challenges offer less control and direct interaction.", + "parties": "Parties", + + "faqQuestion14": "How do I find a Party when I'm not in one?", + "iosFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation then choose the option that works for you.", + "androidFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation then choose the option that works for you.", + "webFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation then choose the option that works for you.", + + "faqQuestion15": "How does searching for a Party work?", + "iosFaqAnswer15": "After selecting “Look for a Party” in the Party pop-up, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.", + "androidFaqAnswer15": "After selecting “Look for a Party” in the Party pop-up, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.", + "webFaqAnswer15": "After selecting “Look for a Party” in the Party pop-up, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.", + + "faqQuestion16": "How long can I search for a Party after joining the list?", + "iosFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first.", + "androidFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first.", + "webFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first.", + + "faqQuestion17": "Can I stop searching for a Party?", + "iosFaqAnswer17": "You can leave the list at any time. To stop searching for Party on the website, select the “Party” link in the navigation then click “Leave” in the pop-up.", + "androidFaqAnswer17": "You can leave the list at any time. To stop searching for Party on the website, select the “Party” link in the navigation then click “Leave” in the pop-up.", + "webFaqAnswer17": "You can leave the list at any time. To stop searching for Party on the website, select the “Party” link in the navigation then click “Leave” in the pop-up.", + + "faqQuestion18": "I have a Party, how do I find more members?", + "iosFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. This will display a list of Habitica players that are actively looking for a Party and can be invited to join.\n\nYou'll see some information, such as language, class, level, and how many days they have used Habitica to help find a good fit for your Party. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.", + "androidFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. This will display a list of Habitica players that are actively looking for a Party and can be invited to join.\n\nYou'll see some information, such as language, class, level, and how many days they have used Habitica to help find a good fit for your Party. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.", + "webFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. This will display a list of Habitica players that are actively looking for a Party and can be invited to join.\n\nYou'll see some information, such as language, class, level, and how many days they have used Habitica to help find a good fit for your Party. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.", + + "faqQuestion19": "How many members can I invite to my Party?", + "iosFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.", + "androidFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.", + "webFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.", + + "faqQuestion20": "Can I invite someone I already know?", + "iosFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\n## On Habitica’s website\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\n## On iOS and Android\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.", + "androidFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\n## On Habitica’s website\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\n## On iOS and Android\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.", + "webFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\n## On Habitica’s website\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\n## On iOS and Android\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.", + + "faqQuestion21": "How do I cancel a pending invitation to my Party?", + "iosFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party\n\n2. Click the “Invites” tab\n\n3. Click the three dots beside the user’s invite you wish to cancel\n\n4. Choose “Cancel Invite”\n\n\n\nYou’ll be able to cancel a pending invitation from the mobile apps soon as well!", + "androidFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party\n\n2. Click the “Invites” tab\n\n3. Click the three dots beside the user’s invite you wish to cancel\n\n4. Choose “Cancel Invite”\n\n\n\nYou’ll be able to cancel a pending invitation from the mobile apps soon as well!", + "webFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party\n\n2. Click the “Invites” tab\n\n3. Click the three dots beside the user’s invite you wish to cancel\n\n4. Choose “Cancel Invite”\n\n\n\nYou’ll be able to cancel a pending invitation from the mobile apps soon as well!", + + "faqQuestion22": "How do I stop unwanted invitations?", + "iosFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.", + "androidFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.", + "webFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.", + + "faqQuestion23": "How do I filter the list of members searching for a Party?", + "iosFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.", + "androidFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.", + "webFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.", + + "faqQuestion24": "How do I search for a Party on Android or iOS?", + "iosFaqAnswer24": "We’re working on adding the ability to search for a Party and find Party members on mobile soon! Keep an eye out for Android version 4.2 and iOS version 3.8.", + "androidFaqAnswer24": "We’re working on adding the ability to search for a Party and find Party members on mobile soon! Keep an eye out for Android version 4.2 and iOS version 3.8.", + "webFaqAnswer24": "We’re working on adding the ability to search for a Party and find Party members on mobile soon! Keep an eye out for Android version 4.2 and iOS version 3.8.", + "iosFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.", "androidFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.", "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the [Habitica Help guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help." diff --git a/website/common/locales/en/front.json b/website/common/locales/en/front.json index b3c3b30440..434ea56177 100644 --- a/website/common/locales/en/front.json +++ b/website/common/locales/en/front.json @@ -177,7 +177,7 @@ "joinToday": "Join Habitica Today", "featuredIn": "Featured in", "signup": "Sign Up", - "getStarted": "Get Started!", + "getStarted": "Get Started", "mobileApps": "Mobile Apps", "learnMore": "Learn More", "translateHabitica": "Translate Habitica" diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index 26a51eaf7b..8b7fb17a25 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -213,6 +213,7 @@ "loadEarlierMessages": "Load Earlier Messages", "askQuestion": "Ask a Question", "emptyReportBugMessage": "Report Bug Message missing", + "refreshList": "Refresh List", "leaveHabitica": "You are about to leave Habitica.com", "leaveHabiticaText": "Habitica is not responsible for the content of any linked website that is not owned or operated by HabitRPG.
    Please note that these websites' practices may differ from Habitica’s community guidelines.", "skipExternalLinkModal": "Hold CTRL (Windows) or Command (Mac) when clicking a link to skip this modal." diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index f64ed5a596..23a84f5243 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -138,7 +138,9 @@ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD", "gemGiftsAreOptional": "Please note that Habitica will never require you to gift gems to other players. Begging people for gems is a violation of the Community Guidelines, and all such instances should be reported to <%= hrefTechAssistanceEmail %>.", "giftMessageTooLong": "The maximum length for gift messages is <%= maxGiftMessageLength %>.", - "battleWithFriends": "Battle Monsters With Friends", + "battleWithFriends": "Play Habitica with Others", + "questWithOthers": "Take on Quests with Others", + "startPartyDetail": "Start your own Party or join an existing one
    to take on Quests and boost your motivation!", "startAParty": "Start a Party", "partyUpName": "Party Up", "partyOnName": "Party On", @@ -174,6 +176,7 @@ "usernamesMustBeAnArray": "Username invites must be an array.", "canOnlyInviteMaxInvites": "You can only invite \"<%= maxInvites %>\" at a time", "partyExceedsMembersLimit": "Party size is limited to <%= maxMembersParty %> members", + "partyExceedsInvitesLimit": "A Party may only have up to <%= maxInvites %> pending invitations.", "onlyCreatorOrAdminCanDeleteChat": "Not authorized to delete this message!", "onlyGroupLeaderCanEditTasks": "Not authorized to manage tasks!", "onlyGroupTasksCanBeAssigned": "Only group tasks can be assigned", @@ -289,17 +292,20 @@ "noGuildsParagraph2": "Click the Discover tab to see recommended Guilds based on your interests, browse Habitica's public Guilds, or create your own Guild.", "noGuildsMatchFilters": "We couldn't find any matching Guilds.", "privateDescription": "A private Guild will not be displayed in Habitica's Guild directory. New members can be added by invitation only.", - "removeInvite": "Remove Invitation", + "removeInvite": "Cancel Invite", "removeMember": "Remove Member", "sendMessage": "Send Message", "promoteToLeader": "Transfer Ownership", - "inviteFriendsParty": "Inviting friends to your Party will grant you an exclusive
    Quest Scroll to battle the Basi-List together!", + "inviteFriendsParty": "Invite another player to your Party
    and receive the exclusive Basi-List Quest Scroll.", "createParty": "Create a Party", "inviteMembersNow": "Would you like to invite members now?", "playInPartyTitle": "Play Habitica in a Party!", - "playInPartyDescription": "Take on amazing quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.", - "wantToJoinPartyTitle": "Want to join a Party?", + "playInPartyDescription": "Take on amazing Quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.", + "wantToJoinPartyTitle": "Looking for a Party?", "wantToJoinPartyDescription": "Give your username to a friend who already has a Party, or head to the Party Wanted Guild to meet potential comrades!", + "lookForParty": "Look for a Party", + "currentlyLookingForParty": "You’re looking for a Party!", + "partyFinderDescription": "Want to join a Party with others but don’t know any other players? Let Party leaders know you’re looking for an invite!", "copy": "Copy", "questOwnerRewards": "Quest Owner Rewards", "updateParty": "Update Party", @@ -403,5 +409,13 @@ "newGroupsBullet10b": "Assign a task to one member so only they can complete it", "newGroupsBullet10c": "Assign a task to multiple members if they all need to complete it", "newGroupsVisitFAQ": "Visit the FAQ from the Help dropdown for more guidance.", - "newGroupsEnjoy": "We hope you enjoy the new Group Plans experience!" + "newGroupsEnjoy": "We hope you enjoy the new Group Plans experience!", + "checkinsLabel": "Check-ins:", + "classLabel": "Class:", + "languageLabel": "Language:", + "invitedToYourParty": "Invited to Your Party!  Click to Undo", + "lookingForPartyTitle": "Find Members", + "findMorePartyMembers": "Find More Members", + "findPartyMembers": "Find Party Members", + "noOneLooking": "There’s no one looking for a Party right now.
    You can check back later!" } diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json index 0ebe1a9b7f..c1c9c191ce 100644 --- a/website/common/locales/en/npc.json +++ b/website/common/locales/en/npc.json @@ -108,7 +108,7 @@ "toDo": "To Do", "tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.", "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Pause Damage\". Come say hi!", - "tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!", + "tourPartyPage": "Welcome to your new Party! You can invite other players to your Party by username, email, or from a list of players looking for a Party to earn the exclusive Basi-List Quest Scroll.

    Select FAQ from the Help dropdown to learn more about how Parties work.", "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Habitica Help: Ask a Question guild, where anyone can ask questions about Habitica!", "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!", "tourMarketPage": "Every time you complete a task, you'll have a random chance at receiving an Egg, a Hatching Potion, or a piece of Pet Food. You can also buy these items here.", diff --git a/website/common/script/content/faq.js b/website/common/script/content/faq.js index 10b87a4cbe..71758b49df 100644 --- a/website/common/script/content/faq.js +++ b/website/common/script/content/faq.js @@ -21,10 +21,6 @@ const questionList = [ heading: 'health', translationIndex: 4, }, - { - heading: 'party-with-friends', - translationIndex: 5, - }, { heading: 'pets-mounts', translationIndex: 6, @@ -52,7 +48,54 @@ const questionList = [ { heading: 'group-plans', translationIndex: 13, - excludedPlatforms: ['android', 'ios'], + }, + { + heading: 'party-with-friends', + translationIndex: 5, + }, + { + heading: 'party-detail-1', + translationIndex: 14, + }, + { + heading: 'party-detail-2', + translationIndex: 15, + }, + { + heading: 'party-detail-3', + translationIndex: 16, + }, + { + heading: 'party-detail-4', + translationIndex: 17, + }, + { + heading: 'party-detail-5', + translationIndex: 18, + }, + { + heading: 'party-detail-6', + translationIndex: 19, + }, + { + heading: 'party-detail-7', + translationIndex: 20, + }, + { + heading: 'party-detail-8', + translationIndex: 21, + }, + { + heading: 'party-detail-9', + translationIndex: 22, + }, + { + heading: 'party-detail-10', + translationIndex: 23, + }, + { + heading: 'party-detail-11', + translationIndex: 24, }, ]; diff --git a/website/common/script/errors/apiErrorMessages.js b/website/common/script/errors/apiErrorMessages.js index 531d7e8a04..6e0eae6ce9 100644 --- a/website/common/script/errors/apiErrorMessages.js +++ b/website/common/script/errors/apiErrorMessages.js @@ -18,6 +18,7 @@ export default { groupRemainOrLeaveChallenges: 'req.query.keep must be either "remain-in-challenges" or "leave-challenges"', managerIdRequired: 'req.body.managerId must contain a User ID.', noPrivAccess: 'You don\'t have the required privileges.', + notPartyLeader: 'You are not the leader of a Party.', eventRequired: '"req.params.event" is required.', countRequired: '"req.query.count" is required.', diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js index d6431e40cd..85ce52edae 100644 --- a/website/server/controllers/api-v3/groups.js +++ b/website/server/controllers/api-v3/groups.js @@ -1,5 +1,6 @@ import _ from 'lodash'; import nconf from 'nconf'; +import moment from 'moment'; import { authWithHeaders } from '../../middlewares/auth'; import { model as Group, @@ -719,6 +720,25 @@ api.joinGroup = { } } + const analyticsObject = { + uuid: user._id, + hitType: 'event', + category: 'behavior', + owner: false, + groupId: group._id, + groupType: group.type, + privacy: group.privacy, + headers: req.headers, + invited: isUserInvited, + }; + if (group.type === 'party') { + analyticsObject.seekingParty = Boolean(user.party.seeking); + } + if (group.privacy === 'public') { + analyticsObject.groupName = group.name; + } + user.party.seeking = undefined; + if (inviter) promises.push(inviter.save()); promises = await Promise.all(promises); @@ -733,22 +753,6 @@ api.joinGroup = { response.leader = leader.toJSON({ minimize: true }); } - const analyticsObject = { - uuid: user._id, - hitType: 'event', - category: 'behavior', - owner: false, - groupId: group._id, - groupType: group.type, - privacy: group.privacy, - headers: req.headers, - invited: isUserInvited, - }; - - if (group.privacy === 'public') { - analyticsObject.groupName = group.name; - } - res.analytics.track('join group', analyticsObject); res.respond(200, response); @@ -1204,17 +1208,6 @@ api.inviteToGroup = { results.push(...usernameResults); } - const analyticsObject = { - uuid: user._id, - hitType: 'event', - category: 'behavior', - groupId: group._id, - groupType: group.type, - headers: req.headers, - }; - - res.analytics.track('group invite', analyticsObject); - res.respond(200, results); }, }; @@ -1362,4 +1355,88 @@ api.getGroupPlans = { }, }; +/** + * @api {get} /api/v3/looking-for-party Get users in search of parties + * @apiName GetLookingForParty + * @apiGroup Group + * + * @apiParam (Query) {Number} [page] Page number, defaults to 0 + * + * @apiSuccess {Object[]} data An array of users looking for a party + * + * @apiError (400) {BadRequest} notPartyLeader You are not the leader of a Party. + */ +api.getLookingForParty = { + method: 'GET', + url: '/looking-for-party', + middlewares: [authWithHeaders()], + async handler (req, res) { + const USERS_PER_PAGE = 30; + const { user } = res.locals; + + req.checkQuery('page').optional().isInt({ min: 0 }, apiError('queryPageInteger')); + const PAGE = req.query.page || 0; + const PAGE_START = USERS_PER_PAGE * PAGE; + + const partyLed = await Group + .findOne({ + type: 'party', + leader: user._id, + }) + .select('_id') + .exec(); + + if (!partyLed) { + throw new BadRequest(apiError('notPartyLeader')); + } + + const seekers = await User + .find({ + 'party.seeking': { $exists: true }, + 'auth.timestamps.loggedin': { + $gt: moment().subtract(7, 'days').toDate(), + }, + }) + // eslint-disable-next-line no-multi-str + .select('_id auth.blocked auth.local.username auth.timestamps backer contributor.level \ + flags.chatRevoked flags.classSelected inbox.blocks invitations.party items.gear.costume \ + items.gear.equipped loginIncentives party._id preferences.background preferences.chair \ + preferences.costume preferences.hair preferences.shirt preferences.size preferences.skin \ + preferences.language profile.name stats.buffs stats.class stats.lvl') + .sort('-auth.timestamps.loggedin') + .exec(); + + const filteredSeekers = seekers.filter(seeker => { + if (seeker.party._id) return false; + if (seeker.invitations.party.id) return false; + if (seeker.flags.chatRevoked) return false; + if (seeker.auth.blocked) return false; + if (seeker.inbox.blocks.indexOf(user._id) !== -1) return false; + if (user.inbox.blocks.indexOf(seeker._id) !== -1) return false; + return true; + }).slice(PAGE_START, PAGE_START + USERS_PER_PAGE); + + const cleanedSeekers = filteredSeekers.map(seeker => ({ + _id: seeker._id, + auth: { + local: { + username: seeker.auth.local.username, + }, + timestamps: seeker.auth.timestamps, + }, + backer: seeker.backer, + contributor: seeker.contributor, + flags: seeker.flags, + invited: false, + items: seeker.items, + loginIncentives: seeker.loginIncentives, + preferences: seeker.preferences, + profile: seeker.profile, + stats: seeker.stats, + })); + + res.respond(200, cleanedSeekers); + }, +}; + export default api; diff --git a/website/server/libs/invites/index.js b/website/server/libs/invites/index.js index c45c38c246..2a6a6d790d 100644 --- a/website/server/libs/invites/index.js +++ b/website/server/libs/invites/index.js @@ -87,10 +87,9 @@ async function inviteUserToParty (userToInvite, group, inviter, res) { } if (userToInvite.party._id) { - const userParty = await Group.getGroup({ user: userToInvite, groupId: 'party', fields: 'memberCount' }); + const userParty = await Group.getGroup({ user: userToInvite, groupId: 'party', fields: '_id' }); - // Allow user to be invited to a new party when they're partying solo - if (userParty && userParty.memberCount !== 1) throw new NotAuthorized(res.t('userAlreadyInAParty', { userId: uuid, username: userToInvite.profile.name })); + if (userParty) throw new NotAuthorized(res.t('userAlreadyInAParty', { userId: uuid, username: userToInvite.profile.name })); } const partyInvite = { id: group._id, name: group.name, inviter: inviter._id }; @@ -142,6 +141,22 @@ async function inviteByUUID (uuid, group, inviter, req, res) { )); } + const analyticsObject = { + hitType: 'event', + category: 'behavior', + uuid: inviter._id, + invitee: uuid, + groupId: group._id, + groupType: group.type, + headers: req.headers, + }; + + if (group.type === 'party') { + analyticsObject.seekingParty = Boolean(userToInvite.party.seeking); + } + + res.analytics.track('group invite', analyticsObject); + return addInvitationToUser(userToInvite, group, inviter, res); } @@ -189,6 +204,18 @@ async function inviteByEmail (invite, group, inviter, req, res) { const userIsUnsubscribed = await EmailUnsubscription.findOne({ email: invite.email }).exec(); const groupLabel = group.type === 'guild' ? '-guild' : ''; if (!userIsUnsubscribed) sendTxnEmail(invite, `invite-friend${groupLabel}`, variables); + + const analyticsObject = { + hitType: 'event', + category: 'behavior', + uuid: inviter._id, + invitee: 'email', + groupId: group._id, + groupType: group.type, + headers: req.headers, + }; + + res.analytics.track('group invite', analyticsObject); } return userReturnInfo; @@ -214,6 +241,23 @@ async function inviteByUserName (username, group, inviter, req, res) { { userId: userToInvite._id, username: userToInvite.profile.name }, )); } + + const analyticsObject = { + hitType: 'event', + category: 'behavior', + uuid: inviter._id, + invitee: userToInvite._id, + groupId: group._id, + groupType: group.type, + headers: req.headers, + }; + + if (group.type === 'party') { + analyticsObject.seekingParty = Boolean(userToInvite.party.seeking); + } + + res.analytics.track('group invite', analyticsObject); + return addInvitationToUser(userToInvite, group, inviter, res); } diff --git a/website/server/libs/user/index.js b/website/server/libs/user/index.js index 4ed618b36f..28d218cda4 100644 --- a/website/server/libs/user/index.js +++ b/website/server/libs/user/index.js @@ -51,6 +51,7 @@ const updatablePaths = [ 'party.orderAscending', 'party.quest.completed', 'party.quest.RSVPNeeded', + 'party.seeking', 'preferences', 'profile', @@ -120,7 +121,17 @@ async function checkNewInputForProfanity (user, res, newValue) { export async function update (req, res, { isV3 = false }) { const { user } = res.locals; - let promisesForTagsRemoval = []; + const promisesForTagsRemoval = []; + + if (req.body['party.seeking'] !== undefined && req.body['party.seeking'] !== null) { + user.invitations.party = {}; + user.invitations.parties = []; + res.analytics.track('Starts Looking for Party', { + uuid: user._id, + hitType: 'event', + category: 'behavior', + }); + } if (req.body['profile.name'] !== undefined) { const newName = req.body['profile.name']; @@ -170,7 +181,14 @@ export async function update (req, res, { isV3 = false }) { throw new NotAuthorized(res.t('mustPurchaseToSet', { val, key })); } - if (key === 'tags') { + if (key === 'party.seeking' && val === null) { + user.party.seeking = undefined; + res.analytics.track('Leaves Looking for Party', { + uuid: user._id, + hitType: 'event', + category: 'behavior', + }); + } else if (key === 'tags') { if (!Array.isArray(val)) throw new BadRequest('Tag list must be an array.'); const removedTagsIds = []; @@ -200,13 +218,13 @@ export async function update (req, res, { isV3 = false }) { // Remove from all the tasks // NOTE each tag to remove requires a query - promisesForTagsRemoval = removedTagsIds.map(tagId => Tasks.Task.update({ + promisesForTagsRemoval.push(removedTagsIds.map(tagId => Tasks.Task.update({ userId: user._id, }, { $pull: { tags: tagId, }, - }, { multi: true }).exec()); + }, { multi: true }).exec())); } else if (key === 'flags.newStuff' && val === false) { // flags.newStuff was removed from the user schema and is only returned for compatibility // reasons but we're keeping the ability to set it in API v3 diff --git a/website/server/models/group.js b/website/server/models/group.js index 3eebae5ede..030a16ce53 100644 --- a/website/server/models/group.js +++ b/website/server/models/group.js @@ -44,6 +44,7 @@ const { questSeriesAchievements } = shared.content; const { Schema } = mongoose; export const INVITES_LIMIT = 100; // must not be greater than MAX_EMAIL_INVITES_BY_USER +export const PARTY_PENDING_LIMIT = 10; export const { TAVERN_ID } = shared; const NO_CHAT_NOTIFICATIONS = [TAVERN_ID]; @@ -487,6 +488,9 @@ schema.statics.validateInvitations = async function getInvitationErr (invites, r query['invitations.party.id'] = group._id; // @TODO invitations are now stored like this: `'invitations.parties': []` const groupInvites = await User.countDocuments(query).exec(); + if (groupInvites + totalInvites > PARTY_PENDING_LIMIT) { + throw new BadRequest(res.t('partyExceedsInvitesLimit', { maxInvites: PARTY_PENDING_LIMIT })); + } memberCount += groupInvites; // Counting the members that are going to be invited by email and uuids diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 1a39c01f31..1567ec488d 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -502,6 +502,7 @@ export default new Schema({ // invite is accepted or rejected, quest starts, or quest is cancelled RSVPNeeded: { $type: Boolean, default: false }, }, + seeking: Date, }, preferences: { dayStart: { From e31bfdc22b23811229a2bb283e63c3b1760ed4e0 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 2 May 2023 09:50:15 -0500 Subject: [PATCH 16/17] fix(stats): allow negative EXP --- website/server/models/user/schema.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 1567ec488d..5ed98a11d9 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -617,7 +617,7 @@ export default new Schema({ stats: { hp: { $type: Number, default: shared.maxHealth }, mp: { $type: Number, default: 10, min: 0 }, - exp: { $type: Number, default: 0, min: 0 }, + exp: { $type: Number, default: 0 }, gp: { $type: Number, default: 0, min: 0 }, lvl: { $type: Number, From c2515a4042b39d7eaf2fad0f5c951d11bfb66fc2 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 2 May 2023 09:51:55 -0500 Subject: [PATCH 17/17] 4.269.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 936c950279..a5ff806b39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.268.1", + "version": "4.269.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 329651e2e9..0c999dbdfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.268.1", + "version": "4.269.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12",