Skip to content

Commit a994f02

Browse files
committed
Update
1 parent 2834396 commit a994f02

File tree

3 files changed

+36
-6
lines changed

3 files changed

+36
-6
lines changed

src/app/message/message.component.html

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,22 @@
99
<mat-card-subtitle>{{ message.sender }}</mat-card-subtitle>
1010
</mat-card-header>
1111
<mat-card-content>
12-
@switch (message.type) { @case ("Text") {<span class="content">{{ message.text }}</span>} @case
13-
("File") {<span class="content">{{ message.fileName }}({{ message.fileSize | fileSize }})</span>
14-
@if (isImage) {
15-
<img [src]="imageUrl" alt="image" style="max-width: 100%">} } }<mat-divider></mat-divider>
12+
@switch (message.type) {
13+
@case ("Text") {
14+
@if (isUrl) {
15+
<p><a [href]="url" rel="noopener noreferrer" target="_blank">{{ url }}</a></p>
16+
} @else {
17+
<span class="content">{{ message.text }}</span>
18+
}
19+
}
20+
@case ("File") {
21+
<span class="content">{{ message.fileName }}({{ message.fileSize | fileSize }})</span>
22+
@if (isImage) {
23+
<img [src]="imageUrl" alt="image" style="max-width: 100%" />
24+
}
25+
}
26+
}
27+
<mat-divider></mat-divider>
1628
</mat-card-content>
1729
<mat-card-actions>
1830
@switch (message.type) { @case ("Text") {

src/app/message/message.component.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, Input, OnDestroy, OnInit } from "@angular/core";
1+
import {Component, Input, OnDestroy, OnInit, SecurityContext} from "@angular/core";
22
import { DatePipe } from "@angular/common";
33
import { FileSizePipe } from "../file-size.pipe";
44
import { MatCardModule } from "@angular/material/card";
@@ -12,7 +12,8 @@ import { NotificationService } from "../service/notification.service";
1212
import { Clipboard } from "@angular/cdk/clipboard";
1313
import { PeerService } from "../service/peer.service";
1414
import { FileMessage, Message, TextMessage } from "../message.model";
15-
import { download, error } from "../utils";
15+
import {download, error, isValidUrl} from "../utils";
16+
import {DomSanitizer} from "@angular/platform-browser";
1617

1718
@Component({
1819
selector: "app-message",
@@ -34,13 +35,17 @@ export class MessageComponent implements OnInit, OnDestroy {
3435
@Input()
3536
message!: Message;
3637

38+
isUrl = false;
39+
url: string | undefined;
40+
3741
isImage = false;
3842
imageUrl: string | undefined;
3943
readonly imagePattern = /^image\/.+$/;
4044

4145
constructor(
4246
private notificationService: NotificationService,
4347
private clipboard: Clipboard,
48+
private sanitizer: DomSanitizer,
4449
public peerService: PeerService,
4550
) {}
4651

@@ -64,6 +69,10 @@ export class MessageComponent implements OnInit, OnDestroy {
6469
this.isImage = true;
6570
this.imageUrl = URL.createObjectURL(blob);
6671
}
72+
if (this.message.type == "Text" && isValidUrl(this.message.text)) {
73+
this.isUrl = true;
74+
this.url = this.sanitizer.sanitize(SecurityContext.URL, this.message.text) || '';
75+
}
6776
}
6877

6978
ngOnDestroy(): void {

src/app/utils.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ export function blobToDataUrl(blob: Blob) {
4848
});
4949
}
5050

51+
export function isValidUrl(str: string): boolean {
52+
try {
53+
const url = new URL(str);
54+
return url.protocol === 'http:' || url.protocol === 'https:';
55+
} catch {
56+
return false;
57+
}
58+
}
59+
5160
export async function dataUrlToBlob(dataUrl: string) {
5261
let response = await fetch(dataUrl);
5362
return await response.blob();

0 commit comments

Comments
 (0)