better link parsing in pleroma

NicolasConstant · May 25, 2019 · 0418ee6 · 0418ee6
1 parent 9b129ae
commit 0418ee6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/app/components/stream/status/databinded-text/databinded-text.component.spec.ts b/src/app/components/stream/status/databinded-text/databinded-text.component.spec.ts
@@ -148,5 +148,12 @@ describe('DatabindedTextComponent', () => {
 
         component.text = sample;
         expect(component.processedText).toContain('<p>Bla <a href class="link-httpscloudblogsmicrosoftcomopensource20190521servicemeshinterfacesmirelease" title="open link">cloudblogs.microsoft.com/opens</a></p>'); 
-    })
+    });
+
+    it('should parse link 2 - Pleroma', () => {
+        const sample = `Bla<br /><br /><a href="https://link/">https://link/</a>`;
+
+        component.text = sample;
+        expect(component.processedText).toContain('Bla<br /><br /><a href class="link-httpslink" title="open link">https://link/</a>'); 
+    });
 });
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
@@ -48,26 +48,26 @@ export class DatabindedTextComponent implements OnInit {
                     this.processHashtag(section);
                 }
                 catch (err) {
-                    console.warn('process hashtag');
-                    console.warn(value);
+                    console.error('error processing hashtag');
+                    console.error(value);
                 }
 
             } else if (section.includes('class="u-url mention"') || section.includes('class="mention"') || section.includes('class="mention status-link"') || section.includes('class="h-card mention')) {
                 try {
                     this.processUser(section);
                 }
                 catch (err) {
-                    console.warn('process mention');
-                    console.warn(value);
+                    console.error('error processing mention');
+                    console.error(value);
                 }
             } else {
                 try {
                     this.processLink(section);
                     //this.processedText += `<a ${section}`;
                 }
                 catch (err) {
-                    console.warn('process link');
-                    console.warn(value);
+                    console.error('error processing link');
+                    console.error(value);
                 }
             }
         }
@@ -133,7 +133,11 @@ export class DatabindedTextComponent implements OnInit {
                 try {
                     extractedName = extractedLinkAndNext[0].split(' target="_blank">')[1].split('</span>')[0];
                 } catch (err) { // Pleroma
-                    extractedName = extractedLinkAndNext[0].split('</span><span>')[1].split('</span>')[0];
+                    try {
+                        extractedName = extractedLinkAndNext[0].split('</span><span>')[1].split('</span>')[0];
+                    } catch (err) {
+                        extractedName = extractedLinkAndNext[0].split('">')[1];
+                    }
                 }
             }
         }