mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

[bugfix] Fix invalid og:description on account w/ empty note (#1733)

This commit is contained in:
tobi 2023-05-03 16:18:34 +02:00 committed by GitHub
parent c41c1f90a6
commit a6ec2a5bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/web/opengraph.go
View File

@ -91,7 +91,7 @@ func (og *ogMeta) withAccount(account *apimodel.Account) *ogMeta {
if account.Note != "" {
og.Description = parseDescription(account.Note)
} else {
og.Description = "This GoToSocial user hasn't written a bio yet!"
og.Description = `content="This GoToSocial user hasn't written a bio yet!"`
}
og.Image = account.Avatar

67
internal/web/opengraph_test.go
View File

@ -22,6 +22,7 @@ import (
"testing"
"github.com/stretchr/testify/suite"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
)
type OpenGraphTestSuite struct {
@ -44,6 +45,72 @@ func (suite *OpenGraphTestSuite) TestParseDescription() {
}
}
func (suite *OpenGraphTestSuite) TestWithAccountWithNote() {
baseMeta := ogBase(&apimodel.InstanceV1{
AccountDomain: "example.org",
Languages: []string{"en"},
})
accountMeta := baseMeta.withAccount(&apimodel.Account{
Acct: "example_account",
DisplayName: "example person!!",
URL: "https://example.org/@example_account",
Note: "<p>This is my profile, read it and weep! Weep then!</p>",
Username: "example_account",
})
suite.EqualValues(ogMeta{
Title: "example person!! (@example_account@example.org)",
Type: "profile",
Locale: "en",
URL: "https://example.org/@example_account",
SiteName: "example.org",
Description: "content=\"This is my profile, read it and weep! Weep then!\"",
Image: "",
ImageWidth: "",
ImageHeight: "",
ImageAlt: "Avatar for example_account",
ArticlePublisher: "",
ArticleAuthor: "",
ArticleModifiedTime: "",
ArticlePublishedTime: "",
ProfileUsername: "example_account",
}, *accountMeta)
}
func (suite *OpenGraphTestSuite) TestWithAccountNoNote() {
baseMeta := ogBase(&apimodel.InstanceV1{
AccountDomain: "example.org",
Languages: []string{"en"},
})
accountMeta := baseMeta.withAccount(&apimodel.Account{
Acct: "example_account",
DisplayName: "example person!!",
URL: "https://example.org/@example_account",
Note: "", // <- empty
Username: "example_account",
})
suite.EqualValues(ogMeta{
Title: "example person!! (@example_account@example.org)",
Type: "profile",
Locale: "en",
URL: "https://example.org/@example_account",
SiteName: "example.org",
Description: "content=\"This GoToSocial user hasn't written a bio yet!\"",
Image: "",
ImageWidth: "",
ImageHeight: "",
ImageAlt: "Avatar for example_account",
ArticlePublisher: "",
ArticleAuthor: "",
ArticleModifiedTime: "",
ArticlePublishedTime: "",
ProfileUsername: "example_account",
}, *accountMeta)
}
func TestOpenGraphTestSuite(t *testing.T) {
suite.Run(t, &OpenGraphTestSuite{})
}