krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 06:07:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: you are already in group message - fixes #10119 (#10122)

Browse Source 
* add youAreAlreadyInGroup message

* add test for youAreAlreadyInGroup message

* update youAreAlreadyInGroup message
This commit is contained in:
Mark Kuba
2018-03-17 14:21:16 -07:00
committed by Matteo Pagliazzi
parent 767f3ebe12
commit 301668fe22
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api/v3/integration/groups/POST-groups_groupId_join.test.js
View File

@@ -44,12 +44,12 @@ describe('POST /group/:groupId/join', () => {
expect(res.leader.profile.name).to.eql(user.profile.name); 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 joiningUser.post(`/groups/${publicGuild._id}/join`);
await expect(joiningUser.post(`/groups/${publicGuild._id}/join`)).to.eventually.be.rejected.and.eql({ await expect(joiningUser.post(`/groups/${publicGuild._id}/join`)).to.eventually.be.rejected.and.eql({
code: 401, code: 401,
error: 'NotAuthorized', error: 'NotAuthorized',
message: t('userAlreadyInGroup'), message: t('youAreAlreadyInGroup'),
}); });
}); });

1
website/common/locales/en/groups.json
View File

@@ -228,6 +228,7 @@
"inviteMustNotBeEmpty": "Invite must not be empty.", "inviteMustNotBeEmpty": "Invite must not be empty.",
"partyMustbePrivate": "Parties must be private", "partyMustbePrivate": "Parties must be private",
"userAlreadyInGroup": "UserID: <%= userId %>, User \"<%= username %>\" already in that group.", "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.", "cannotInviteSelfToGroup": "You cannot invite yourself to a group.",
"userAlreadyInvitedToGroup": "UserID: <%= userId %>, User \"<%= username %>\" already invited to that group.", "userAlreadyInvitedToGroup": "UserID: <%= userId %>, User \"<%= username %>\" already invited to that group.",
"userAlreadyPendingInvitation": "UserID: <%= userId %>, User \"<%= username %>\" already pending invitation.", "userAlreadyPendingInvitation": "UserID: <%= userId %>, User \"<%= username %>\" already pending invitation.",

2
website/server/controllers/api-v3/groups.js
View File

@@ -554,7 +554,7 @@ api.joinGroup = {
if (isUserInvited && group.type === 'guild') { if (isUserInvited && group.type === 'guild') {
if (user.guilds.indexOf(group._id) !== -1) { // if user is already a member (party is checked previously) 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 user.guilds.push(group._id); // Add group to user's guilds
if (!user.achievements.joinedGuild) { if (!user.achievements.joinedGuild) {