mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-28 21:02:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
commit f5a4f4321a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/ap/extract.go
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.