Refactoring loading of link type from json byte array

Changes

2 changed files (+25/-23)

• decoding.go
  • @@ -655,3 +655,26 @@ func loadTombstone(data []byte, t *Tombstone) error {
    t.Deleted = JSONGetTime(data, "deleted") return nil } + + func loadLink(data []byte, l *Link) error { + if ItemTyperFunc == nil { + ItemTyperFunc = JSONGetItemByType + } + l.ID = JSONGetID(data) + l.Type = JSONGetType(data) + l.MediaType = JSONGetMimeType(data) + l.Preview = JSONGetItem(data, "preview") + l.Height = uint(JSONGetInt(data, "height")) + l.Width = uint(JSONGetInt(data, "width")) + l.Name = JSONGetNaturalLanguageField(data, "name") + l.HrefLang = JSONGetLangRefField(data, "hrefLang") + href := JSONGetURIItem(data, "href") + if href != nil && !href.IsObject() { + l.Href = href.GetLink() + } + rel := JSONGetURIItem(data, "rel") + if rel != nil && !rel.IsObject() { + l.Rel = rel.GetLink() + } + return nil + }
• link.go
  • @@ -96,27 +96,6 @@ func (l Link) GetType() ActivityVocabularyType {
    // UnmarshalJSON func (l *Link) UnmarshalJSON(data []byte) error { - if ItemTyperFunc == nil { - ItemTyperFunc = JSONGetItemByType - } - l.ID = JSONGetID(data) - l.Type = JSONGetType(data) - l.MediaType = JSONGetMimeType(data) - l.Preview = JSONGetItem(data, "preview") - l.Height = uint(JSONGetInt(data, "height")) - l.Width = uint(JSONGetInt(data, "width")) - l.Name = JSONGetNaturalLanguageField(data, "name") - l.HrefLang = JSONGetLangRefField(data, "hrefLang") - href := JSONGetURIItem(data, "href") - if href != nil && !href.IsObject() { - l.Href = href.GetLink() - } - rel := JSONGetURIItem(data, "rel") - if rel != nil && !rel.IsObject() { - l.Rel = rel.GetLink() - } - - //fmt.Printf("%s\n %#v", data, l) - - return nil + return loadLink(data, l) } +