diff --git a/test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js b/test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js index 940d660232..be9086d74f 100644 --- a/test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js +++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js @@ -100,7 +100,7 @@ describe('POST /groups/:groupId/quests/accept', () => { .to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', - message: t('questAlreadyUnderway'), + message: t('questAlreadyStartedFriendly'), }); }); }); diff --git a/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js b/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js index 0eb4745f1c..2769b6c00f 100644 --- a/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js +++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js @@ -73,7 +73,7 @@ describe('POST /groups/:groupId/quests/force-start', () => { .to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', - message: t('questAlreadyUnderway'), + message: t('questAlreadyStarted'), }); }); diff --git a/test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js b/test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js index c36df1e6dc..4f897d2b2b 100644 --- a/test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js +++ b/test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js @@ -121,7 +121,7 @@ describe('POST /groups/:groupId/quests/reject', () => { .to.eventually.be.rejected.and.eql({ code: 401, error: 'NotAuthorized', - message: t('questAlreadyUnderway'), + message: t('questAlreadyStartedFriendly'), }); }); }); diff --git a/website/common/locales/en/quests.json b/website/common/locales/en/quests.json index e863a9750d..0c38a54683 100644 --- a/website/common/locales/en/quests.json +++ b/website/common/locales/en/quests.json @@ -102,6 +102,8 @@ "questNotGemPurchasable": "Quest \"<%= key %>\" is not a Gem-purchasable quest.", "questLevelTooHigh": "You must be level <%= level %> to begin this quest.", "questAlreadyUnderway": "Your party is already on a quest. Try again when the current quest has ended.", + "questAlreadyStarted": "The quest has already started.", + "questAlreadyStartedFriendly": "The quest has already started, but you can always catch the next one!", "questAlreadyAccepted": "You already accepted the quest invitation.", "noActiveQuestToLeave": "No active quest to leave", "questLeaderCannotLeaveQuest": "Quest leader cannot leave quest", diff --git a/website/server/controllers/api-v3/quests.js b/website/server/controllers/api-v3/quests.js index 2ac5f81485..bdf567ce41 100644 --- a/website/server/controllers/api-v3/quests.js +++ b/website/server/controllers/api-v3/quests.js @@ -190,7 +190,7 @@ api.acceptQuest = { if (!group) throw new NotFound(res.t('groupNotFound')); if (group.type !== 'party') throw new NotAuthorized(res.t('guildQuestsNotSupported')); if (!group.quest.key) throw new NotFound(res.t('questInviteNotFound')); - if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyUnderway')); + if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyStartedFriendly')); if (group.quest.members[user._id]) throw new BadRequest(res.t('questAlreadyAccepted')); user.party.quest.RSVPNeeded = false; @@ -248,7 +248,7 @@ api.rejectQuest = { if (!group) throw new NotFound(res.t('groupNotFound')); if (group.type !== 'party') throw new NotAuthorized(res.t('guildQuestsNotSupported')); if (!group.quest.key) throw new NotFound(res.t('questInvitationDoesNotExist')); - if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyUnderway')); + if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyStartedFriendly')); if (group.quest.members[user._id]) throw new BadRequest(res.t('questAlreadyAccepted')); if (group.quest.members[user._id] === false) throw new BadRequest(res.t('questAlreadyRejected')); @@ -312,7 +312,7 @@ api.forceStart = { if (!group) throw new NotFound(res.t('groupNotFound')); if (group.type !== 'party') throw new NotAuthorized(res.t('guildQuestsNotSupported')); if (!group.quest.key) throw new NotFound(res.t('questNotPending')); - if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyUnderway')); + if (group.quest.active) throw new NotAuthorized(res.t('questAlreadyStarted')); if (!(user._id === group.quest.leader || user._id === group.leader)) { throw new NotAuthorized(res.t('questOrGroupLeaderOnlyStartQuest')); }