From a466d20935a4627c84925eefafca7b6dc50784f5 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 11 Apr 2017 18:54:30 +0000 Subject: [PATCH] Revert "Unlimit parties (#8653)" This reverts commit a4feae4dbb69bf95d2ed2d747cdd1fcfa6c3d986. --- test/api/v3/integration/groups/POST-groups_invite.test.js | 2 +- website/common/script/constants.js | 2 +- website/views/options/social/group.jade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/api/v3/integration/groups/POST-groups_invite.test.js b/test/api/v3/integration/groups/POST-groups_invite.test.js index 6077581a13..ecaea4c74f 100644 --- a/test/api/v3/integration/groups/POST-groups_invite.test.js +++ b/test/api/v3/integration/groups/POST-groups_invite.test.js @@ -438,7 +438,7 @@ describe('Post /groups/:groupId/invite', () => { })).to.be.an('array'); }); - xit('does not allow 30+ members in a party', async () => { + it('does not allow 30+ members in a party', async () => { let invitesToGenerate = []; // Generate 30 users to invite (30 + leader = 31 members) for (let i = 0; i < PARTY_LIMIT_MEMBERS; i++) { diff --git a/website/common/script/constants.js b/website/common/script/constants.js index 52c5c4bb07..7381d2cf23 100644 --- a/website/common/script/constants.js +++ b/website/common/script/constants.js @@ -14,4 +14,4 @@ export const SUPPORTED_SOCIAL_NETWORKS = [ export const GUILDS_PER_PAGE = 30; // number of guilds to return per page when using pagination -export const PARTY_LIMIT_MEMBERS = 1000; +export const PARTY_LIMIT_MEMBERS = 30; diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index 7ab83ebce3..fc2e82398b 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -88,7 +88,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter =env.t('members') span(ng-if='group.type=="party" && (group.onlineUsers || group.onlineUsers == 0)')= ' (' + env.t('onlineCount', {count: "{{group.onlineUsers}}"}) + ')' button.pull-right.btn.btn-primary(ng-if='group.type=="party" ? (group.memberCount + group.invites.length < PARTY_LIMIT_MEMBERS) : true' ng-click="inviteOrStartParty(group)")=env.t("inviteFriends") - // .panel-heading(ng-if='group.type=="party"') + .panel-heading(ng-if='group.type=="party"') p=env.t('partyMembersInfo', {memberCount: "{{group.memberCount}}", invitationCount:"{{group.invites.length}}", limitMembers:"{{PARTY_LIMIT_MEMBERS}}"}) .panel-body.modal-fixed-height