From 866ee4d565b3a6f88b2db0e0e699132b37375990 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 25 Nov 2022 08:36:29 +0100 Subject: [PATCH 1/3] fix(rocketchat): Replace invalid link characters --- back/models/chat.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/back/models/chat.js b/back/models/chat.js index 95a1e2c29..19f73ca4a 100644 --- a/back/models/chat.js +++ b/back/models/chat.js @@ -4,4 +4,21 @@ module.exports = Self => { require('../methods/chat/sendCheckingPresence')(Self); require('../methods/chat/notifyIssues')(Self); require('../methods/chat/sendQueued')(Self); + + Self.observe('before save', async function(ctx) { + if (!ctx.isNewInstance) return; + + let {message} = ctx.instance; + if (!message) return; + + const parts = message.match(/(?<=\[)[A-Za-z0-9()*\s]*(?=])/g) || []; + const replacedParts = parts.map(part => { + return part.replace(/[*()]/g, ''); + }); + + for (const [index, part] of parts.entries()) + message = message.replace(part, replacedParts[index]); + + ctx.instance.message = message; + }); }; From db64ba48fc21ff4939b6f895dd67a56c70949ab2 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 25 Nov 2022 08:45:26 +0100 Subject: [PATCH 2/3] fix(rocketchat): Removed parenthesis --- back/methods/chat/notifyIssues.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/back/methods/chat/notifyIssues.js b/back/methods/chat/notifyIssues.js index 902ee59cd..3c4706d07 100644 --- a/back/methods/chat/notifyIssues.js +++ b/back/methods/chat/notifyIssues.js @@ -32,7 +32,7 @@ module.exports = Self => { let message = $t(`There's a new urgent ticket:`); const ostUri = 'https://cau.verdnatura.es/scp/tickets.php?id='; tickets.forEach(ticket => { - message += `\r\n[ID: *${ticket.number}* - ${ticket.subject} (@${ticket.username})](${ostUri + ticket.id})`; + message += `\r\n[ID: *${ticket.number}* - ${ticket.subject} @${ticket.username}](${ostUri + ticket.id})`; }); const department = await models.Department.findOne({ @@ -42,7 +42,5 @@ module.exports = Self => { if (channelName) return Self.send(ctx, `#${channelName}`, `@all ➔ ${message}`); - - return; }; }; From 7ea4d9c2e18df2b64326d138837a33f7a9543b37 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 25 Nov 2022 09:18:21 +0100 Subject: [PATCH 3/3] fix(rocketchat): Regex fix --- back/models/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/models/chat.js b/back/models/chat.js index 19f73ca4a..f45d15180 100644 --- a/back/models/chat.js +++ b/back/models/chat.js @@ -11,7 +11,7 @@ module.exports = Self => { let {message} = ctx.instance; if (!message) return; - const parts = message.match(/(?<=\[)[A-Za-z0-9()*\s]*(?=])/g) || []; + const parts = message.match(/(?<=\[).*(?=])/g); const replacedParts = parts.map(part => { return part.replace(/[*()]/g, ''); });