[bugfix] Fix error extracting status content: no content found (#598)

* don't return error if no content found in Activity

* add test for content extraction

* go fmt
This commit is contained in:
tobi 2022-05-23 17:12:46 +02:00 committed by GitHub
parent a09e101931
commit f5a4f4321a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 11 deletions

View file

@ -335,18 +335,24 @@ func ExtractPublicKeyForOwner(i WithPublicKey, forOwner *url.URL) (*rsa.PublicKe
return nil, nil, errors.New("couldn't find public key")
}
// ExtractContent returns a string representation of the interface's Content property.
func ExtractContent(i WithContent) (string, error) {
// ExtractContent returns a string representation of the interface's Content property,
// or an empty string if no Content is found.
func ExtractContent(i WithContent) string {
contentProperty := i.GetActivityStreamsContent()
if contentProperty == nil {
return "", nil
return ""
}
for iter := contentProperty.Begin(); iter != contentProperty.End(); iter = iter.Next() {
if iter.IsXMLSchemaString() && iter.GetXMLSchemaString() != "" {
return iter.GetXMLSchemaString(), nil
if iter.IsXMLSchemaString() {
return iter.GetXMLSchemaString()
}
if iter.IsIRI() && iter.GetIRI() != nil {
return iter.GetIRI().String()
}
}
return "", errors.New("no content found")
return ""
}
// ExtractAttachments returns a slice of attachments on the interface.

View file

@ -92,6 +92,10 @@ func noteWithMentions1() vocab.ActivityStreamsNote {
note.SetActivityStreamsTag(tags)
content := streams.NewActivityStreamsContentProperty()
content.AppendXMLSchemaString("hey @f0x and @dumpsterqueer")
note.SetActivityStreamsContent(content)
return note
}

View file

@ -0,0 +1,42 @@
/*
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 ap_test
import (
"testing"
"github.com/stretchr/testify/suite"
"github.com/superseriousbusiness/gotosocial/internal/ap"
)
type ExtractContentTestSuite struct {
ExtractTestSuite
}
func (suite *ExtractContentTestSuite) TestExtractContent1() {
note := suite.noteWithMentions1
content := ap.ExtractContent(note)
suite.Equal("hey @f0x and @dumpsterqueer", content)
}
func TestExtractContentTestSuite(t *testing.T) {
suite.Run(t, &ExtractContentTestSuite{})
}

View file

@ -192,11 +192,7 @@ func (c *converter) ASStatusToStatus(ctx context.Context, statusable ap.Statusab
}
// the html-formatted content of this status
if content, err := ap.ExtractContent(statusable); err != nil {
l.Infof("ASStatusToStatus: error extracting status content: %s", err)
} else {
status.Content = content
}
status.Content = ap.ExtractContent(statusable)
// attachments to dereference and fetch later on (we don't do that here)
if attachments, err := ap.ExtractAttachments(statusable); err != nil {