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 <grufwub@gmail.com>

* go away linter

Signed-off-by: kim <grufwub@gmail.com>

* change buf reset location, change html mention tags

Signed-off-by: kim <grufwub@gmail.com>

* reduce FindLinks code complexity

Signed-off-by: kim <grufwub@gmail.com>

* fix HTML to text conversion

Signed-off-by: kim <grufwub@gmail.com>

* Update internal/regexes/regexes.go

Co-authored-by: Mina Galić <mina.galic@puppet.com>

* use improved html2text lib with more options

Signed-off-by: kim <grufwub@gmail.com>

* fix to produce actual plaintext from html

Signed-off-by: kim <grufwub@gmail.com>

* fix span tags instead written as space

Signed-off-by: kim <grufwub@gmail.com>

* performance improvements to regex replacements, fix link replace logic for un-html-ing in the future

Signed-off-by: kim <grufwub@gmail.com>

* fix tag/mention replacements to use input string, fix link replace to not include scheme

Signed-off-by: kim <grufwub@gmail.com>

* use matched input string for link replace href text

Signed-off-by: kim <grufwub@gmail.com>

* remove unused code (to appease linter :sobs:)

Signed-off-by: kim <grufwub@gmail.com>

* improve hashtagFinger regex to be more compliant

Signed-off-by: kim <grufwub@gmail.com>

* update breakReplacer to include both unix and windows line endings

Signed-off-by: kim <grufwub@gmail.com>

* add NoteRaw field to Account to store plaintext account bio, add migration for this, set for sensitive accounts

Signed-off-by: kim <grufwub@gmail.com>

* drop unnecessary code

Signed-off-by: kim <grufwub@gmail.com>

* update text package tests to fix logic changes

Signed-off-by: kim <grufwub@gmail.com>

* add raw note content testing to account update and account verify

Signed-off-by: kim <grufwub@gmail.com>

* remove unused modules

Signed-off-by: kim <grufwub@gmail.com>

* fix emoji regex

Signed-off-by: kim <grufwub@gmail.com>

* fix replacement of hashtags

Signed-off-by: kim <grufwub@gmail.com>

* update code comment

Signed-off-by: kim <grufwub@gmail.com>

Co-authored-by: Mina Galić <mina.galic@puppet.com>
---
 testrig/testmodels.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'testrig')

diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index cc32aa39e..8894e562d 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -319,6 +319,7 @@ func NewTestAccounts() map[string]*gtsmodel.Account {
 			DisplayName:             "",
 			Fields:                  []gtsmodel.Field{},
 			Note:                    "",
+			NoteRaw:                 "",
 			Memorial:                false,
 			MovedToAccountID:        "",
 			CreatedAt:               time.Now().Add(-72 * time.Hour),
@@ -356,7 +357,8 @@ func NewTestAccounts() map[string]*gtsmodel.Account {
 			HeaderMediaAttachmentID: "01PFPMWK2FF0D9WMHEJHR07C3Q",
 			DisplayName:             "original zork (he/they)",
 			Fields:                  []gtsmodel.Field{},
-			Note:                    "hey yo this is my profile!",
+			Note:                    "<p>hey yo this is my profile!</p>",
+			NoteRaw:                 "hey yo this is my profile!",
 			Memorial:                false,
 			MovedToAccountID:        "",
 			CreatedAt:               time.Now().Add(-48 * time.Hour),
@@ -394,7 +396,8 @@ func NewTestAccounts() map[string]*gtsmodel.Account {
 			HeaderMediaAttachmentID: "",
 			DisplayName:             "happy little turtle :3",
 			Fields:                  []gtsmodel.Field{},
-			Note:                    "i post about things that concern me",
+			Note:                    "<p>i post about things that concern me</p>",
+			NoteRaw:                 "i post about things that concern me",
 			Memorial:                false,
 			MovedToAccountID:        "",
 			CreatedAt:               time.Now().Add(-190 * time.Hour),
-- 
cgit v1.2.3