Skip to content

fix: imrpoved url regexp was failing on iOS 16.4 and older #612 #683

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

Merged
merged 1 commit into from
Jan 20, 2025
Merged

fix: imrpoved url regexp was failing on iOS 16.4 and older #612 #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions projects/stream-chat-angular/src/lib/message-text/message-text.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,23 @@ export class MessageTextComponent implements OnChanges {
messageTextParts: MessagePart[] | undefined = [];
messageText?: string;
displayAs: 'text' | 'html';
private readonly urlRegexp =
/(?:(?:https?|ftp|file):\/\/|www\.|ftp\.|(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,})(?![^\s]*@[^\s]*)(?:[^\s()<>]+|\([\w\d]+\))*(?<!@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/gim;
private readonly urlRegexp: RegExp;
private emojiRegexp = new RegExp(emojiRegex(), 'g');

constructor(
private messageService: MessageService,
readonly customTemplatesService: CustomTemplatesService
) {
this.displayAs = this.messageService.displayAs;
try {
this.urlRegexp = new RegExp(
'(?:(?:https?|ftp|file):\\/\\/|www\\.|ftp\\.|(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,})(?![^\\s]*@[^\\s]*)(?:[^\\s()<>]+|\\([\\w\\d]+\\))*(?<!@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,})',
'gim'
);
} catch {
this.urlRegexp =
/(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#/%=~_|$?!:,.]*\)|[A-Z0-9+&@#/%=~_|$])/gim;
}
}

ngOnChanges(changes: SimpleChanges): void {
Expand Down
Loading