From 8710b0267efae654f498ef3f9f5c4c0a512c2890 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Fri, 28 Aug 2020 20:54:09 -0400
Subject: [PATCH] better links, fix #309

---
 .../stream/status/card/card.component.html    |  2 +-
 .../databinded-text.component.ts              | 50 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/app/components/stream/status/card/card.component.html b/src/app/components/stream/status/card/card.component.html
index ee70ed1b..debd7fb0 100644
--- a/src/app/components/stream/status/card/card.component.html
+++ b/src/app/components/stream/status/card/card.component.html
@@ -1,5 +1,5 @@
 <div class="card-data" *ngIf="card.type === 'link' || card.type === 'video'">
-    <a *ngIf="card.type === 'link'" class="card-data__link" href="{{ card.url }}" target="_blank" title="{{ card.title }} &#10;{{ host }}">
+    <a *ngIf="card.type === 'link'" class="card-data__link" href="{{ card.url }}" target="_blank" rel="noopener noreferrer" title="{{ card.title }} &#10;{{ host }}">
         <img *ngIf="card.image" class="card-data__link--image" src="{{ card.image | ensureHttps }}" alt="" />
         <div *ngIf="!card.image" class="card-data__link--image">
             <fa-icon class="card-data__link--image--logo" [icon]="faFileAlt"></fa-icon>
diff --git a/src/app/components/stream/status/databinded-text/databinded-text.component.ts b/src/app/components/stream/status/databinded-text/databinded-text.component.ts
index c5958414..256c00df 100644
--- a/src/app/components/stream/status/databinded-text/databinded-text.component.ts
+++ b/src/app/components/stream/status/databinded-text/databinded-text.component.ts
@@ -12,7 +12,7 @@ export class DatabindedTextComponent implements OnInit {
 
     private accounts: string[] = [];
     private hashtags: string[] = [];
-    private links: string[] = [];
+    // private links: string[] = [];
 
     processedText: string;
     isCollapsed: boolean = false;
@@ -164,10 +164,12 @@ export class DatabindedTextComponent implements OnInit {
             }
         }
 
-        this.links.push(extractedUrl);
+        // this.links.push(extractedUrl);
         let classname = this.getClassNameForLink(extractedUrl);
 
-        this.processedText += `<a href class="${classname}" title="open link">${extractedName}</a>`;
+        let sanitizedLink = this.sanitizeLink(extractedUrl);
+
+        this.processedText += `<a href="${sanitizedLink}" class="${classname}" title="open link" target="_blank" rel="noopener noreferrer">${extractedName}</a>`;
         if (extractedLinkAndNext.length > 1) this.processedText += extractedLinkAndNext[1];
     }
 
@@ -209,32 +211,32 @@ export class DatabindedTextComponent implements OnInit {
             }
         }
 
-        for (const link of this.links) {
-            let classname = this.getClassNameForLink(link);
-            let els = this.contentElement.nativeElement.querySelectorAll(`.${classname}`);
+        // for (const link of this.links) {
+        //     let classname = this.getClassNameForLink(link);
+        //     let els = this.contentElement.nativeElement.querySelectorAll(`.${classname}`);
 
-            let sanitizedLink = this.sanitizeLink(link);
+        //     let sanitizedLink = this.sanitizeLink(link);
 
-            for (const el of els) {
-                this.renderer.listen(el, 'click', (event) => {
-                    event.preventDefault();
-                    event.stopImmediatePropagation();
+        //     for (const el of els) {
+        //         this.renderer.listen(el, 'click', (event) => {
+        //             event.preventDefault();
+        //             event.stopImmediatePropagation();
 
-                    window.open(sanitizedLink, '_blank');
-                    return false;
-                });
+        //             window.open(sanitizedLink, '_blank');
+        //             return false;
+        //         });
 
-                this.renderer.listen(el, 'mouseup', (event) => {
-                    if (event.which === 2) {
-                        event.preventDefault();
-                        event.stopImmediatePropagation();
+        //         this.renderer.listen(el, 'mouseup', (event) => {
+        //             if (event.which === 2) {
+        //                 event.preventDefault();
+        //                 event.stopImmediatePropagation();
 
-                        window.open(sanitizedLink, '_blank');
-                        return false;
-                    }
-                });
-            }
-        }
+        //                 window.open(sanitizedLink, '_blank');
+        //                 return false;
+        //             }
+        //         });
+        //     }
+        // }
     }
 
     private sanitizeLink(link: string): string {