Merge branch 'develop' into release

website/client/assets/scss/tiers.scss

@@ -1,41 +1,41 @@
 .tier1 {
-  color: #c42870 !important;
+  color: #c42870;
 }
 
 .tier2 {
-  color: #b01515 !important;
+  color: #b01515;
 }
 
 .tier3 {
-  color: #d70e14 !important;
+  color: #d70e14;
 }
 
 .tier4 {
-  color: #c24d00 !important;
+  color: #c24d00;
 }
 
 .tier5 {
-  color: #9e650f !important;
+  color: #9e650f;
 }
 
 .tier6 {
-  color: #2b8363 !important;
+  color: #2b8363;
 }
 
 .tier7 {
-  color: #167e87 !important;
+  color: #167e87;
 }
 
 .tier8 {
-  color: #277eab !important;
+  color: #277eab;
 }
 
 .tier9 {
-  color: #6133b4 !important;
+  color: #6133b4;
 }
 
 .tierNPC, .npc {
-  color: #77f4c7 !important;
+  color: #77f4c7;
   fill: #77f4c7;
   stroke: #005737;
 }

website/client/components/challenges/findChallenges.vue

@@ -21,13 +21,13 @@
     .row
       .col-12.col-md-6(v-for='challenge in filteredChallenges')
         challenge-item(:challenge='challenge')
-
+      mugen-scroll(
-    .row
+        :handler="infiniteScrollTrigger",
-      h2.col-12.loading(v-if='loading') {{ $t('loading') }}
+        :should-handle="!loading && canLoadMore",
-
+        :threshold="1",
-    .row
+        v-show="loading",
-      .col-12.text-center(v-if='showLoadMore && !loading && filteredChallenges.length > 0')
+      )
-        button.btn.btn-flat.btn-show-more(@click='loadMore()') {{ $t('loadMore') }}
+        h2.col-12.loading(v-once) {{ $t('loading') }}
 </template>
 
 <style lang='scss' scoped>
@@ -75,17 +75,22 @@ import challengeUtilities from 'client/mixins/challengeUtilities';
 
 import positiveIcon from 'assets/svg/positive.svg';
 
+import MugenScroll from 'vue-mugen-scroll';
+
+import debounce from 'lodash/debounce';
+
 export default {
   mixins: [challengeUtilities],
   components: {
     Sidebar,
     ChallengeItem,
     challengeModal,
+    MugenScroll,
   },
   data () {
     return {
       loading: true,
-      showLoadMore: true,
+      canLoadMore: true,
       icons: Object.freeze({
         positiveIcon,
       }),
@@ -169,17 +174,26 @@ export default {
       }
 
       // only show the load more Button if the max count was returned
-      this.showLoadMore = challenges.length === 10;
+      this.canLoadMore = challenges.length === 10;
 
       this.loading = false;
     },
     challengeCreated (challenge) {
       this.challenges.push(challenge);
     },
-    async loadMore () {
+    infiniteScrollTrigger () {
+      // show loading and wait until the loadMore debounced
+      // or else it would trigger on every scrolling-pixel (while not loading)
+      if (this.canLoadMore) {
+        this.loading = true;
+      }
+
+      this.loadMore();
+    },
+    loadMore: debounce(function loadMoreDebounce () {
       this.page += 1;
       this.loadChallenges();
-    },
+    }, 1000),
   },
 };
 </script>

website/client/components/challenges/myChallenges.vue

@@ -29,13 +29,13 @@
     .row
       .col-12.col-md-6(v-for='challenge in filteredChallenges')
         challenge-item(:challenge='challenge')
-
+      mugen-scroll(
-    .row
+        :handler="infiniteScrollTrigger",
-      h2.col-12.loading(v-if='loading') {{ $t('loading') }}
+        :should-handle="!loading && canLoadMore",
-
+        :threshold="1",
-    .row
+        v-show="loading",
-      .col-12.text-center(v-if='showLoadMore && !loading && filteredChallenges.length > 0')
+      )
-        button.btn.btn-flat.btn-show-more(@click='loadMore()') {{ $t('loadMore') }}
+        h2.col-12.loading(v-once) {{ $t('loading') }}
 </template>
 
 <style lang='scss' scoped>
@@ -88,6 +88,9 @@ import challengeUtilities from 'client/mixins/challengeUtilities';
 
 import challengeIcon from 'assets/svg/challenge.svg';
 import positiveIcon from 'assets/svg/positive.svg';
+import MugenScroll from 'vue-mugen-scroll';
+
+import debounce from 'lodash/debounce';
 
 export default {
   mixins: [challengeUtilities],
@@ -95,6 +98,7 @@ export default {
     Sidebar,
     ChallengeItem,
     challengeModal,
+    MugenScroll,
   },
   data () {
     return {
@@ -103,7 +107,7 @@ export default {
         positiveIcon,
       }),
       loading: false,
-      showLoadMore: true,
+      canLoadMore: true,
       challenges: [],
       sort: 'none',
       sortOptions: [
@@ -202,17 +206,26 @@ export default {
       }
 
       // only show the load more Button if the max count was returned
-      this.showLoadMore = challenges.length === 10;
+      this.canLoadMore = challenges.length === 10;
 
       this.loading = false;
     },
     challengeCreated (challenge) {
       this.challenges.push(challenge);
     },
-    async loadMore () {
+    infiniteScrollTrigger () {
+      // show loading and wait until the loadMore debounced
+      // or else it would trigger on every scrolling-pixel (while not loading)
+      if (this.canLoadMore) {
+        this.loading = true;
+      }
+
+      this.loadMore();
+    },
+    loadMore: debounce(function loadMoreDebounce () {
       this.page += 1;
       this.loadChallenges();
-    },
+    }, 1000),
   },
 };
 </script>

website/client/components/userLink.vue

@@ -11,7 +11,7 @@
 <style scoped lang="scss">
   @import '~client/assets/scss/colors.scss';
 
-  a {
+  a.no-tier {
     color: $gray-50;
   }
 

website/client/mixins/styleHelper.js

@@ -10,7 +10,8 @@ export default {
     userLevelStyleFromLevel (level, npc, style) {
       style = style || '';
       if (npc) style += ' npc';
-      if (level) style +=   ` tier${level}`;
+      style += level ? ` tier${level}` : ' no-tier';
+
       return style;
     },
   },

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

@@ -99,7 +99,7 @@ api.loginLocal = {
     let user = await User.findOne(login).exec();
 
     // if user is using social login, then user will not have a hashed_password stored
-    if (!user.auth.local.hashed_password) throw new NotAuthorized(res.t('invalidLoginCredentialsLong'));
+    if (!user || !user.auth.local.hashed_password) throw new NotAuthorized(res.t('invalidLoginCredentialsLong'));
 
     let isValidPassword;
 

website/server/libs/spells.js

@@ -11,7 +11,9 @@ import {
 } from '../models/group';
 import apiError from '../libs/apiError';
 
-const partyMembersFields = 'profile.name stats achievements items.special';
+const partyMembersFields = 'profile.name stats achievements items.special notifications flags';
+// Excluding notifications and flags from the list of public fields to return.
+const partyMembersPublicFields = 'profile.name stats achievements items.special';
 
 // @TODO: After refactoring individual spells, move quantity to the calculations
 
@@ -78,8 +80,7 @@ async function castPartySpell (req, party, partyMembers, user, spell, quantity =
         'party._id': party._id,
         _id: { $ne: user._id }, // add separately
       })
-      // .select(partyMembersFields) Selecting the entire user because otherwise when saving it'll save
+      .select(partyMembersFields)
-      // default values for non-selected fields and pre('save') will mess up thinking some values are missing
       .exec();
 
     partyMembers.unshift(user);
@@ -101,8 +102,7 @@ async function castUserSpell (res, req, party, partyMembers, targetId, user, spe
     if (!party) throw new NotFound(res.t('partyNotFound'));
     partyMembers = await User
       .findOne({_id: targetId, 'party._id': party._id})
-      // .select(partyMembersFields) Selecting the entire user because otherwise when saving it'll save
+      .select(partyMembersFields)
-      // default values for non-selected fields and pre('save') will mess up thinking some values are missing
       .exec();
   }
 
@@ -183,9 +183,9 @@ async function castSpell (req, res, {isV3 = false}) {
     let partyMembersRes = Array.isArray(partyMembers) ? partyMembers : [partyMembers];
 
     // Only return some fields.
-    // See comment above on why we can't just select the necessary fields when querying
+    // We can't just return the selected fields because they're private
     partyMembersRes = partyMembersRes.map(partyMember => {
-      return common.pickDeep(partyMember.toJSON(), common.$w(partyMembersFields));
+      return common.pickDeep(partyMember.toJSON(), common.$w(partyMembersPublicFields));
     });
 
     let userToJson = user;