From 329a5e8144eea78e607c8a218ae78ae8f346f2e8 Mon Sep 17 00:00:00 2001 From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> Date: Wed, 11 Aug 2021 16:54:54 +0200 Subject: Text duplication fix (#137) * start testing text duplication * tests * fixes + tests --- internal/text/common.go | 42 ++++++++++++--- internal/text/common_test.go | 116 ++++++++++++++++++++++++++++++++++++++++ internal/text/formatter_test.go | 1 + internal/text/plain_test.go | 26 +++++++++ 4 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 internal/text/common_test.go (limited to 'internal/text') diff --git a/internal/text/common.go b/internal/text/common.go index 98ec892a7..4f0bad9dc 100644 --- a/internal/text/common.go +++ b/internal/text/common.go @@ -50,26 +50,54 @@ func postformat(in string) string { func (f *formatter) ReplaceTags(in string, tags []*gtsmodel.Tag) string { return util.HashtagFinderRegex.ReplaceAllStringFunc(in, func(match string) string { + // we have a match + matchTrimmed := strings.TrimSpace(match) + tagAsEntered := strings.Split(matchTrimmed, "#")[1] + + // check through the tags to find what we're matching for _, tag := range tags { - if strings.TrimSpace(match) == fmt.Sprintf("#%s", tag.Name) { - tagContent := fmt.Sprintf(``, tag.URL, tag.Name) + + if strings.EqualFold(matchTrimmed, fmt.Sprintf("#%s", tag.Name)) { + // replace the #tag with the formatted tag content + tagContent := fmt.Sprintf(``, tag.URL, tagAsEntered) + + // in case the match picked up any previous space or newlines (thanks to the regex), include them as well if strings.HasPrefix(match, " ") { tagContent = " " + tagContent + } else if strings.HasPrefix(match, "\n") { + tagContent = "\n" + tagContent } + + // done return tagContent } } - return in + // the match wasn't in the list of tags for whatever reason, so just return the match as we found it so nothing changes + return match }) } func (f *formatter) ReplaceMentions(in string, mentions []*gtsmodel.Mention) string { for _, menchie := range mentions { - targetAccount := >smodel.Account{} - if err := f.db.GetByID(menchie.TargetAccountID, targetAccount); err == nil { - mentionContent := fmt.Sprintf(`@%s`, targetAccount.URL, targetAccount.Username) - in = strings.ReplaceAll(in, menchie.NameString, mentionContent) + // make sure we have a target account, either by getting one pinned on the mention, + // or by pulling it from the database + var targetAccount *gtsmodel.Account + if menchie.GTSAccount != nil { + // got it from the mention + targetAccount = menchie.GTSAccount + } else { + a := >smodel.Account{} + if err := f.db.GetByID(menchie.TargetAccountID, a); err == nil { + // got it from the db + targetAccount = a + } else { + // couldn't get it so we can't do replacement + return in + } } + + mentionContent := fmt.Sprintf(`@%s`, targetAccount.URL, targetAccount.Username) + in = strings.ReplaceAll(in, menchie.NameString, mentionContent) } return in } diff --git a/internal/text/common_test.go b/internal/text/common_test.go new file mode 100644 index 000000000..69fe7d446 --- /dev/null +++ b/internal/text/common_test.go @@ -0,0 +1,116 @@ +/* + GoToSocial + Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +package text_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/suite" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/text" + "github.com/superseriousbusiness/gotosocial/testrig" +) + +const ( + replaceMentionsString = `Another test @foss_satan@fossbros-anonymous.io + +#Hashtag + +Text` + replaceMentionsExpected = `Another test @foss_satan + +#Hashtag + +Text` + + replaceHashtagsExpected = `Another test @foss_satan@fossbros-anonymous.io + + + +Text` + + replaceHashtagsAfterMentionsExpected = `Another test @foss_satan + + + +Text` +) + +type CommonTestSuite struct { + TextStandardTestSuite +} + +func (suite *CommonTestSuite) SetupSuite() { + suite.testTokens = testrig.NewTestTokens() + suite.testClients = testrig.NewTestClients() + suite.testApplications = testrig.NewTestApplications() + suite.testUsers = testrig.NewTestUsers() + suite.testAccounts = testrig.NewTestAccounts() + suite.testAttachments = testrig.NewTestAttachments() + suite.testStatuses = testrig.NewTestStatuses() + suite.testTags = testrig.NewTestTags() + suite.testMentions = testrig.NewTestMentions() +} + +func (suite *CommonTestSuite) SetupTest() { + suite.config = testrig.NewTestConfig() + suite.db = testrig.NewTestDB() + suite.log = testrig.NewTestLog() + suite.formatter = text.NewFormatter(suite.config, suite.db, suite.log) + + testrig.StandardDBSetup(suite.db, nil) +} + +func (suite *CommonTestSuite) TearDownTest() { + testrig.StandardDBTeardown(suite.db) +} + +func (suite *CommonTestSuite) TestReplaceMentions() { + foundMentions := []*gtsmodel.Mention{ + suite.testMentions["zork_mention_foss_satan"], + } + + f := suite.formatter.ReplaceMentions(replaceMentionsString, foundMentions) + assert.Equal(suite.T(), replaceMentionsExpected, f) +} + +func (suite *CommonTestSuite) TestReplaceHashtags() { + foundTags := []*gtsmodel.Tag{ + suite.testTags["Hashtag"], + } + + f := suite.formatter.ReplaceTags(replaceMentionsString, foundTags) + + assert.Equal(suite.T(), replaceHashtagsExpected, f) +} + +func (suite *CommonTestSuite) TestReplaceHashtagsAfterReplaceMentions() { + foundTags := []*gtsmodel.Tag{ + suite.testTags["Hashtag"], + } + + f := suite.formatter.ReplaceTags(replaceMentionsExpected, foundTags) + + assert.Equal(suite.T(), replaceHashtagsAfterMentionsExpected, f) +} + +func TestCommonTestSuite(t *testing.T) { + suite.Run(t, new(CommonTestSuite)) +} diff --git a/internal/text/formatter_test.go b/internal/text/formatter_test.go index 2c9c18546..803088794 100644 --- a/internal/text/formatter_test.go +++ b/internal/text/formatter_test.go @@ -45,6 +45,7 @@ type TextStandardTestSuite struct { testAttachments map[string]*gtsmodel.MediaAttachment testStatuses map[string]*gtsmodel.Status testTags map[string]*gtsmodel.Tag + testMentions map[string]*gtsmodel.Mention // module being tested formatter text.Formatter diff --git a/internal/text/plain_test.go b/internal/text/plain_test.go index 183ccc478..2f9eb3a29 100644 --- a/internal/text/plain_test.go +++ b/internal/text/plain_test.go @@ -19,6 +19,7 @@ package text_test import ( + "fmt" "testing" "github.com/stretchr/testify/assert" @@ -34,6 +35,13 @@ const ( withTag = "this is a simple status that uses hashtag #welcome!" withTagExpected = "

this is a simple status that uses hashtag #welcome!

" + + moreComplex = `Another test @foss_satan@fossbros-anonymous.io + +#Hashtag + +Text` + moreComplexExpected = `

Another test @foss_satan

#Hashtag

Text

` ) type PlainTestSuite struct { @@ -49,6 +57,7 @@ func (suite *PlainTestSuite) SetupSuite() { suite.testAttachments = testrig.NewTestAttachments() suite.testStatuses = testrig.NewTestStatuses() suite.testTags = testrig.NewTestTags() + suite.testMentions = testrig.NewTestMentions() } func (suite *PlainTestSuite) SetupTest() { @@ -79,6 +88,23 @@ func (suite *PlainTestSuite) TestParseWithTag() { assert.Equal(suite.T(), withTagExpected, f) } +func (suite *PlainTestSuite) TestParseMoreComplex() { + + foundTags := []*gtsmodel.Tag{ + suite.testTags["Hashtag"], + } + + foundMentions := []*gtsmodel.Mention{ + suite.testMentions["zork_mention_foss_satan"], + } + + f := suite.formatter.FromPlain(moreComplex, foundMentions, foundTags) + + fmt.Println(f) + + assert.Equal(suite.T(), moreComplexExpected, f) +} + func TestPlainTestSuite(t *testing.T) { suite.Run(t, new(PlainTestSuite)) } -- cgit v1.2.3