From b77deb28b47f144e603f1e115179a0fb3c506c8a Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 8 Mar 2023 12:01:50 -0500 Subject: [PATCH 01/60] initial commit --- website/client/src/components/appFooter.vue | 5 +++++ website/client/src/components/externalLinkModal.vue | 0 2 files changed, 5 insertions(+) create mode 100644 website/client/src/components/externalLinkModal.vue diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index 371abef107..e5e878fb65 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -365,6 +365,11 @@ class="btn btn-secondary" @click="makeAdmin()" >Make Admin + + External Link Modal + diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue new file mode 100644 index 0000000000..e69de29bb2 From d0941810a793e26324c5603297729217414fcc1b Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 8 Mar 2023 12:52:22 -0500 Subject: [PATCH 02/60] trying to make a modal --- website/client/src/components/appFooter.vue | 4 + .../src/components/externalLinkModal.vue | 128 ++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index e5e878fb65..26ad8aca60 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -367,6 +367,7 @@ >Make Admin External Link Modal @@ -914,6 +915,9 @@ export default { donate () { this.$root.$emit('bv::show::modal', 'buy-gems', { alreadyTracked: true }); }, + externalLinkModal () { + this.$root.$emit('bv::show::modal', 'external-link-modal'); + }, }, }; diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index e69de29bb2..48f4570c59 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -0,0 +1,128 @@ + + + + + From 65f12ac9ea1c85a1e22f18aef9b11e4390807a92 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 8 Mar 2023 12:55:58 -0500 Subject: [PATCH 03/60] adding console log messages --- website/client/src/components/appFooter.vue | 1 + website/client/src/components/externalLinkModal.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index 26ad8aca60..e63f93d1d4 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -917,6 +917,7 @@ export default { }, externalLinkModal () { this.$root.$emit('bv::show::modal', 'external-link-modal'); + console.log('Hi!'); }, }, }; diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index 48f4570c59..e0aea90077 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -122,6 +122,7 @@ export default { methods: { close () { this.$root.$emit('bv::hide::modal', 'external-link-modal'); + console.log('Bye!'); } }, }; From 3f3e0e2ae8c857a267dcdb264883fea87389f7f7 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 8 Mar 2023 15:17:15 -0500 Subject: [PATCH 04/60] modal essentially complete but for scripts --- website/client/src/app.vue | 3 + .../src/components/externalLinkModal.vue | 93 ++++++++++++------- website/common/locales/en/generic.json | 4 +- 3 files changed, 65 insertions(+), 35 deletions(-) diff --git a/website/client/src/app.vue b/website/client/src/app.vue index ede7eb8c9c..95cb2ba425 100644 --- a/website/client/src/app.vue +++ b/website/client/src/app.vue @@ -35,6 +35,7 @@ + @@ -175,6 +176,7 @@ import amazonPaymentsModal from '@/components/payments/amazonModal'; import paymentsSuccessModal from '@/components/payments/successModal'; import subCancelModalConfirm from '@/components/payments/cancelModalConfirm'; import subCanceledModal from '@/components/payments/canceledModal'; +import externalLinkModal from '@/components/externalLinkModal.vue'; import spellsMixin from '@/mixins/spells'; import { @@ -210,6 +212,7 @@ export default { subCanceledModal, bugReportModal, bugReportSuccessModal, + externalLinkModal, }, mixins: [notifications, spellsMixin], data () { diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index e0aea90077..1ff7ca2c54 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -22,21 +22,26 @@ v-html="icons.exclamation" > -

You are about to leave Habitica.com

+

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

-
- 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. + + +
+ +
@@ -44,7 +49,32 @@ diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index 67b27d5633..d360bed360 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -212,5 +212,7 @@ "contactForm": "Contact the Moderation Team", "loadEarlierMessages": "Load Earlier Messages", "askQuestion": "Ask a Question", - "emptyReportBugMessage": "Report Bug Message missing" + "emptyReportBugMessage": "Report Bug Message missing", + "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." } From a210ab57b08251d5aff14e6572b82b09b02af363 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 10 Mar 2023 13:33:51 -0600 Subject: [PATCH 05/60] WIP(external-link): hacky attempt number one --- website/client/src/directives/markdown.js | 2 ++ website/client/src/router/index.js | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/website/client/src/directives/markdown.js b/website/client/src/directives/markdown.js index 99237ee1c8..f4da7164f2 100644 --- a/website/client/src/directives/markdown.js +++ b/website/client/src/directives/markdown.js @@ -8,6 +8,8 @@ export default function markdown (el, { value, oldValue }) { } else { el.innerHTML = ''; } + // This is a hack, but it's one idea for how we might do things + el.innerHTML = el.innerHTML.replace('href="h', 'href="/external?link=h'); el.classList.add('markdown'); } diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js index 09727c789e..4ea5092447 100644 --- a/website/client/src/router/index.js +++ b/website/client/src/router/index.js @@ -377,6 +377,8 @@ const router = new VueRouter({ ], }, + { name: 'externalLink', path: '/external' }, + // Only used to handle some redirects // See router.beforeEach { path: '/redirect/:redirect', name: 'redirect' }, @@ -393,6 +395,11 @@ router.beforeEach(async (to, from, next) => { if (to.name === 'redirect') return handleRedirect(to, from, next); + if (to.name === 'externalLink') { + setTimeout(() => router.app.$emit('bv::show::modal', 'external-link-modal'), 500); + return null; + } + if (!isUserLoggedIn && routeRequiresLogin) { // Redirect to the login page unless the user is trying to reach the // root of the website, in which case show the home page. From e39b3bdd35aa9a31637213bfb3c51e389a221269 Mon Sep 17 00:00:00 2001 From: negue Date: Sat, 11 Mar 2023 00:40:05 +0100 Subject: [PATCH 06/60] open the modal by click override --- website/client/src/directives/markdown.js | 18 ++++++++++++++++-- website/client/src/main.js | 8 +++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/website/client/src/directives/markdown.js b/website/client/src/directives/markdown.js index f4da7164f2..1d0abcf8f6 100644 --- a/website/client/src/directives/markdown.js +++ b/website/client/src/directives/markdown.js @@ -8,8 +8,22 @@ export default function markdown (el, { value, oldValue }) { } else { el.innerHTML = ''; } - // This is a hack, but it's one idea for how we might do things - el.innerHTML = el.innerHTML.replace('href="h', 'href="/external?link=h'); + + const allLinks = el.getElementsByTagName('a'); + + for (let i = 0; i < allLinks.length; i++) { + const link = allLinks[i]; + + // todo middleclick or ctrl+click to open it in a new tab + // todo? should a normal click leave the current page or also open it in a new tab? + // ... hopefully this wont create memory leaks + link.addEventListener('click', e => { + e.stopPropagation(); + e.preventDefault(); + + window.externalLink(link.href); + }); + } el.classList.add('markdown'); } diff --git a/website/client/src/main.js b/website/client/src/main.js index f3587c5c12..d52f73f0ee 100644 --- a/website/client/src/main.js +++ b/website/client/src/main.js @@ -33,9 +33,15 @@ setUpLogging(); setupAnalytics(); // just create queues for analytics, no scripts loaded at this time const store = getStore(); -export default new Vue({ +const vueInstance = new Vue({ el: '#app', router, store, render: h => h(AppComponent), }); + +export default vueInstance; + +window.externalLink = url => { + vueInstance.$root.$emit('bv::show::modal', 'external-link-modal', url); +}; From 83f5c92ff199e509265cc988932ad5ccc4e69ecd Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 13 Mar 2023 18:36:14 -0500 Subject: [PATCH 07/60] fix(lint): loop no likey ++ --- website/client/src/directives/markdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/client/src/directives/markdown.js b/website/client/src/directives/markdown.js index 1d0abcf8f6..2c210f5e74 100644 --- a/website/client/src/directives/markdown.js +++ b/website/client/src/directives/markdown.js @@ -11,7 +11,7 @@ export default function markdown (el, { value, oldValue }) { const allLinks = el.getElementsByTagName('a'); - for (let i = 0; i < allLinks.length; i++) { + for (let i = 0; i < allLinks.length; i += 1) { const link = allLinks[i]; // todo middleclick or ctrl+click to open it in a new tab From 971b124b057307e927b4e07f348481cf8c324794 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 15 Mar 2023 11:21:25 -0400 Subject: [PATCH 08/60] apply correct opacity to close icon --- website/client/src/components/externalLinkModal.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index 1ff7ca2c54..e6988229a7 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -68,9 +68,11 @@ & svg { fill: $yellow-1; + opacity: 0.75; } & :hover { fill: $yellow-1; + opacity: 1; } } } From 8cd706fd95e69c61019f419efc0615ecdb07a528 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 17 Mar 2023 16:37:16 -0500 Subject: [PATCH 09/60] feat(links): route to selected link --- website/client/src/components/appFooter.vue | 10 --------- .../src/components/externalLinkModal.vue | 22 +++++++++++++++++-- website/client/src/directives/markdown.js | 6 ++--- website/client/src/main.js | 2 +- website/client/src/router/index.js | 7 ------ 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index 186470c6e2..69ec6b0e2f 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -366,12 +366,6 @@ class="btn btn-secondary" @click="makeAdmin()" >Make Admin - - External Link Modal -
@@ -903,10 +897,6 @@ export default { donate () { this.$root.$emit('bv::show::modal', 'buy-gems', { alreadyTracked: true }); }, - externalLinkModal () { - this.$root.$emit('bv::show::modal', 'external-link-modal'); - console.log('Hi!'); - }, }, }; diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index 1ff7ca2c54..4d332f8d12 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -39,7 +39,7 @@ @@ -51,9 +51,14 @@ @import '~@/assets/scss/colors.scss'; #external-link-modal { + &.modal { + display: flex !important; + } + .modal-md { max-width: 448px; min-width: 330px; + margin: auto; .modal-close { position: absolute; @@ -142,12 +147,25 @@ export default { close: closeIcon, exclamation: exclamationIcon, }), + url: '', }; }, + mounted () { + this.$root.$on('habitica:external-link', url => { + this.url = url; + this.$root.$emit('bv::show::modal', 'external-link-modal'); + }); + }, + beforeDestroy () { + this.$root.$off('habitica:external-link'); + }, methods: { close () { this.$root.$emit('bv::hide::modal', 'external-link-modal'); - console.log('Bye!'); + }, + proceed () { + window.open(this.url, '_blank').focus(); + this.close(); }, }, }; diff --git a/website/client/src/directives/markdown.js b/website/client/src/directives/markdown.js index 2c210f5e74..7756a6221b 100644 --- a/website/client/src/directives/markdown.js +++ b/website/client/src/directives/markdown.js @@ -14,10 +14,10 @@ export default function markdown (el, { value, oldValue }) { for (let i = 0; i < allLinks.length; i += 1) { const link = allLinks[i]; - // todo middleclick or ctrl+click to open it in a new tab - // todo? should a normal click leave the current page or also open it in a new tab? - // ... hopefully this wont create memory leaks link.addEventListener('click', e => { + if (e.ctrlKey) { + return; + } e.stopPropagation(); e.preventDefault(); diff --git a/website/client/src/main.js b/website/client/src/main.js index d52f73f0ee..7a9e39a2f3 100644 --- a/website/client/src/main.js +++ b/website/client/src/main.js @@ -43,5 +43,5 @@ const vueInstance = new Vue({ export default vueInstance; window.externalLink = url => { - vueInstance.$root.$emit('bv::show::modal', 'external-link-modal', url); + vueInstance.$root.$emit('habitica:external-link', url); }; diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js index 4ea5092447..09727c789e 100644 --- a/website/client/src/router/index.js +++ b/website/client/src/router/index.js @@ -377,8 +377,6 @@ const router = new VueRouter({ ], }, - { name: 'externalLink', path: '/external' }, - // Only used to handle some redirects // See router.beforeEach { path: '/redirect/:redirect', name: 'redirect' }, @@ -395,11 +393,6 @@ router.beforeEach(async (to, from, next) => { if (to.name === 'redirect') return handleRedirect(to, from, next); - if (to.name === 'externalLink') { - setTimeout(() => router.app.$emit('bv::show::modal', 'external-link-modal'), 500); - return null; - } - if (!isUserLoggedIn && routeRequiresLogin) { // Redirect to the login page unless the user is trying to reach the // root of the website, in which case show the home page. From c726208d6e609393fe0439fa48700b53ffca240a Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Tue, 21 Mar 2023 13:00:15 -0400 Subject: [PATCH 10/60] add cancel option --- .../client/src/components/externalLinkModal.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index e6988229a7..47fe67af41 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -43,6 +43,13 @@ > {{ $t('continue') }} +
+ {{ $t('cancel') }} +
@@ -129,6 +136,15 @@ border-top: none; padding-top: 0; } + .close-link { + color: $purple-300; + line-height: 1.71; + font-size: 0.875rem; + cursor: pointer; + padding-top:16px; + padding-bottom: 8px; + text-align: center; + } } } From b264e539f4d0fe629cd6235632a533d1c277367d Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Tue, 21 Mar 2023 14:49:43 -0400 Subject: [PATCH 11/60] add crtl/cmd instructions to skip modal --- .../src/components/externalLinkModal.vue | 31 ++++++++++++++----- website/common/locales/en/generic.json | 3 +- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index 47fe67af41..2d64dfd536 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -33,6 +33,11 @@ v-html="$t('leaveHabiticaText')" > +
+ {{ $t('skipExternalLinkModal') }} +
@@ -64,13 +69,13 @@ .modal-close { position: absolute; - right: 16px; - top: 16px; + right: 12px; + top: 12px; cursor: pointer; .icon-close { - width: 18px; - height: 18px; + width: 16px; + height: 16px; vertical-align: middle; & svg { @@ -90,7 +95,7 @@ .modal-header { justify-content: center; - padding-top: 24px; + padding-top: 32px; padding-bottom: 0px; background: $yellow-100; border-top-right-radius: 8px; @@ -113,7 +118,7 @@ h2 { color: $yellow-1; - // font-size: 1.25rem; + margin-bottom: 16px; } } @@ -125,6 +130,16 @@ font-size: 0.875rem; line-height: 1.71; text-align: center; + margin-top:24px; + } + + .skip-modal { + color: $gray-100; + font-size: 0.75rem; + text-align: center; + line-height: 1.33; + margin-top: 16px; + // padding-bottom: 24px; } } @@ -141,8 +156,8 @@ line-height: 1.71; font-size: 0.875rem; cursor: pointer; - padding-top:16px; - padding-bottom: 8px; + margin-top:16px; + margin-bottom: 8px; text-align: center; } } diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index d360bed360..26a51eaf7b 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -214,5 +214,6 @@ "askQuestion": "Ask a Question", "emptyReportBugMessage": "Report Bug Message missing", "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." + "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." } From 786b1ec67035ed2f33409d80fbfa71411255c252 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Tue, 21 Mar 2023 17:07:40 -0400 Subject: [PATCH 12/60] add underline to cancel link --- website/client/src/components/externalLinkModal.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue index 2d64dfd536..e662595d23 100644 --- a/website/client/src/components/externalLinkModal.vue +++ b/website/client/src/components/externalLinkModal.vue @@ -159,6 +159,10 @@ margin-top:16px; margin-bottom: 8px; text-align: center; + + &:hover { + text-decoration: underline; + } } } } From ca1200b689ac87a123339d037512a7e90f7534af Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 22 Mar 2023 18:06:53 -0500 Subject: [PATCH 13/60] feat(links): new external link implementation --- .../components/challenges/challengeDetail.vue | 7 +++- .../components/challenges/findChallenges.vue | 7 +++- .../components/challenges/groupChallenges.vue | 7 ++++ .../components/challenges/myChallenges.vue | 7 +++- website/client/src/components/groups/chat.vue | 6 +++ .../client/src/components/tasks/column.vue | 7 +++- website/client/src/directives/markdown.js | 16 -------- website/client/src/mixins/externalLinks.js | 38 +++++++++++++++++++ 8 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 website/client/src/mixins/externalLinks.js diff --git a/website/client/src/components/challenges/challengeDetail.vue b/website/client/src/components/challenges/challengeDetail.vue index bacd28c6fc..b86a2c28de 100644 --- a/website/client/src/components/challenges/challengeDetail.vue +++ b/website/client/src/components/challenges/challengeDetail.vue @@ -322,6 +322,7 @@ import omit from 'lodash/omit'; import { v4 as uuid } from 'uuid'; import { userStateMixin } from '../../mixins/userState'; +import externalLinks from '../../mixins/externalLinks'; import memberSearchDropdown from '@/components/members/memberSearchDropdown'; import closeChallengeModal from './closeChallengeModal'; import Column from '../tasks/column'; @@ -358,7 +359,7 @@ export default { userLink, groupLink, }, - mixins: [challengeMemberSearchMixin, userStateMixin], + mixins: [challengeMemberSearchMixin, externalLinks, userStateMixin], props: ['challengeId'], data () { return { @@ -414,6 +415,10 @@ export default { mounted () { if (!this.searchId) this.searchId = this.challengeId; if (!this.challenge._id) this.loadChallenge(); + this.handleExternalLinks(); + }, + updated () { + this.handleExternalLinks(); }, async beforeRouteUpdate (to, from, next) { this.searchId = to.params.challengeId; diff --git a/website/client/src/components/challenges/findChallenges.vue b/website/client/src/components/challenges/findChallenges.vue index e8b3d08907..6093b405f8 100644 --- a/website/client/src/components/challenges/findChallenges.vue +++ b/website/client/src/components/challenges/findChallenges.vue @@ -120,6 +120,7 @@ import { mapState } from '@/libs/store'; import Sidebar from './sidebar'; import ChallengeItem from './challengeItem'; import challengeModal from './challengeModal'; +import externalLinks from '@/mixins/externalLinks'; import challengeUtilities from '@/mixins/challengeUtilities'; import positiveIcon from '@/assets/svg/positive.svg'; @@ -131,7 +132,7 @@ export default { challengeModal, MugenScroll, }, - mixins: [challengeUtilities], + mixins: [challengeUtilities, externalLinks], data () { return { loading: true, @@ -177,6 +178,10 @@ export default { section: this.$t('challenges'), }); this.loadChallenges(); + this.handleExternalLinks(); + }, + updated () { + this.handleExternalLinks(); }, methods: { updateSearch (eventData) { diff --git a/website/client/src/components/challenges/groupChallenges.vue b/website/client/src/components/challenges/groupChallenges.vue index fc370700c8..7afa34e7f7 100644 --- a/website/client/src/components/challenges/groupChallenges.vue +++ b/website/client/src/components/challenges/groupChallenges.vue @@ -81,6 +81,8 @@ import challengeModal from './challengeModal'; import { mapState } from '@/libs/store'; import markdownDirective from '@/directives/markdown'; +import externalLinks from '../../mixins/externalLinks'; + import challengeItem from './challengeItem'; import challengeIcon from '@/assets/svg/challenge.svg'; @@ -92,6 +94,7 @@ export default { directives: { markdown: markdownDirective, }, + mixins: [externalLinks], props: ['group'], data () { return { @@ -118,6 +121,10 @@ export default { }, mounted () { this.loadChallenges(); + this.handleExternalLinks(); + }, + updated () { + this.handleExternalLinks(); }, methods: { async loadChallenges () { diff --git a/website/client/src/components/challenges/myChallenges.vue b/website/client/src/components/challenges/myChallenges.vue index 8f31154ca3..c37c3d2416 100644 --- a/website/client/src/components/challenges/myChallenges.vue +++ b/website/client/src/components/challenges/myChallenges.vue @@ -145,6 +145,7 @@ import Sidebar from './sidebar'; import ChallengeItem from './challengeItem'; import challengeModal from './challengeModal'; import challengeUtilities from '@/mixins/challengeUtilities'; +import externalLinks from '@/mixins/externalLinks'; import challengeIcon from '@/assets/svg/challenge.svg'; import positiveIcon from '@/assets/svg/positive.svg'; @@ -156,7 +157,7 @@ export default { challengeModal, MugenScroll, }, - mixins: [challengeUtilities], + mixins: [challengeUtilities, externalLinks], data () { return { icons: Object.freeze({ @@ -203,6 +204,10 @@ export default { section: this.$t('challenges'), }); this.loadChallenges(); + this.handleExternalLinks(); + }, + updated () { + this.handleExternalLinks(); }, methods: { updateSearch (eventData) { diff --git a/website/client/src/components/groups/chat.vue b/website/client/src/components/groups/chat.vue index e2c341b525..69038946b8 100644 --- a/website/client/src/components/groups/chat.vue +++ b/website/client/src/components/groups/chat.vue @@ -87,6 +87,8 @@ 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 59/60] 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 60/60] 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",