From 4b2fd60e477bff71311a2678f0f32d942b9bfde7 Mon Sep 17 00:00:00 2001
From: garayj <44415359+garayj@users.noreply.github.com>
Date: Fri, 31 May 2019 03:26:15 -0700
Subject: [PATCH] FIX Guild suggestion incorrectly identifies account as new
 #11159 (#11197)

* Changed the suggested guild string to a translatable string and made changes so that the string only shows within 60 days of user profile creation.

* Removed whitespace.
---
 website/client/components/groups/publicGuildItem.vue | 7 ++++---
 website/common/locales/en/groups.json                | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/website/client/components/groups/publicGuildItem.vue b/website/client/components/groups/publicGuildItem.vue
index 7fa871feb7..0fb9d5244f 100644
--- a/website/client/components/groups/publicGuildItem.vue
+++ b/website/client/components/groups/publicGuildItem.vue
@@ -25,7 +25,7 @@ router-link.card-link(:to="{ name: 'guild', params: { groupId: guild._id } }")
               div.guild-bank(v-if='displayGemBank', v-once) {{$t('guildBank')}}
           .row
             category-tags.col-md-12(:categories="guild.categories", :owner="isOwner", v-once)
-              span.recommend-text(v-if='showSuggested(guild._id)') Suggested because you’re new to Habitica.
+              span.recommend-text(v-if='showSuggested(guild._id)')  {{$t('suggestedGroup')}}
 </template>
 
 <style lang="scss" scoped>
@@ -175,8 +175,9 @@ export default {
   methods: {
     showSuggested (guildId) {
       let habiticaHelpingGuildId = '5481ccf3-5d2d-48a9-a871-70a7380cee5a';
-      let createdAfterRedesign = moment(this.user.auth.timestamps.created).isAfter('2017-08-01');
-      return guildId === habiticaHelpingGuildId && createdAfterRedesign;
+      let sixtyDaysAgoFromNow = moment().subtract(60, 'days');
+      let isUserNew = moment(this.user.auth.timestamps.created).isAfter(sixtyDaysAgoFromNow);
+      return guildId === habiticaHelpingGuildId && isUserNew;
     },
     async join () {
       // @TODO: This needs to be in the notifications where users will now accept invites
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index cc06205b10..e88cbc0cc7 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -485,5 +485,6 @@
   "sharedCompletion": "Completion Conditon",
   "recurringCompletion": "None - Group task does not complete",
   "singleCompletion": "Single - Completes when any assigned user finishes",
-  "allAssignedCompletion": "All - Completes when all assigned users finish"
+  "allAssignedCompletion": "All - Completes when all assigned users finish",
+  "suggestedGroup": "Suggested because you’re new to Habitica."
 }