mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-12-23 02:32:12 +00:00
26b74aefaf
* 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>
83 lines
2.7 KiB
Go
83 lines
2.7 KiB
Go
/*
|
|
GoToSocial
|
|
Copyright (C) 2021-2022 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 <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
package text_test
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/suite"
|
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
|
)
|
|
|
|
const (
|
|
simple = "this is a plain and simple status"
|
|
simpleExpected = "<p>this is a plain and simple status</p>"
|
|
|
|
withTag = "here's a simple status that uses hashtag #welcome!"
|
|
withTagExpected = "<p>here's a simple status that uses hashtag <a href=\"http://localhost:8080/tags/welcome\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>welcome</span></a>!</p>"
|
|
|
|
moreComplex = `Another test @foss_satan@fossbros-anonymous.io
|
|
|
|
#Hashtag
|
|
|
|
Text`
|
|
moreComplexFull = "<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>"
|
|
)
|
|
|
|
type PlainTestSuite struct {
|
|
TextStandardTestSuite
|
|
}
|
|
|
|
func (suite *PlainTestSuite) TestParseSimple() {
|
|
f := suite.formatter.FromPlain(context.Background(), simple, nil, nil)
|
|
assert.Equal(suite.T(), simpleExpected, f)
|
|
}
|
|
|
|
func (suite *PlainTestSuite) TestParseWithTag() {
|
|
foundTags := []*gtsmodel.Tag{
|
|
suite.testTags["welcome"],
|
|
}
|
|
|
|
f := suite.formatter.FromPlain(context.Background(), withTag, nil, foundTags)
|
|
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(context.Background(), moreComplex, foundMentions, foundTags)
|
|
|
|
fmt.Println(f)
|
|
|
|
assert.Equal(suite.T(), moreComplexFull, f)
|
|
}
|
|
|
|
func TestPlainTestSuite(t *testing.T) {
|
|
suite.Run(t, new(PlainTestSuite))
|
|
}
|