a/activitypub
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added a more generic way of using custom activotystreams.Item compatible structs when unmarshalling from other packages

Browse source
This commit is contained in:
Marius Orcsik 2019-01-30 17:39:26 +01:00
parent b57e0c6e02
commit 6315ea0428
No known key found for this signature in database
GPG key ID: 889CE8E4FB2D877A
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
unmarshalling.go
View file

@ -6,7 +6,6 @@ import (
"fmt"
"net/url"
"reflect"
"strings"
"time"
"github.com/buger/jsonparser"
@ -18,19 +17,13 @@ var (
textUnmarshalerType = reflect.TypeOf(new(encoding.TextUnmarshaler)).Elem()
)
type mockObj map[string]json.RawMessage
// ItemTyperFunc will return an instance of a struct that implements activitystreams.Item
// The default for this package is JSONGetItemByType but can be overwritten
var ItemTyperFunc TyperFunction = JSONGetItemByType
func getType(j json.RawMessage) ActivityVocabularyType {
mock := make(mockObj, 0)
json.Unmarshal([]byte(j), &mock)
for key, val := range mock {
if strings.ToLower(key) == "type" {
return ActivityVocabularyType(strings.Trim(string(val), "\""))
}
}
return ""
}
// TyperFunction is the type of the function which returns an activitystreams.Item struct instance
// for a specific ActivityVocabularyType
type TyperFunction func(ActivityVocabularyType) (Item, error)
func JSONGetObjectID(data []byte) ObjectID {
i, err := jsonparser.GetString(data, "id")
@ -111,7 +104,7 @@ func JSONUnmarshalToItem(data []byte) Item {
return IRI(data)
}
i, err := getAPObjectByType(JSONGetType(data))
i, err := ItemTyperFunc(JSONGetType(data))
if err != nil {
return nil
}
@ -203,7 +196,7 @@ func JSONGetURIItem(data []byte, prop string) Item {
it.Append(IRI(value))
return
}
i, err := getAPObjectByType(JSONGetType(value))
i, err := ItemTyperFunc(JSONGetType(value))
if err != nil {
return
}
@ -275,7 +268,7 @@ func unmarshal(data []byte, a interface{}) (interface{}, error) {
vv = reflect.ValueOf(m)
}
if cField.Type.Implements(apUnmarshalerType) {
o := getAPObjectByType(getType(j))
o := JSONGetItemByType(getType(j))
if o != nil {
jsonld.Unmarshal([]byte(j), o)
vv = reflect.ValueOf(o)
@ -292,7 +285,7 @@ func unmarshal(data []byte, a interface{}) (interface{}, error) {
}
*/
func getAPObjectByType(typ ActivityVocabularyType) (Item, error) {
func JSONGetItemByType(typ ActivityVocabularyType) (Item, error) {
var ret Item
var err error