Merge pull request #7 from Team-Kaleidoscope/dev HEAD v0.2 main

Second Stage: Complete

1 files changed, 6 insertions, 1 deletions

diff --git a/src/app/components/post-attachment/post-attachment.component.ts b/src/app/components/post-attachment/post-attachment.component.ts
index 1d00def..1aeca37 100644
--- a/src/app/components/post-attachment/post-attachment.component.ts
+++ b/src/app/components/post-attachment/post-attachment.component.ts
@@ -18,7 +18,12 @@ export class PostAttachmentComponent implements OnInit {
   ngOnInit(): void {
     this.isImage = this.paramURL.includes('image') && !this.paramURL.endsWith('pdf');
     this.fileType = this.isImage ? 'img' : 'raw';
-    this.fileName = this.paramURL.match('(?<=\/)(?:.(?!\/))+$')?.pop() ?? 'Attachment';
+    if (this.fileType === 'img') {
+      this.fileName = this.paramURL.match(/(?!\/)+?[^\/]+?(?=\.)/g)?.pop() ?? 'Attachment';
+    }
+    else {
+      this.fileName = this.paramURL.match(/[^\/]+?$/g)?.pop() ?? 'Attachment';
+    }
   }
 
   toggleShowFull(): void {