From 104d888bfb116e2225619a67f2b75a1e3e2e04df Mon Sep 17 00:00:00 2001 From: osiris Date: Sun, 15 Dec 2019 19:18:16 +0800 Subject: [PATCH] Fix incorrect error when sending private messages (PMs) to a player you have blocked #11612 Introduce a new error type blockedToSendToThisUser for the cases where you have blocked a player from sending private messages to you, if you try to message them or if you try to transfer gems to them, you will see the error "You can't send to this player because you have block this player." --- .../v3/integration/members/POST-send_private_message.test.js | 2 +- test/api/v3/integration/members/POST-transfer_gems.test.js | 2 +- website/common/locales/en/groups.json | 1 + website/server/models/user/methods.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/api/v3/integration/members/POST-send_private_message.test.js b/test/api/v3/integration/members/POST-send_private_message.test.js index eed6386c15..a66c682286 100644 --- a/test/api/v3/integration/members/POST-send_private_message.test.js +++ b/test/api/v3/integration/members/POST-send_private_message.test.js @@ -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'), }); }); diff --git a/test/api/v3/integration/members/POST-transfer_gems.test.js b/test/api/v3/integration/members/POST-transfer_gems.test.js index 88c6446097..10b14f7dfe 100644 --- a/test/api/v3/integration/members/POST-transfer_gems.test.js +++ b/test/api/v3/integration/members/POST-transfer_gems.test.js @@ -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'), }); }); diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index 637a7fbb8a..103d22009c 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -151,6 +151,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.", diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js index 11775ee37f..e8b37f4e7d 100644 --- a/website/server/models/user/methods.js +++ b/website/server/models/user/methods.js @@ -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': [