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 index 495dd8cd..c4e6a9da 100644 --- 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 @@ -47,6 +47,16 @@ describe('DatabindedTextComponent', () => { expect(component.processedText).toContain('bla2'); }); + it('should parse hashtag - Hometown', () => { + const hashtag = 'MicroFiction'; + const url = 'https://mastodon.social/tags/MicroFiction'; + const sample = `

"bla1"
#${hashtag} bla2

`; + component.text = sample; + expect(component.processedText).toContain(`#${hashtag}`); + expect(component.processedText).toContain('bla1'); + expect(component.processedText).toContain('bla2'); + }); + it('should parse hashtag - Pleroma 2.0.2', () => { const sample = `Blabla #covid19 Blibli`; component.text = sample; 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 57902653..60a90407 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 @@ -93,7 +93,7 @@ export class DatabindedTextComponent implements OnInit { private processHashtag(section: string) { let extractedLinkAndNext = section.split(''); - let extractedHashtag = extractedLinkAndNext[0].split('#')[1].replace('', '').replace('', ''); + let extractedHashtag = extractedLinkAndNext[0].split('#')[1].replace('', '').replace('', '').replace('', ''); let extractedUrl = extractedLinkAndNext[0].split('href="')[1].split('"')[0]; let classname = this.getClassNameForHastag(extractedHashtag); @@ -118,7 +118,7 @@ export class DatabindedTextComponent implements OnInit { if (extractedAccountName.includes('@')) extractedAccountName = extractedAccountName.split('@')[0]; - } else if(section.includes(' class="u-url mention">@') && !section.includes(' class="u-url mention">@<')) { //Misskey in pleroma + } else if (section.includes(' class="u-url mention">@') && !section.includes(' class="u-url mention">@<')) { //Misskey in pleroma extractedAccountAndNext = section.split(''); extractedAccountName = extractedAccountAndNext[0].split(' class="u-url mention">@')[1];