sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-08 13:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11636 from tsukimi2/bugfix-send-pmsg

Browse source 
Fix incorrect error when sending private messages to a player you have blocked (fixes #11612)
This commit is contained in:
Matteo Pagliazzi 2020-01-14 13:24:05 +01:00 committed by GitHub
commit 9510b2345c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/api/v3/integration/members/POST-send_private_message.test.js
View file

@ -66,7 +66,7 @@ describe('POST /members/send-private-message', () => {
})).to.eventually.be.rejected.and.eql({
code: 401,
error: 'NotAuthorized',
message: t('notAuthorizedToSendMessageToThisUser'),
message: t('blockedToSendToThisUser'),
});
});

2
test/api/v3/integration/members/POST-transfer_gems.test.js
View file

@ -89,7 +89,7 @@ describe('POST /members/transfer-gems', () => {
})).to.eventually.be.rejected.and.eql({
code: 401,
error: 'NotAuthorized',
message: t('notAuthorizedToSendMessageToThisUser'),
message: t('blockedToSendToThisUser'),
});
});

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

@ -152,6 +152,7 @@
"toUserIDRequired": "A User ID is required",
"gemAmountRequired": "A number of gems is required",
"notAuthorizedToSendMessageToThisUser": "You can't send a message to this player because they have chosen to block messages.",
"blockedToSendToThisUser": "You can't send to this player because you have blocked this player.",
"privateMessageGiftGemsMessage": "Hello <%= receiverName %>, <%= senderName %> has sent you <%= gemAmount %> gems!",
"privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription! ",
"cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.",

2
website/server/models/user/methods.js
View file

@ -61,7 +61,7 @@ const INTERACTION_CHECKS = Object.freeze({
// Direct user blocks prevent all interactions
(sndr, rcvr) => rcvr.inbox.blocks.includes(sndr._id) && 'notAuthorizedToSendMessageToThisUser',
(sndr, rcvr) => sndr.inbox.blocks.includes(rcvr._id) && 'notAuthorizedToSendMessageToThisUser',
(sndr, rcvr) => sndr.inbox.blocks.includes(rcvr._id) && 'blockedToSendToThisUser',
],
'send-private-message': [