Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

better pleroma mention and link parsing

This commit is contained in:
Nicolas Constant 2019-05-24 00:46:26 -04:00
parent 34bdd12029
commit 5ffd54470e
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/components/stream/status/databinded-text/databinded-text.component.spec.ts
View File

@ -3,6 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { DatabindedTextComponent } from './databinded-text.component';
import { By } from '@angular/platform-browser';
import { isGeneratedFile } from '@angular/compiler/src/aot/util';
import { tick } from '@angular/core/src/render3';
describe('DatabindedTextComponent', () => {
let component: DatabindedTextComponent;
@ -134,4 +135,18 @@ describe('DatabindedTextComponent', () => {
component.text = sample;
expect(component.processedText).toContain('<p><a href class="account--sengi_app-mastodon-social-mastodon-social" title="@sengi_app@mastodon.social@mastodon.social">@sengi_app@mastodon.social</a><span> Blabla</span></p>'); //FIXME: dont let domain appear in name
});
it('should parse hastag - Pleroma', () => {
const sample = `<p>Bla <a href="https://ubuntu.social/tags/kubecon" rel="tag">#<span>KubeCon</span></a> Bla</p>`;
component.text = sample;
expect(component.processedText).toContain('<p>Bla <a href class="hashtag-KubeCon">#KubeCon</a> Bla</p>');
});
it('should parse link - Pleroma', () => {
const sample = `<p>Bla <a href="https://cloudblogs.microsoft.com/opensource/2019/05/21/service-mesh-interface-smi-release/"><span>https://</span><span>cloudblogs.microsoft.com/opens</span><span>ource/2019/05/21/service-mesh-interface-smi-release/</span></a></p>`;
component.text = sample;
expect(component.processedText).toContain('<p>Bla <a href class="link-httpscloudblogsmicrosoftcomopensource20190521servicemeshinterfacesmirelease" title="open link">cloudblogs.microsoft.com/opens</a></p>');
})
});

9
src/app/components/stream/status/databinded-text/databinded-text.component.ts
View File

@ -43,7 +43,7 @@ export class DatabindedTextComponent implements OnInit {
continue;
}
if (section.includes('class="mention hashtag"') || section.includes('target="_blank">#')) {
if (section.includes('class="mention hashtag"') || section.includes('target="_blank">#') || section.includes('rel="tag">')) {
try {
this.processHashtag(section);
}
@ -63,6 +63,7 @@ export class DatabindedTextComponent implements OnInit {
} else {
try {
this.processLink(section);
//this.processedText += `<a ${section}`;
}
catch (err) {
console.warn('process link');
@ -129,7 +130,11 @@ export class DatabindedTextComponent implements OnInit {
extractedName = extractedLinkAndNext[0].split(`<span class="">`)[1].split('</span>')[0];
}
catch (err) {
extractedName = extractedLinkAndNext[0].split(' target="_blank">')[1].split('</span>')[0];
try {
extractedName = extractedLinkAndNext[0].split(' target="_blank">')[1].split('</span>')[0];
} catch (err) { // Pleroma
extractedName = extractedLinkAndNext[0].split('</span><span>')[1].split('</span>')[0];
}
}
}