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/api/client/account/accountupdate_test.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'internal/api/client/account/accountupdate_test.go') diff --git a/internal/api/client/account/accountupdate_test.go b/internal/api/client/account/accountupdate_test.go index 8e35c236b..c6d07d9dc 100644 --- a/internal/api/client/account/accountupdate_test.go +++ b/internal/api/client/account/accountupdate_test.go @@ -75,6 +75,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandler() // check the returned api model account // fields should be updated suite.Equal("

this is my new bio read it and weep

", apimodelAccount.Note) + suite.Equal(newBio, apimodelAccount.Source.Note) } func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerUnlockLock() { @@ -194,6 +195,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerGet // check the returned api model account // fields should be updated suite.Equal("

this is my new bio read it and weep

", apimodelAccount.Note) + suite.Equal(newBio, apimodelAccount.Source.Note) } func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerTwoFields() { @@ -235,6 +237,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerTwo // check the returned api model account // fields should be updated suite.Equal("

this is my new bio read it and weep

", apimodelAccount.Note) + suite.Equal(newBio, apimodelAccount.Source.Note) suite.True(apimodelAccount.Locked) } @@ -280,6 +283,7 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerWit suite.Equal("updated zork display name!!!", apimodelAccount.DisplayName) suite.True(apimodelAccount.Locked) suite.Empty(apimodelAccount.Note) + suite.Empty(apimodelAccount.Source.Note) // header values... // should be set -- cgit v1.2.3