Make regex ungreedy

akirk · akirk · commit 33d297636a0b · 2023-12-01T11:03:50.000+01:00
diff --git a/src/SlackGhost.ts b/src/SlackGhost.ts
@@ -314,7 +314,7 @@ export class SlackGhost {
     public prepareBody(body: string): string {
         // TODO: This is fixing plaintext mentions, but should be refactored.
         // See https://github.com/matrix-org/matrix-appservice-slack/issues/110
-        return body.replace(/<https:\/\/matrix\.to\/#\/@.+:.+\|(.+)>/g, "$1");
+        return body.replace(/<https:\/\/matrix\.to\/#\/@[^:]+:[^|]+\|([^>]+)>/g, "$1");
     }
 
     public prepareFormattedBody(body: string): string {

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ export class SlackGhost {`
`314`	`314`	`public prepareBody(body: string): string {`
`315`	`315`	`// TODO: This is fixing plaintext mentions, but should be refactored.`
`316`	`316`	`// See https://github.com/matrix-org/matrix-appservice-slack/issues/110`
`317`		`- return body.replace(/<https:\/\/matrix\.to\/#\/@.+:.+\\|(.+)>/g, "$1");`
	`317`	`+ return body.replace(/<https:\/\/matrix\.to\/#\/@[^:]+:[^\|]+\\|([^>]+)>/g, "$1");`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`public prepareFormattedBody(body: string): string {`