From 49beb17a8fbdbf3517c103a477a5459a3bba404d Mon Sep 17 00:00:00 2001
From: Autumn! <86073772+autumnull@users.noreply.github.com>
Date: Fri, 3 Feb 2023 10:58:58 +0000
Subject: [chore] Text formatting overhaul (#1406)

* Implement goldmark debug print for hashtags and mentions

* Minify HTML in FromPlain

* Convert plaintext status parser to goldmark

* Move mention/tag/emoji finding logic into formatter

* Combine mention and hashtag boundary characters

* Normalize unicode when rendering hashtags
---
 internal/processing/status/util_test.go | 207 +++-----------------------------
 1 file changed, 20 insertions(+), 187 deletions(-)

(limited to 'internal/processing/status/util_test.go')

diff --git a/internal/processing/status/util_test.go b/internal/processing/status/util_test.go
index d4be4337b..acd823188 100644
--- a/internal/processing/status/util_test.go
+++ b/internal/processing/status/util_test.go
@@ -29,22 +29,23 @@ import (
 )
 
 const (
-	statusText1                = "Another test @foss_satan@fossbros-anonymous.io\n\n#Hashtag\n\nText"
-	statusText1ExpectedFull    = "<p>Another test <span class=\"h-card\"><a href=\"http://fossbros-anonymous.io/@foss_satan\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>foss_satan</span></a></span><br/><br/><a href=\"http://localhost:8080/tags/Hashtag\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>Hashtag</span></a><br/><br/>Text</p>"
-	statusText1ExpectedPartial = "<p>Another test <span class=\"h-card\"><a href=\"http://fossbros-anonymous.io/@foss_satan\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>foss_satan</span></a></span><br/><br/>#Hashtag<br/><br/>Text</p>"
-	statusText2                = "Another test @foss_satan@fossbros-anonymous.io\n\n#Hashtag\n\n#hashTAG"
-	status2TextExpectedFull    = "<p>Another test <span class=\"h-card\"><a href=\"http://fossbros-anonymous.io/@foss_satan\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>foss_satan</span></a></span><br/><br/><a href=\"http://localhost:8080/tags/Hashtag\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>Hashtag</span></a><br/><br/><a href=\"http://localhost:8080/tags/Hashtag\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>hashTAG</span></a></p>"
-	status2TextExpectedPartial = "<p>Another test <span class=\"h-card\"><a href=\"http://fossbros-anonymous.io/@foss_satan\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>foss_satan</span></a></span><br/><br/>#Hashtag<br/><br/>#hashTAG</p>"
+	statusText1         = "Another test @foss_satan@fossbros-anonymous.io\n\n#Hashtag\n\nText"
+	statusText1Expected = "<p>Another test <span class=\"h-card\"><a href=\"http://fossbros-anonymous.io/@foss_satan\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>foss_satan</span></a></span><br><br><a href=\"http://localhost:8080/tags/Hashtag\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>Hashtag</span></a><br><br>Text</p>"
+	statusText2         = "Another test @foss_satan@fossbros-anonymous.io\n\n#Hashtag\n\n#hashTAG"
+	status2TextExpected = "<p>Another test <span class=\"h-card\"><a href=\"http://fossbros-anonymous.io/@foss_satan\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>foss_satan</span></a></span><br><br><a href=\"http://localhost:8080/tags/Hashtag\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>Hashtag</span></a><br><br><a href=\"http://localhost:8080/tags/Hashtag\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>hashTAG</span></a></p>"
 )
 
 type UtilTestSuite struct {
 	StatusStandardTestSuite
 }
 
-func (suite *UtilTestSuite) TestProcessMentions1() {
+func (suite *UtilTestSuite) TestProcessContent1() {
+	/*
+		TEST PREPARATION
+	*/
+	// we need to partially process the status first since processContent expects a status with some stuff already set on it
 	creatingAccount := suite.testAccounts["local_account_1"]
 	mentionedAccount := suite.testAccounts["remote_account_1"]
-
 	form := &apimodel.AdvancedStatusCreateForm{
 		StatusCreateRequest: apimodel.StatusCreateRequest{
 			Status:      statusText1,
@@ -70,8 +71,13 @@ func (suite *UtilTestSuite) TestProcessMentions1() {
 		ID: "01FCTDD78JJMX3K9KPXQ7ZQ8BJ",
 	}
 
-	err := suite.status.ProcessMentions(context.Background(), form, creatingAccount.ID, status)
+	/*
+		ACTUAL TEST
+	*/
+
+	err := suite.status.ProcessContent(context.Background(), form, creatingAccount.ID, status)
 	suite.NoError(err)
+	suite.Equal(statusText1Expected, status.Content)
 
 	suite.Len(status.Mentions, 1)
 	newMention := status.Mentions[0]
@@ -88,63 +94,16 @@ func (suite *UtilTestSuite) TestProcessMentions1() {
 	suite.Equal(newMention.ID, status.MentionIDs[0])
 }
 
-func (suite *UtilTestSuite) TestProcessContentFull1() {
-	/*
-		TEST PREPARATION
-	*/
-	// we need to partially process the status first since processContent expects a status with some stuff already set on it
-	creatingAccount := suite.testAccounts["local_account_1"]
-	form := &apimodel.AdvancedStatusCreateForm{
-		StatusCreateRequest: apimodel.StatusCreateRequest{
-			Status:      statusText1,
-			MediaIDs:    []string{},
-			Poll:        nil,
-			InReplyToID: "",
-			Sensitive:   false,
-			SpoilerText: "",
-			Visibility:  apimodel.VisibilityPublic,
-			ScheduledAt: "",
-			Language:    "en",
-			Format:      apimodel.StatusFormatPlain,
-		},
-		AdvancedVisibilityFlagsForm: apimodel.AdvancedVisibilityFlagsForm{
-			Federated: nil,
-			Boostable: nil,
-			Replyable: nil,
-			Likeable:  nil,
-		},
-	}
-
-	status := &gtsmodel.Status{
-		ID: "01FCTDD78JJMX3K9KPXQ7ZQ8BJ",
-	}
-
-	err := suite.status.ProcessMentions(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-	suite.Empty(status.Content) // shouldn't be set yet
-
-	err = suite.status.ProcessTags(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-	suite.Empty(status.Content) // shouldn't be set yet
-
-	/*
-		ACTUAL TEST
-	*/
-
-	err = suite.status.ProcessContent(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-	suite.Equal(statusText1ExpectedFull, status.Content)
-}
-
-func (suite *UtilTestSuite) TestProcessContentPartial1() {
+func (suite *UtilTestSuite) TestProcessContent2() {
 	/*
 		TEST PREPARATION
 	*/
 	// we need to partially process the status first since processContent expects a status with some stuff already set on it
 	creatingAccount := suite.testAccounts["local_account_1"]
+	mentionedAccount := suite.testAccounts["remote_account_1"]
 	form := &apimodel.AdvancedStatusCreateForm{
 		StatusCreateRequest: apimodel.StatusCreateRequest{
-			Status:      statusText1,
+			Status:      statusText2,
 			MediaIDs:    []string{},
 			Poll:        nil,
 			InReplyToID: "",
@@ -167,50 +126,14 @@ func (suite *UtilTestSuite) TestProcessContentPartial1() {
 		ID: "01FCTDD78JJMX3K9KPXQ7ZQ8BJ",
 	}
 
-	err := suite.status.ProcessMentions(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-	suite.Empty(status.Content) // shouldn't be set yet
-
 	/*
 		ACTUAL TEST
 	*/
 
-	err = suite.status.ProcessContent(context.Background(), form, creatingAccount.ID, status)
+	err := suite.status.ProcessContent(context.Background(), form, creatingAccount.ID, status)
 	suite.NoError(err)
-	suite.Equal(statusText1ExpectedPartial, status.Content)
-}
 
-func (suite *UtilTestSuite) TestProcessMentions2() {
-	creatingAccount := suite.testAccounts["local_account_1"]
-	mentionedAccount := suite.testAccounts["remote_account_1"]
-
-	form := &apimodel.AdvancedStatusCreateForm{
-		StatusCreateRequest: apimodel.StatusCreateRequest{
-			Status:      statusText2,
-			MediaIDs:    []string{},
-			Poll:        nil,
-			InReplyToID: "",
-			Sensitive:   false,
-			SpoilerText: "",
-			Visibility:  apimodel.VisibilityPublic,
-			ScheduledAt: "",
-			Language:    "en",
-			Format:      apimodel.StatusFormatPlain,
-		},
-		AdvancedVisibilityFlagsForm: apimodel.AdvancedVisibilityFlagsForm{
-			Federated: nil,
-			Boostable: nil,
-			Replyable: nil,
-			Likeable:  nil,
-		},
-	}
-
-	status := &gtsmodel.Status{
-		ID: "01FCTDD78JJMX3K9KPXQ7ZQ8BJ",
-	}
-
-	err := suite.status.ProcessMentions(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
+	suite.Equal(status2TextExpected, status.Content)
 
 	suite.Len(status.Mentions, 1)
 	newMention := status.Mentions[0]
@@ -227,96 +150,6 @@ func (suite *UtilTestSuite) TestProcessMentions2() {
 	suite.Equal(newMention.ID, status.MentionIDs[0])
 }
 
-func (suite *UtilTestSuite) TestProcessContentFull2() {
-	/*
-		TEST PREPARATION
-	*/
-	// we need to partially process the status first since processContent expects a status with some stuff already set on it
-	creatingAccount := suite.testAccounts["local_account_1"]
-	form := &apimodel.AdvancedStatusCreateForm{
-		StatusCreateRequest: apimodel.StatusCreateRequest{
-			Status:      statusText2,
-			MediaIDs:    []string{},
-			Poll:        nil,
-			InReplyToID: "",
-			Sensitive:   false,
-			SpoilerText: "",
-			Visibility:  apimodel.VisibilityPublic,
-			ScheduledAt: "",
-			Language:    "en",
-			Format:      apimodel.StatusFormatPlain,
-		},
-		AdvancedVisibilityFlagsForm: apimodel.AdvancedVisibilityFlagsForm{
-			Federated: nil,
-			Boostable: nil,
-			Replyable: nil,
-			Likeable:  nil,
-		},
-	}
-
-	status := &gtsmodel.Status{
-		ID: "01FCTDD78JJMX3K9KPXQ7ZQ8BJ",
-	}
-
-	err := suite.status.ProcessMentions(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-	suite.Empty(status.Content) // shouldn't be set yet
-
-	err = suite.status.ProcessTags(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-	suite.Empty(status.Content) // shouldn't be set yet
-
-	/*
-		ACTUAL TEST
-	*/
-
-	err = suite.status.ProcessContent(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-
-	suite.Equal(status2TextExpectedFull, status.Content)
-}
-
-func (suite *UtilTestSuite) TestProcessContentPartial2() {
-	/*
-		TEST PREPARATION
-	*/
-	// we need to partially process the status first since processContent expects a status with some stuff already set on it
-	creatingAccount := suite.testAccounts["local_account_1"]
-	form := &apimodel.AdvancedStatusCreateForm{
-		StatusCreateRequest: apimodel.StatusCreateRequest{
-			Status:      statusText2,
-			MediaIDs:    []string{},
-			Poll:        nil,
-			InReplyToID: "",
-			Sensitive:   false,
-			SpoilerText: "",
-			Visibility:  apimodel.VisibilityPublic,
-			ScheduledAt: "",
-			Language:    "en",
-			Format:      apimodel.StatusFormatPlain,
-		},
-		AdvancedVisibilityFlagsForm: apimodel.AdvancedVisibilityFlagsForm{
-			Federated: nil,
-			Boostable: nil,
-			Replyable: nil,
-			Likeable:  nil,
-		},
-	}
-
-	status := &gtsmodel.Status{
-		ID: "01FCTDD78JJMX3K9KPXQ7ZQ8BJ",
-	}
-
-	err := suite.status.ProcessMentions(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-	suite.Empty(status.Content)
-
-	err = suite.status.ProcessContent(context.Background(), form, creatingAccount.ID, status)
-	suite.NoError(err)
-
-	suite.Equal(status2TextExpectedPartial, status.Content)
-}
-
 func TestUtilTestSuite(t *testing.T) {
 	suite.Run(t, new(UtilTestSuite))
 }
-- 
cgit v1.2.3