Skip to content

Commit a2d0b28

Browse files
authored
Fix mattermost message escaping (#689)
1 parent 2094417 commit a2d0b28

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

packages/api/lib/controllers/boxesController.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,15 @@ const postNewBox = async function postNewBox (req, res, next) {
411411
newBox = await Box.populate(newBox, Box.BOX_SUB_PROPS_FOR_POPULATION);
412412
res.send(201, { message: 'Box successfully created', data: newBox });
413413
clearCache(['getBoxes', 'getStats']);
414-
postToMattermost(`New Box: ${req.user.name} (${redactEmail(req.user.email)}) just registered "${newBox.name}" (${newBox.model}): <https://opensensemap.org/explore/${newBox._id}|link>`);
414+
postToMattermost(
415+
`New Box: ${req.user.name} (${redactEmail(
416+
req.user.email
417+
)}) just registered "${newBox.name}" (${
418+
newBox.model
419+
}): [https://opensensemap.org/explore/${
420+
newBox._id
421+
}](https://opensensemap.org/explore/${newBox._id})`
422+
);
415423
} catch (err) {
416424
handleError(err, next);
417425
}

packages/api/lib/controllers/managementController.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ const updateBox = async function updateBox (req, res, next) {
111111
const user = await User.findUserOfBox(boxId);
112112
box.owner = user.toJSON({ includeSecrets: true });
113113

114-
postToMattermost(`Management Action: Box updated: ${req.user.name} (${req.user.email}) just updated "${box.name}" (${box.model}): <https://opensensemap.org/explore/${box._id}|link>`);
114+
postToMattermost(
115+
`Management Action: Box updated: ${req.user.name} (${req.user.email}) just updated "${box.name}" (${box.model}): [https://opensensemap.org/explore/${box._id}](https://opensensemap.org/explore/${box._id})`
116+
);
115117
res.send({ code: 'Ok', data: box });
116118
clearCache(['getBoxes']);
117119
} catch (err) {

packages/api/lib/helpers/escapeMarkdown.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
const replacements = [
44
[/\*/g, '\\*', 'asterisks'],
55
[/#/g, '\\#', 'number signs'],
6-
[/\//g, '\\/', 'slashes'],
7-
[/\(/g, '\\(', 'parentheses'],
8-
[/\)/g, '\\)', 'parentheses'],
9-
[/\[/g, '\\[', 'square brackets'],
10-
[/\]/g, '\\]', 'square brackets'],
6+
// [/\//g, '\\/', 'slashes'],
7+
// [/\(/g, '\\(', 'parentheses'],
8+
// [/\)/g, '\\)', 'parentheses'],
9+
// [/\[/g, '\\[', 'square brackets'],
10+
// [/\]/g, '\\]', 'square brackets'],
1111
[/</g, '&lt;', 'angle brackets'],
1212
[/>/g, '&gt;', 'angle brackets'],
1313
[/_/g, '\\_', 'underscores'],

0 commit comments

Comments
 (0)