SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[bugfix] Relax Mention parsing, allowing either href or name (#2320)

Browse Source
This commit is contained in:
tobi
2023-10-31 12:05:17 +01:00
committed by GitHub
parent dd4b0241ea
commit 51d0a0bba5
6 changed files with 317 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
internal/ap/extractmentions_test.go
View File

@ -21,14 +21,16 @@ import (
"testing"
"github.com/stretchr/testify/suite"
"github.com/superseriousbusiness/activity/streams"
"github.com/superseriousbusiness/gotosocial/internal/ap"
"github.com/superseriousbusiness/gotosocial/testrig"
)
type ExtractMentionsTestSuite struct {
APTestSuite
}
func (suite *ExtractMentionsTestSuite) TestExtractMentions() {
func (suite *ExtractMentionsTestSuite) TestExtractMentionsFromNote() {
note := suite.noteWithMentions1
mentions, err := ap.ExtractMentions(note)
@ -44,6 +46,101 @@ func (suite *ExtractMentionsTestSuite) TestExtractMentions() {
suite.Equal("https://gts.superseriousbusiness.org/users/f0x", m2.TargetAccountURI)
}
func (suite *ExtractMentionsTestSuite) TestExtractMentions() {
newMention := func(nameString string, href string) ap.Mentionable {
mention := streams.NewActivityStreamsMention()
if nameString != "" {
nameProp := streams.NewActivityStreamsNameProperty()
nameProp.AppendXMLSchemaString(nameString)
mention.SetActivityStreamsName(nameProp)
}
if href != "" {
hrefProp := streams.NewActivityStreamsHrefProperty()
hrefProp.SetIRI(testrig.URLMustParse(href))
mention.SetActivityStreamsHref(hrefProp)
}
return mention
}
type test struct {
nameString string
href string
expectedNameString string
expectedHref string
expectedErr string
}
for i, t := range []test{
{
// Mention with both Name and Href set, should be fine.
nameString: "@someone@example.org",
href: "https://example.org/@someone",
expectedNameString: "@someone@example.org",
expectedHref: "https://example.org/@someone",
expectedErr: "",
},
{
// Mention with just Href set, should be fine.
nameString: "",
href: "https://example.org/@someone",
expectedNameString: "",
expectedHref: "https://example.org/@someone",
expectedErr: "",
},
{
// Mention with just Name set, should be fine.
nameString: "@someone@example.org",
href: "",
expectedNameString: "@someone@example.org",
expectedHref: "",
expectedErr: "",
},
{
// Mention with nothing set, not fine!
nameString: "",
href: "",
expectedNameString: "",
expectedHref: "",
expectedErr: "ExtractMention: neither Name nor Href were set",
},
} {
apMention := newMention(t.nameString, t.href)
mention, err := ap.ExtractMention(apMention)
if err != nil {
if errString := err.Error(); errString != t.expectedErr {
suite.Fail("",
"test %d expected error %s, got %s",
i+1, t.expectedErr, errString,
)
}
continue
} else if t.expectedErr != "" {
suite.Fail("",
"test %d expected error %s, got no error",
i+1, t.expectedErr,
)
}
if mention.NameString != t.expectedNameString {
suite.Fail("",
"test %d expected nameString %s, got %s",
i+1, t.expectedNameString, mention.NameString,
)
}
if mention.TargetAccountURI != t.expectedHref {
suite.Fail("",
"test %d expected href %s, got %s",
i+1, t.expectedHref, mention.TargetAccountURI,
)
}
}
}
func TestExtractMentionsTestSuite(t *testing.T) {
suite.Run(t, &ExtractMentionsTestSuite{})
}