From 26b74aefaf5d2a3cd26bd57652fe96a6a20ed034 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Sat, 7 May 2022 16:55:27 +0100 Subject: [bugfix] Fix existing bio text showing as HTML (#531) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix existing bio text showing as HTML - updated replaced mentions to include instance - strips HTML from account source note in Verify handler - update text formatter to use buffers for string writes Signed-off-by: kim * go away linter Signed-off-by: kim * change buf reset location, change html mention tags Signed-off-by: kim * reduce FindLinks code complexity Signed-off-by: kim * fix HTML to text conversion Signed-off-by: kim * Update internal/regexes/regexes.go Co-authored-by: Mina Galić * use improved html2text lib with more options Signed-off-by: kim * fix to produce actual plaintext from html Signed-off-by: kim * fix span tags instead written as space Signed-off-by: kim * performance improvements to regex replacements, fix link replace logic for un-html-ing in the future Signed-off-by: kim * fix tag/mention replacements to use input string, fix link replace to not include scheme Signed-off-by: kim * use matched input string for link replace href text Signed-off-by: kim * remove unused code (to appease linter :sobs:) Signed-off-by: kim * improve hashtagFinger regex to be more compliant Signed-off-by: kim * update breakReplacer to include both unix and windows line endings Signed-off-by: kim * add NoteRaw field to Account to store plaintext account bio, add migration for this, set for sensitive accounts Signed-off-by: kim * drop unnecessary code Signed-off-by: kim * update text package tests to fix logic changes Signed-off-by: kim * add raw note content testing to account update and account verify Signed-off-by: kim * remove unused modules Signed-off-by: kim * fix emoji regex Signed-off-by: kim * fix replacement of hashtags Signed-off-by: kim * update code comment Signed-off-by: kim Co-authored-by: Mina Galić --- internal/text/link_test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'internal/text/link_test.go') diff --git a/internal/text/link_test.go b/internal/text/link_test.go index e524315e7..24484e02d 100644 --- a/internal/text/link_test.go +++ b/internal/text/link_test.go @@ -75,9 +75,7 @@ func (suite *LinkTestSuite) TestParseSimple() { } func (suite *LinkTestSuite) TestParseURLsFromText1() { - urls, err := text.FindLinks(text1) - - assert.NoError(suite.T(), err) + urls := text.FindLinks(text1) assert.Equal(suite.T(), "https://example.org/link/to/something#fragment", urls[0].String()) assert.Equal(suite.T(), "http://test.example.org?q=bahhhhhhhhhhhh", urls[1].String()) @@ -86,16 +84,14 @@ func (suite *LinkTestSuite) TestParseURLsFromText1() { } func (suite *LinkTestSuite) TestParseURLsFromText2() { - urls, err := text.FindLinks(text2) - assert.NoError(suite.T(), err) + urls := text.FindLinks(text2) // assert length 1 because the found links will be deduplicated assert.Len(suite.T(), urls, 1) } func (suite *LinkTestSuite) TestParseURLsFromText3() { - urls, err := text.FindLinks(text3) - assert.NoError(suite.T(), err) + urls := text.FindLinks(text3) // assert length 0 because `mailto:` isn't accepted assert.Len(suite.T(), urls, 0) @@ -112,7 +108,7 @@ Here's link number two: example.orghttps//google.com <-- this shouldn't work either, but it does?! OK +example.orghttps://google.com <-- this shouldn't work either, but it does?! OK `, replaced) } -- cgit v1.2.3