WIP(chat): first pass deprecation

website/client/src/components/achievements/testing.vue

@@ -1,60 +0,0 @@
-<template>
-  <b-modal
-    id="testing"
-    :title="$t('guildReminderTitle')"
-    size="lg"
-    :hide-footer="true"
-  >
-    <div class="modal-body text-center">
-      <br>
-      <div class="scene_guilds"></div>
-      <br>
-      <h4>{{ $t('guildReminderText1') }}</h4>
-    </div>
-    <div class="modal-footer">
-      <div class="container-fluid">
-        <div class="row">
-          <div class="col-6 text-center">
-            <button
-              class="btn btn-secondary"
-              @click="close()"
-            >
-              {{ $t('guildReminderDismiss') }}
-            </button>
-          </div>
-          <div
-            class="col-6 text-center"
-            @click="close()"
-          >
-            <div
-              class="btn btn-primary"
-              @click="takeMethere()"
-            >
-              {{ $t('guildReminderCTA') }}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </b-modal>
-</template>
-
-<style scoped>
-  .scene_guilds {
-    margin: 0 auto;
-  }
-</style>
-
-<script>
-export default {
-  methods: {
-    close () {
-      this.$root.$emit('bv::hide::modal', 'testing');
-    },
-    takeMethere () {
-      this.$router.push('/groups/discovery');
-      this.close();
-    },
-  },
-};
-</script>

website/client/src/components/achievements/testingletiant.vue

@@ -1,58 +0,0 @@
-<template>
-  <b-modal
-    id="testingletiant"
-    :title="$t('guildReminderTitle')"
-    size="lg"
-    :hide-footer="true"
-  >
-    <div class="modal-content"></div>
-    <div class="modal-body text-center">
-      <br>
-      <div class="scene_guilds"></div>
-      <br>
-      <h4>{{ $t('guildReminderText2') }}</h4>
-    </div>
-    <div class="modal-footer">
-      <div class="container-fluid">
-        <div class="row">
-          <div class="col-6 text-center">
-            <button
-              class="btn btn-secondary"
-              @click="close()"
-            >
-              {{ $t('guildReminderDismiss') }}
-            </button>
-          </div>
-          <div class="col-6 text-center">
-            <div
-              class="btn btn-primary"
-              @click="takeMethere()"
-            >
-              {{ $t('guildReminderCTA') }}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </b-modal>
-</template>
-
-<style scoped>
-  .scene_guilds {
-    margin: 0 auto;
-  }
-</style>
-
-<script>
-export default {
-  methods: {
-    close () {
-      this.$root.$emit('bv::hide::modal', 'testingletiant');
-    },
-    takeMethere () {
-      this.$router.push('/groups/discovery');
-      this.close();
-    },
-  },
-};
-</script>

website/client/src/components/chat/copyAsTodoModal.vue

@@ -50,7 +50,6 @@ import notificationsMixin from '@/mixins/notifications';
 import Task from '@/components/tasks/task';
 
 import taskDefaults from '@/../../common/script/libs/taskDefaults';
-import { TAVERN_ID } from '@/../../common/script/constants';
 
 const baseUrl = 'https://habitica.com';
 
@@ -89,9 +88,7 @@ export default {
       createTask: 'tasks:create',
     }),
     groupPath () {
-      if (this.groupId === TAVERN_ID) {
-        return `${baseUrl}/groups/tavern`;
-      } if (this.groupType === 'party') {
+      if (this.groupType === 'party') {
         return `${baseUrl}/party`;
       }
       return `${baseUrl}/groups/guild/${this.groupId}`;

website/client/src/components/header/menu.vue

@@ -194,48 +194,6 @@
           >
             {{ $t('party') }}
           </b-nav-item>
-          <li
-            class="topbar-item droppable"
-            :class="{
-              'active': $route.path.startsWith('/groups')}"
-          >
-            <div
-              class="chevron rotate"
-              @click="dropdownMobile($event)"
-            >
-              <div
-                v-once
-                class="chevron-icon-down"
-                v-html="icons.chevronDown"
-              ></div>
-            </div>
-            <router-link
-              class="nav-link"
-              :to="{name: 'tavern'}"
-            >
-              {{ $t('guilds') }}
-            </router-link>
-            <div class="topbar-dropdown">
-              <router-link
-                class="topbar-dropdown-item dropdown-item"
-                :to="{name: 'tavern'}"
-              >
-                {{ $t('tavern') }}
-              </router-link>
-              <router-link
-                class="topbar-dropdown-item dropdown-item"
-                :to="{name: 'myGuilds'}"
-              >
-                {{ $t('myGuilds') }}
-              </router-link>
-              <router-link
-                class="topbar-dropdown-item dropdown-item"
-                :to="{name: 'guildsDiscovery'}"
-              >
-                {{ $t('guildsDiscovery') }}
-              </router-link>
-            </div>
-          </li>
           <li
             class="topbar-item droppable"
             :class="{
@@ -365,11 +323,6 @@
                 href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link"
                 target="_blank"
               >{{ $t('requestFeature') }}</a>
-              <a
-                class="topbar-dropdown-item dropdown-item"
-                href="https://habitica.fandom.com/wiki/Contributing_to_Habitica"
-                target="_blank"
-              >{{ $t('contributing') }}</a>
               <a
                 class="topbar-dropdown-item dropdown-item"
                 href="https://habitica.fandom.com/wiki/Habitica_Wiki"

website/client/src/components/notifications.vue

@@ -11,8 +11,6 @@
     <low-health />
     <level-up />
     <choose-class />
-    <testing />
-    <testingletiant />
     <rebirth-enabled />
     <contributor />
     <won-challenge />
@@ -127,8 +125,6 @@ import chooseClass from './achievements/chooseClass';
 import armoireEmpty from './achievements/armoireEmpty';
 import questCompleted from './achievements/questCompleted';
 import questInvitation from './achievements/questInvitation';
-import testing from './achievements/testing';
-import testingletiant from './achievements/testingletiant';
 import rebirthEnabled from './achievements/rebirthEnabled';
 import contributor from './achievements/contributor';
 import invitedFriend from './achievements/invitedFriend';
@@ -269,8 +265,6 @@ export default {
     armoireEmpty,
     questCompleted,
     questInvitation,
-    testing,
-    testingletiant,
     rebirthEnabled,
     contributor,
     loginIncentives,
@@ -300,7 +294,6 @@ export default {
       // general notifications
       'CRON',
       'FIRST_DROPS',
-      'GUILD_PROMPT',
       'LOGIN_INCENTIVE',
       'NEW_CONTRIBUTOR_LEVEL',
       'ONBOARDING_COMPLETE',
@@ -705,14 +698,6 @@ export default {
               this.$root.$emit('bv::show::modal', 'first-drops');
             }
             break;
-          case 'GUILD_PROMPT':
-            // @TODO: I'm pretty sure we can find better names for these
-            if (notification.data.textletiant === -1) {
-              this.$root.$emit('bv::show::modal', 'testing');
-            } else {
-              this.$root.$emit('bv::show::modal', 'testingletiant');
-            }
-            break;
           case 'REBIRTH_ENABLED':
             this.$root.$emit('bv::show::modal', 'rebirth-enabled');
             break;

website/client/src/components/static/features.vue

@@ -31,7 +31,6 @@
     </div>
     <div class="row">
       <div class="col-md-6">
-        <img src="~@/assets/images/marketing/guild.png">
         <h2>{{ $t('marketing2Lead1Title') }}</h2>
         <p>{{ $t('marketing2Lead1') }}</p>
         <img src="~@/assets/images/marketing/vice3.png">

website/common/locales/en/front.json

@@ -33,7 +33,7 @@
   "marketing1Lead2": "Improve your habits to build up your avatar. Show off the sweet gear you've earned!",
   "marketing1Lead3Title": "Find Random Prizes",
   "marketing1Lead3": "For some, it's the gamble that motivates them: a system called \"stochastic rewards.\" Habitica accommodates all reinforcement and punishment styles: positive, negative, predictable, and random.",
-  "marketing2Header": "Compete With Friends, Join Interest Groups",
+  "marketing2Header": "Compete with Friends",
   "marketing2Lead1Title": "Social Productivity",
   "marketing2Lead1": "While you can play Habitica solo, the lights really turn on when you start collaborating, competing, and holding each other accountable. The most effective part of any self-improvement program is social accountability, and what better an environment for accountability and competition than a video game?",
   "marketing2Lead2Title": "Fight Monsters",

website/common/locales/en/groups.json

@@ -251,7 +251,7 @@
   "fetchRecentMessages": "Fetch Recent Messages",
   "like": "Like",
   "liked": "Liked",
-  "inviteToGuild": "Invite to Guild",
+  "inviteToGuild": "Invite to Group",
   "inviteToParty": "Invite to Party",
   "inviteEmailUsername": "Invite via Email or Username",
   "inviteEmailUsernameInfo": "Invite users via a valid email or username. If an email isn't registered yet, we'll invite them to join.",

website/common/locales/en/messages.json

@@ -59,5 +59,6 @@
   "messageMissingDisplayName": "Missing display name.",
   "reportedMessage": "You have reported this message to moderators.",
   "canDeleteNow": "You can now delete the message if you wish.",
-  "newsPostNotFound": "News Post not found or you don't have access."
+  "newsPostNotFound": "News Post not found or you don't have access.",
+  "featureRetired": "This feature is no longer supported."
 }

website/common/script/libs/achievements.js

@@ -182,7 +182,6 @@ function _getBasicAchievements (user, language) {
 
   _addSimple(result, user, { path: 'partyUp', language });
   _addSimple(result, user, { path: 'partyOn', language });
-  _addSimple(result, user, { path: 'joinedGuild', language });
   _addSimple(result, user, { path: 'royallyLoyal', language });
   _addSimple(result, user, { path: 'joinedChallenge', language });
   _addSimple(result, user, { path: 'invitedFriend', language });
@@ -352,6 +351,10 @@ function _getSpecialAchievements (user, language) {
     _addSimple(result, user, { path: 'groupsBeta2022', language });
   }
 
+  if (user.achievements.joinedGuild) {
+    _addSimple(result, user, { path: 'joinedGuild', language });
+  }
+
   return result;
 }
 

website/server/controllers/api-v3/chat.js

@@ -130,6 +130,10 @@ api.postChat = {
 
     const group = await Group.getGroup({ user, groupId });
 
+    if (group.type !== 'party' && !(group.purchased && group.purchased.plan.customerId)) {
+      throw new BadRequest(res.t('featureRetired'));
+    }
+
     // Check message for banned slurs
     if (group && group.privacy !== 'private' && textContainsBannedSlur(req.body.message)) {
       const { message } = req.body;