Skip to content

Fix swallowed text between 2 mentions #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix swallowed text between 2 mentions #772

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33d2976
Make regex ungreedy
akirk Dec 1, 2023
6ca4536
Add changelog entry
akirk Dec 1, 2023
cdf27ac
Add full stop, props @ashfame
akirk Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/772.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix swallowed text between 2 mentions
Copy link

@ashfame ashfame Dec 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akirk This line needs to end with a '.' or '!' as per tests.

Copy link
Author

@akirk akirk Dec 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, added !

2 changes: 1 addition & 1 deletion src/SlackGhost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down