From b2d98a007b8f5db685c9d956676000662969e56a Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Fri, 13 Sep 2019 11:50:18 +0300 Subject: [PATCH] special forward settings for relays --- lib/filter-handler.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/filter-handler.js b/lib/filter-handler.js index 949cdf82..6861527b 100644 --- a/lib/filter-handler.js +++ b/lib/filter-handler.js @@ -321,13 +321,23 @@ class FilterHandler { if (!filterActions.get('delete')) { // forward to default recipient only if the message is not deleted if (userData.targets && userData.targets.length) { - userData.targets.forEach(target => { - forwardTargets.set(target.value, target); + userData.targets.forEach(targetData => { + let key = targetData.value; + if (targetData.type === 'relay') { + targetData.recipient = userData.address; + key = `${targetData.recipient}:${targetData.value}`; + } + forwardTargets.set(key, targetData); }); } else if (options.targets && options.targets.length) { // if user had no special targets, then use default ones provided by options - options.targets.forEach(target => { - forwardTargets.set(target.value, target); + options.targets.forEach(targetData => { + let key = targetData.value; + if (targetData.type === 'relay') { + targetData.recipient = userData.address; + key = `${targetData.recipient}:${targetData.value}`; + } + forwardTargets.set(key, targetData); }); } }