Use constant for empty LangRef value

Changes

3 changed files (+14/-10)

• activitypub/object.go
  • @@ -51,6 +51,10 @@ const (
    MentionType ActivityVocabularyType = "Mention" ) + const ( + NullLangRef LangRef = "-" + ) + var validGenericObjectTypes = [...]ActivityVocabularyType{ ActivityType, IntransitiveActivityType,
  • @@ -191,7 +195,7 @@ func (n *NaturalLanguageValue) UnmarshalJSON(data []byte) error {
    if data[len(data)-1] != '"' { return fmt.Errorf("invalid string value when unmarshalling %T value", n) } - n.Append(LangRef("-"), string(data[1:len(data)-1])) + n.Append(LangRef(NullLangRef), string(data[1:len(data)-1])) } if data[0] == '{' { // an object - trying to load it to the struct
  • @@ -215,7 +219,7 @@ func (n *NaturalLanguageValue) UnmarshalText(data []byte) error {
    if data[len(data)-1] != '"' { return fmt.Errorf("invalid string value when unmarshalling %T value", n) } - n.Append(LangRef("-"), string(data[1:len(data)-1])) + n.Append(LangRef(NullLangRef), string(data[1:len(data)-1])) } return nil }
• activitypub/unmarshalling.go
  • @@ -81,7 +81,7 @@ func getAPNaturalLanguageField(data []byte, prop string) NaturalLanguageValue {
    return err }, prop) case jsonparser.String: - n.Append("-", string(val)) + n.Append(NullLangRef, string(val)) } return n
• tests/unmarshalling_test.go
  • @@ -197,7 +197,7 @@ var allTests = tests{
    HrefLang: a.LangRef("en"), MediaType: a.MimeType("text/html"), Name: a.NaturalLanguageValue{ - a.LangRef("-"): "An example link", + a.LangRef(a.NullLangRef): "An example link", }, }, },
  • @@ -217,7 +217,7 @@ var allTests = tests{
    Type: a.ObjectType, ID: a.ObjectID("http://www.test.example/object/1"), Name: a.NaturalLanguageValue{ - a.LangRef("-"): "A Simple, non-specific object", + a.LangRef(a.NullLangRef): "A Simple, non-specific object", }, }, },
  • @@ -227,17 +227,17 @@ var allTests = tests{
    // blank: &a.Activity{}, // result: &a.Activity{ // Type: a.ActivityType, - // Summary: a.NaturalLanguageValue{a.LangRef("-"): "Sally did something to a note"}, + // Summary: a.NaturalLanguageValue{a.LangRef(a.NullLangRef): "Sally did something to a note"}, // Actor: a.Actor(a.Person{ // Type: a.PersonType, // Name: a.NaturalLanguageValue{ - // a.LangRef("-"): "Sally", + // a.LangRef(a.NullLangRef): "Sally", // }, // }), // Object: a.Object{ // Type: a.NoteType, // Name: a.NaturalLanguageValue{ - // a.LangRef("-"): "A Note", + // a.LangRef(a.NullLangRef): "A Note", // }, // }, // },
  • @@ -250,10 +250,10 @@ var allTests = tests{
    ID: a.ObjectID("http://example.com/accounts/ana"), Type: a.PersonType, Name: a.NaturalLanguageValue{ - a.LangRef("-"): "ana", + a.LangRef(a.NullLangRef): "ana", }, PreferredUsername: a.NaturalLanguageValue{ - a.LangRef("-"): "Ana", + a.LangRef(a.NullLangRef): "Ana", }, URL: a.URI("http://example.com/accounts/ana"), Outbox: &a.OutboxStream{