diff --git a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js index a06f40bc4e..41d2156ecd 100644 --- a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js +++ b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js @@ -44,12 +44,12 @@ describe('POST /group/:groupId/join', () => { expect(res.leader.profile.name).to.eql(user.profile.name); }); - it('returns an error is user was already a member', async () => { + it('returns an error if user was already a member', async () => { await joiningUser.post(`/groups/${publicGuild._id}/join`); await expect(joiningUser.post(`/groups/${publicGuild._id}/join`)).to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', - message: t('userAlreadyInGroup'), + message: t('youAreAlreadyInGroup'), }); }); diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index 74a3d422b2..33a40875bd 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -228,6 +228,7 @@ "inviteMustNotBeEmpty": "Invite must not be empty.", "partyMustbePrivate": "Parties must be private", "userAlreadyInGroup": "UserID: <%= userId %>, User \"<%= username %>\" already in that group.", + "youAreAlreadyInGroup": "You are already a member of this group.", "cannotInviteSelfToGroup": "You cannot invite yourself to a group.", "userAlreadyInvitedToGroup": "UserID: <%= userId %>, User \"<%= username %>\" already invited to that group.", "userAlreadyPendingInvitation": "UserID: <%= userId %>, User \"<%= username %>\" already pending invitation.", diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js index 3a5bf907e2..64a5591c38 100644 --- a/website/server/controllers/api-v3/groups.js +++ b/website/server/controllers/api-v3/groups.js @@ -554,7 +554,7 @@ api.joinGroup = { if (isUserInvited && group.type === 'guild') { if (user.guilds.indexOf(group._id) !== -1) { // if user is already a member (party is checked previously) - throw new NotAuthorized(res.t('userAlreadyInGroup')); + throw new NotAuthorized(res.t('youAreAlreadyInGroup')); } user.guilds.push(group._id); // Add group to user's guilds if (!user.achievements.joinedGuild) {