From a579c2da6a8f62b3efa2c24aa4e5bc64d2ecdfd6 Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Tue, 18 Feb 2020 21:39:07 -0300 Subject: [PATCH] [FIX] Data converters overriding fields added by apps (#16639) --- app/apps/lib/misc/transformMappedData.js | 6 ++++-- app/lib/server/functions/sendMessage.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/apps/lib/misc/transformMappedData.js b/app/apps/lib/misc/transformMappedData.js index 0bba2c64608..61e57b0a53c 100644 --- a/app/apps/lib/misc/transformMappedData.js +++ b/app/apps/lib/misc/transformMappedData.js @@ -73,8 +73,10 @@ export const transformMappedData = (data, map) => { if (typeof result !== 'undefined') { transformedData[to] = result; } - } else if (typeof from === 'string' && typeof originalData[from] !== 'undefined') { - transformedData[to] = originalData[from]; + } else if (typeof from === 'string') { + if (typeof originalData[from] !== 'undefined') { + transformedData[to] = originalData[from]; + } delete originalData[from]; } }); diff --git a/app/lib/server/functions/sendMessage.js b/app/lib/server/functions/sendMessage.js index ea5ce3088d5..5b7d3c281c1 100644 --- a/app/lib/server/functions/sendMessage.js +++ b/app/lib/server/functions/sendMessage.js @@ -136,6 +136,7 @@ const validateMessage = (message) => { emoji: String, avatar: ValidPartialURLParam, attachments: [Match.Any], + blocks: [Match.Any], })); if (Array.isArray(message.attachments) && message.attachments.length) {