e34990d7 - activitypub

Authored by: mariusor
Authored at: 2020-08-27 16:59:27 +0200
Committed by: mariusor
Committed at: 2020-08-27 16:59:27 +0200
Object name: e34990d729323b4e9851f90ae31f9777d48d046e
Parent: e3dc8e04

Making the Content type be an alias for []byte

Changes

6 changed files (+109/-101)

activity_test.go
- @@ -1052,7 +1052,7 @@ func TestActivity_MarshalJSON(t *testing.T) {
  name: "JustOneName", fields: fields{ Name: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "ana"}, + {Ref: NilLangRef, Value: Content("ana")}, }, }, want: []byte(`{"name":"ana"}`),
- @@ -1062,8 +1062,8 @@ func TestActivity_MarshalJSON(t *testing.T) {
  name: "MoreNames", fields: fields{ Name: NaturalLanguageValues{ - {Ref: "en", Value: "anna"}, - {Ref: "fr", Value: "anne"}, + {Ref: "en", Value: Content("anna")}, + {Ref: "fr", Value: Content("anne")}, }, }, want: []byte(`{"nameMap":{"en":"anna","fr":"anne"}}`),
- @@ -1073,7 +1073,7 @@ func TestActivity_MarshalJSON(t *testing.T) {
  name: "JustOneSummary", fields: fields{ Summary: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "test summary"}, + {Ref: NilLangRef, Value: Content("test summary")}, }, }, want: []byte(`{"summary":"test summary"}`),
- @@ -1083,8 +1083,8 @@ func TestActivity_MarshalJSON(t *testing.T) {
  name: "MoreSummaryEntries", fields: fields{ Summary: NaturalLanguageValues{ - {Ref: "en", Value: "test summary"}, - {Ref: "fr", Value: "teste summary"}, + {Ref: "en", Value: Content("test summary")}, + {Ref: "fr", Value: Content("teste summary")}, }, }, want: []byte(`{"summaryMap":{"en":"test summary","fr":"teste summary"}}`),
- @@ -1094,7 +1094,7 @@ func TestActivity_MarshalJSON(t *testing.T) {
  name: "JustOneContent", fields: fields{ Content: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "test content"}, + {Ref: NilLangRef, Value: Content("test content")}, }, }, want: []byte(`{"content":"test content"}`),
- @@ -1104,8 +1104,8 @@ func TestActivity_MarshalJSON(t *testing.T) {
  name: "MoreContentEntries", fields: fields{ Content: NaturalLanguageValues{ - {Ref: "en", Value: "test content"}, - {Ref: "fr", Value: "teste content"}, + {Ref: "en", Value: Content("test content")}, + {Ref: "fr", Value: Content("teste content")}, }, }, want: []byte(`{"contentMap":{"en":"test content","fr":"teste content"}}`),
- @@ -1294,7 +1294,7 @@ func TestIntransitiveActivity_MarshalJSON(t *testing.T) {
  name: "JustOneName", fields: fields{ Name: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "ana"}, + {Ref: NilLangRef, Value: Content("ana")}, }, }, want: []byte(`{"name":"ana"}`),
- @@ -1304,8 +1304,8 @@ func TestIntransitiveActivity_MarshalJSON(t *testing.T) {
  name: "MoreNames", fields: fields{ Name: NaturalLanguageValues{ - {Ref: "en", Value: "anna"}, - {Ref: "fr", Value: "anne"}, + {Ref: "en", Value: Content("anna")}, + {Ref: "fr", Value: Content("anne")}, }, }, want: []byte(`{"nameMap":{"en":"anna","fr":"anne"}}`),
- @@ -1315,7 +1315,7 @@ func TestIntransitiveActivity_MarshalJSON(t *testing.T) {
  name: "JustOneSummary", fields: fields{ Summary: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "test summary"}, + {Ref: NilLangRef, Value: Content("test summary")}, }, }, want: []byte(`{"summary":"test summary"}`),
- @@ -1325,8 +1325,8 @@ func TestIntransitiveActivity_MarshalJSON(t *testing.T) {
  name: "MoreSummaryEntries", fields: fields{ Summary: NaturalLanguageValues{ - {Ref: "en", Value: "test summary"}, - {Ref: "fr", Value: "teste summary"}, + {Ref: "en", Value: Content("test summary")}, + {Ref: "fr", Value: Content("teste summary")}, }, }, want: []byte(`{"summaryMap":{"en":"test summary","fr":"teste summary"}}`),
- @@ -1336,7 +1336,7 @@ func TestIntransitiveActivity_MarshalJSON(t *testing.T) {
  name: "JustOneContent", fields: fields{ Content: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "test content"}, + {Ref: NilLangRef, Value: Content("test content")}, }, }, want: []byte(`{"content":"test content"}`),
- @@ -1346,8 +1346,8 @@ func TestIntransitiveActivity_MarshalJSON(t *testing.T) {
  name: "MoreContentEntries", fields: fields{ Content: NaturalLanguageValues{ - {Ref: "en", Value: "test content"}, - {Ref: "fr", Value: "teste content"}, + {Ref: "en", Value: Content("test content")}, + {Ref: "fr", Value: Content("teste content")}, }, }, want: []byte(`{"contentMap":{"en":"test content","fr":"teste content"}}`),
natural_language_values.go
- @@ -13,7 +13,7 @@ const NilLangRef LangRef = "-"
 type ( // LangRef is the type for a language reference code, should be an ISO639-1 language specifier. LangRef string - Content string + Content []byte // LangRefValue is a type for storing per language values LangRefValue struct {
- @@ -51,7 +51,7 @@ func (n NaturalLanguageValues) Get(ref LangRef) Content {
 return val.Value } } - return "" + return nil } // Set sets a language, value pair in a NaturalLanguageValues array
- @@ -75,7 +75,7 @@ func (n NaturalLanguageValues) MarshalJSON() ([]byte, error) {
 if l <= 0 { return nil, nil } - + b := bytes.Buffer{} if l == 1 { v := n[0]
- @@ -189,8 +189,8 @@ func (l *LangRefValue) UnmarshalText(data []byte) error {
 // MarshalJSON serializes the LangRefValue into JSON func (l LangRefValue) MarshalJSON() ([]byte, error) { buf := bytes.Buffer{} - if l.Ref != NilLangRef && len(l.Ref) > 0{ - if l.Value == "" { + if l.Ref != NilLangRef && len(l.Ref) > 0 { + if l.Value.Equals(Content("")) { return nil, nil } buf.WriteByte('"')
- @@ -204,7 +204,7 @@ func (l LangRefValue) MarshalJSON() ([]byte, error) {
 // MarshalText serializes the LangRefValue into JSON func (l LangRefValue) MarshalText() ([]byte, error) { - if l.Ref != NilLangRef && l.Value == "" { + if l.Ref != NilLangRef && l.Value.Equals(Content("")) { return nil, nil } buf := bytes.Buffer{}
- @@ -242,11 +242,15 @@ func (l LangRef) String() string {
 return string(l) } + func (l LangRefValue) Equals(other LangRefValue) bool { + return l.Ref == other.Ref && l.Value.Equals(other.Value) + } + func (c *Content) UnmarshalJSON(data []byte) error { return c.UnmarshalText(data) } func (c *Content) UnmarshalText(data []byte) error { - *c = "" + *c = Content{} if len(data) == 0 { return nil }
- @@ -264,6 +268,10 @@ func (c Content) String() string {
 return string(c) } + func (c Content) Equals(other Content) bool { + return bytes.Equal(c, other) + } + func unescape(b []byte) []byte { // FIMXE(marius): I feel like I'm missing something really obvious about encoding/decoding from Json regarding // escape characters, and that this function is just a hack. Be better future Marius, find the real problem!
- @@ -324,7 +332,7 @@ func (n NaturalLanguageValues) Equals(with NaturalLanguageValues) bool {
 } for _, wv := range with { for _, nv := range n { - if nv == wv { + if nv.Equals(wv) { continue } return false
natural_language_values_test.go
- @@ -10,10 +10,10 @@ import (
  func TestNaturalLanguageValue_MarshalJSON(t *testing.T) { p := NaturalLanguageValues{ { - "en", "the test", + "en", Content("the test"), }, { - "fr", "le test", + "fr", Content("le test"), }, } js := "{\"en\":\"the test\",\"fr\":\"le test\"}"
- @@ -27,7 +27,7 @@ func TestNaturalLanguageValue_MarshalJSON(t *testing.T) {
  } p1 := NaturalLanguageValues{ { - "en", "the test", + "en", Content("the test"), }, }
- @@ -46,7 +46,7 @@ func TestLangRefValue_MarshalJSON(t *testing.T) {
  { tst := LangRefValue{ Ref: NilLangRef, - Value: "test", + Value: Content("test"), } j, err := tst.MarshalJSON() if err != nil {
- @@ -60,7 +60,7 @@ func TestLangRefValue_MarshalJSON(t *testing.T) {
  { tst := LangRefValue{ Ref: "en", - Value: "test", + Value: Content("test"), } j, err := tst.MarshalJSON() if err != nil {
- @@ -74,7 +74,7 @@ func TestLangRefValue_MarshalJSON(t *testing.T) {
  { tst := LangRefValue{ Ref: "en", - Value: "test\nwith characters\tneeding escaping\r\n", + Value: Content("test\nwith characters\tneeding escaping\r\n"), } j, err := tst.MarshalJSON() if err != nil {
- @@ -91,7 +91,7 @@ func TestLangRefValue_MarshalText(t *testing.T) {
  { tst := LangRefValue{ Ref: NilLangRef, - Value: "test", + Value: Content("test"), } j, err := tst.MarshalText() if err != nil {
- @@ -105,7 +105,7 @@ func TestLangRefValue_MarshalText(t *testing.T) {
  { tst := LangRefValue{ Ref: "en", - Value: "test", + Value: Content("test"), } j, err := tst.MarshalText() if err != nil {
- @@ -121,14 +121,14 @@ func TestLangRefValue_MarshalText(t *testing.T) {
  func TestNaturalLanguageValue_Get(t *testing.T) { testVal := Content("test") a := NaturalLanguageValues{{NilLangRef, testVal}} - if a.Get(NilLangRef) != testVal { + if !a.Get(NilLangRef).Equals(testVal) { t.Errorf("Invalid Get result. Expected %s received %s", testVal, a.Get(NilLangRef)) } } func TestNaturalLanguageValue_Set(t *testing.T) { testVal := Content("test") - a := NaturalLanguageValues{{NilLangRef, "ana are mere"}} + a := NaturalLanguageValues{{NilLangRef, Content("ana are mere")}} err := a.Set(LangRef("en"), testVal) if err != nil { t.Errorf("Received error when doing Set %s", err)
- @@ -148,7 +148,7 @@ func TestNaturalLanguageValue_Append(t *testing.T) {
  if len(a) != 1 { t.Errorf("Invalid append of one element to %T. Size %d != 1", a, len(a)) } - if a.Get(langEn) != valEn { + if !a.Get(langEn).Equals(valEn) { t.Errorf("Invalid append of one element to %T. Value of %q not equal to %q, but %q", a, langEn, valEn, a.Get(langEn)) } langDe := LangRef("de")
- @@ -158,10 +158,10 @@ func TestNaturalLanguageValue_Append(t *testing.T) {
  if len(a) != 2 { t.Errorf("Invalid append of one element to %T. Size %d != 2", a, len(a)) } - if a.Get(langEn) != valEn { + if !a.Get(langEn).Equals(valEn) { t.Errorf("Invalid append of one element to %T. Value of %q not equal to %q, but %q", a, langEn, valEn, a.Get(langEn)) } - if a.Get(langDe) != valDe { + if !a.Get(langDe).Equals(valDe) { t.Errorf("Invalid append of one element to %T. Value of %q not equal to %q, but %q", a, langDe, valDe, a.Get(langDe)) } }
- @@ -205,11 +205,11 @@ func TestNaturalLanguageValue_UnmarshalFullObjectJSON(t *testing.T) {
  t.Errorf("Invalid json unmarshal for %T. Expected lang %q or %q, found %q", a, langEn, langDe, lang) } - if val.Ref == LangRef(langEn) && val.Value != valEn { - t.Errorf("Invalid json unmarshal for %T. Expected value %q, found %q", a, valEn, val) + if val.Ref == LangRef(langEn) && !val.Value.Equals(valEn) { + t.Errorf("Invalid json unmarshal for %T. Expected value %q, found %q", a, valEn, val.Value) } - if val.Ref == LangRef(langDe) && val.Value != valDe { - t.Errorf("Invalid json unmarshal for %T. Expected value %q, found %q", a, valDe, val) + if val.Ref == LangRef(langDe) && !val.Value.Equals(valDe) { + t.Errorf("Invalid json unmarshal for %T. Expected value %q, found %q", a, valDe, val.Value) } } }
- @@ -249,7 +249,7 @@ func TestNaturalLanguageValueNew(t *testing.T) {
  func TestNaturalLanguageValue_MarshalText(t *testing.T) { nlv := LangRefValue{ Ref: "en", - Value: "test", + Value: Content("test"), } tst := NaturalLanguageValues{nlv} j, err := tst.MarshalText()
- @@ -281,10 +281,10 @@ func TestNaturalLanguageValues_MarshalJSON(t *testing.T) {
  { m := NaturalLanguageValues{ { - "en", "test", + "en", Content("test"), }, { - "de", "test", + "de", Content("test"), }, } result, err := m.MarshalJSON()
- @@ -301,7 +301,7 @@ func TestNaturalLanguageValues_MarshalJSON(t *testing.T) {
  s := make(map[LangRef]string) s["en"] = "test" n1 := NaturalLanguageValues{{ - "en", "test", + "en", Content("test"), }} result1, err1 := n1.MarshalJSON() if err1 != nil {
- @@ -315,7 +315,7 @@ func TestNaturalLanguageValues_MarshalJSON(t *testing.T) {
  { nlv := LangRefValue{ Ref: NilLangRef, - Value: "test", + Value: Content("test"), } tst := NaturalLanguageValues{nlv} j, err := tst.MarshalJSON()
- @@ -333,7 +333,7 @@ func TestNaturalLanguageValues_MarshalJSON(t *testing.T) {
  { nlv := LangRefValue{ Ref: "en", - Value: "test", + Value: Content("test"), } tst := NaturalLanguageValues{nlv} j, err := tst.MarshalJSON()
- @@ -351,11 +351,11 @@ func TestNaturalLanguageValues_MarshalJSON(t *testing.T) {
  { nlvEn := LangRefValue{ Ref: "en", - Value: "test", + Value: Content("test"), } nlvFr := LangRefValue{ Ref: "fr", - Value: "teste", + Value: Content("teste"), } tst := NaturalLanguageValues{nlvEn, nlvFr} j, err := tst.MarshalJSON()
- @@ -373,11 +373,11 @@ func TestNaturalLanguageValues_MarshalJSON(t *testing.T) {
  { nlvEn := LangRefValue{ Ref: "en", - Value: "test\nwith new line", + Value: Content("test\nwith new line"), } nlvFr := LangRefValue{ Ref: "fr", - Value: "teste\navec une ligne nouvelle", + Value: Content("teste\navec une ligne nouvelle"), } tst := NaturalLanguageValues{nlvEn, nlvFr} j, err := tst.MarshalJSON()
- @@ -417,7 +417,7 @@ func TestNaturalLanguageValues_UnmarshalJSON(t *testing.T) {
  t.Errorf("Invalid number of elements %d, expected %d", n.Count(), 1) } l := n.First() - if l.Value != "ana are mere\n" { + if !l.Value.Equals(Content("ana are mere\n")) { t.Errorf("Invalid %T value %q, expected %q", l, l.Value, "ana are mere\n") } if l.Ref != "en" {
- @@ -441,7 +441,7 @@ func TestNaturalLanguageValues_UnmarshalJSON(t *testing.T) {
  t.Errorf("Invalid number of elements %d, expected %d", n.Count(), 1) } l := n.First() - if l.Value != "ana are mere\n" { + if !l.Value.Equals(Content("ana are mere\n")) { t.Errorf("Invalid %T value %q, expected %q", l, l.Value, "ana are mere\n") } if l.Ref != "en" {
- @@ -480,12 +480,12 @@ func TestNaturalLanguageValues_Equals(t *testing.T) {
  name: "equal-key-value", n: NaturalLanguageValues{LangRefValue{ Ref: "en", - Value: "test123#", + Value: Content("test123#"), }}, args: args{ with: NaturalLanguageValues{LangRefValue{ Ref: "en", - Value: "test123#", + Value: Content("test123#"), }}, }, want: true,
- @@ -494,12 +494,12 @@ func TestNaturalLanguageValues_Equals(t *testing.T) {
  name: "not-equal-key", n: NaturalLanguageValues{LangRefValue{ Ref: "en", - Value: "test123#", + Value: Content("test123#"), }}, args: args{ with: NaturalLanguageValues{LangRefValue{ Ref: "fr", - Value: "test123#", + Value: Content("test123#"), }}, }, want: false,
- @@ -508,12 +508,12 @@ func TestNaturalLanguageValues_Equals(t *testing.T) {
  name: "not-equal-value", n: NaturalLanguageValues{LangRefValue{ Ref: "en", - Value: "test123#", + Value: Content("test123#"), }}, args: args{ with: NaturalLanguageValues{LangRefValue{ Ref: "en", - Value: "test123", + Value: Content("test123"), }}, }, want: false,
object_test.go
- @@ -563,7 +563,7 @@ func TestObject_MarshalJSON(t *testing.T) {
  name: "JustOneName", fields: fields{ Name: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "ana"}, + {Ref: NilLangRef, Value: Content("ana")}, }, }, want: []byte(`{"name":"ana"}`),
- @@ -573,8 +573,8 @@ func TestObject_MarshalJSON(t *testing.T) {
  name: "MoreNames", fields: fields{ Name: NaturalLanguageValues{ - {Ref: "en", Value: "anna"}, - {Ref: "fr", Value: "anne"}, + {Ref: "en", Value: Content("anna")}, + {Ref: "fr", Value: Content("anne")}, }, }, want: []byte(`{"nameMap":{"en":"anna","fr":"anne"}}`),
- @@ -584,7 +584,7 @@ func TestObject_MarshalJSON(t *testing.T) {
  name: "JustOneSummary", fields: fields{ Summary: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "test summary"}, + {Ref: NilLangRef, Value: Content("test summary")}, }, }, want: []byte(`{"summary":"test summary"}`),
- @@ -594,8 +594,8 @@ func TestObject_MarshalJSON(t *testing.T) {
  name: "MoreSummaryEntries", fields: fields{ Summary: NaturalLanguageValues{ - {Ref: "en", Value: "test summary"}, - {Ref: "fr", Value: "teste summary"}, + {Ref: "en", Value: Content("test summary")}, + {Ref: "fr", Value: Content("teste summary")}, }, }, want: []byte(`{"summaryMap":{"en":"test summary","fr":"teste summary"}}`),
- @@ -605,7 +605,7 @@ func TestObject_MarshalJSON(t *testing.T) {
  name: "JustOneContent", fields: fields{ Content: NaturalLanguageValues{ - {Ref: NilLangRef, Value: "test content"}, + {Ref: NilLangRef, Value: Content("test content")}, }, }, want: []byte(`{"content":"test content"}`),
- @@ -615,8 +615,8 @@ func TestObject_MarshalJSON(t *testing.T) {
  name: "MoreContentEntries", fields: fields{ Content: NaturalLanguageValues{ - {Ref: "en", Value: "test content"}, - {Ref: "fr", Value: "teste content"}, + {Ref: "en", Value: Content("test content")}, + {Ref: "fr", Value: Content("teste content")}, }, }, want: []byte(`{"contentMap":{"en":"test content","fr":"teste content"}}`),
- @@ -757,7 +757,7 @@ func TestSource_MarshalJSON(t *testing.T) {
  name: "OneContentValue", fields: fields{ Content: NaturalLanguageValues{ - {Value: "test"}, + {Value: Content("test")}, }, }, want: []byte(`{"content":"test"}`),
- @@ -769,11 +769,11 @@ func TestSource_MarshalJSON(t *testing.T) {
  Content: NaturalLanguageValues{ { Ref: "en", - Value: "test", + Value: Content("test"), }, { Ref: "fr", - Value: "teste", + Value: Content("teste"), }, }, },
tests/integration_test.go
- @@ -12,8 +12,8 @@ import (
  func TestAcceptSerialization(t *testing.T) { obj := pub.AcceptNew("https://localhost/myactivity", nil) obj.Name = make(pub.NaturalLanguageValues, 1) - obj.Name.Set("en", "test") - obj.Name.Set("fr", "teste") + obj.Name.Set("en", pub.Content("test")) + obj.Name.Set("fr", pub.Content("teste")) uri := "https://www.w3.org/ns/activitystreams" p := j.WithContext(j.IRI(uri))
- @@ -43,7 +43,7 @@ func TestAcceptSerialization(t *testing.T) {
  func TestCreateActivityHTTPSerialization(t *testing.T) { id := pub.ID("test_object") obj := pub.AcceptNew(id, nil) - obj.Name.Set("en", "Accept New") + obj.Name.Set("en", pub.Content("Accept New")) uri := string(pub.ActivityBaseURI)
tests/unmarshal.go
- @@ -207,7 +207,7 @@ var allTests = testMaps{
 HrefLang: pub.LangRef("en"), MediaType: pub.MimeType("text/html"), Name: pub.NaturalLanguageValues{{ - pub.NilLangRef, "An example link", + pub.NilLangRef, pub.Content("An example link"), }}, }, },
- @@ -235,7 +235,7 @@ var allTests = testMaps{
 Type: pub.ObjectType, ID: pub.ID("http://www.test.example/object/1"), Name: pub.NaturalLanguageValues{{ - pub.NilLangRef, "A Simple, non-specific object", + pub.NilLangRef, pub.Content("A Simple, non-specific object"), }}, }, },
- @@ -246,19 +246,19 @@ var allTests = testMaps{
 Type: pub.ObjectType, ID: pub.ID("http://www.test.example/object/1"), Name: pub.NaturalLanguageValues{{ - pub.NilLangRef, "A Simple, non-specific object", + pub.NilLangRef, pub.Content("A Simple, non-specific object"), }}, Tag: pub.ItemCollection{ &pub.Mention{ Name: pub.NaturalLanguageValues{{ - pub.NilLangRef, "#my_tag", + pub.NilLangRef, pub.Content("#my_tag"), }}, Type: pub.MentionType, ID: pub.ID("http://example.com/tag/my_tag"), }, &pub.Mention{ Name: pub.NaturalLanguageValues{{ - pub.NilLangRef, "@ana", + pub.NilLangRef, pub.Content("@ana"), }}, Type: pub.MentionType, ID: pub.ID("http://example.com/users/ana"),
- @@ -281,7 +281,7 @@ var allTests = testMaps{
 ID: pub.ID("http://www.test.example/object/1/replies/2"), Type: pub.ArticleType, Name: pub.NaturalLanguageValues{{ - pub.NilLangRef, "Example title", + pub.NilLangRef, pub.Content("Example title"), }}, }, },
- @@ -295,14 +295,14 @@ var allTests = testMaps{
 }, result: &pub.Activity{ Type: pub.ActivityType, - Summary: pub.NaturalLanguageValues{{pub.NilLangRef, "Sally did something to a note"}}, + Summary: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Sally did something to a note")}}, Actor: &pub.Person{ Type: pub.PersonType, - Name: pub.NaturalLanguageValues{{pub.NilLangRef, "Sally"}}, + Name: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Sally")}}, }, Object: &pub.Object{ Type: pub.NoteType, - Name: pub.NaturalLanguageValues{{pub.NilLangRef, "A Note"}}, + Name: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("A Note")}}, }, }, },
- @@ -312,8 +312,8 @@ var allTests = testMaps{
 result: &pub.Person{ ID: pub.ID("http://example.com/accounts/ana"), Type: pub.PersonType, - Name: pub.NaturalLanguageValues{{pub.NilLangRef, "ana"}}, - PreferredUsername: pub.NaturalLanguageValues{{pub.NilLangRef, "ana"}}, + Name: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("ana")}}, + PreferredUsername: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("ana")}}, URL: pub.IRI("http://example.com/accounts/ana"), Outbox: &pub.OrderedCollection{ ID: "http://example.com/accounts/ana/outbox",
- @@ -334,8 +334,8 @@ var allTests = testMaps{
 &pub.Object{ ID: pub.ID("http://example.com/outbox/53c6fb47"), Type: pub.ArticleType, - Name: pub.NaturalLanguageValues{{pub.NilLangRef, "Example title"}}, - Content: pub.NaturalLanguageValues{{pub.NilLangRef, "Example content!"}}, + Name: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Example title")}}, + Content: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Example content!")}}, URL: pub.IRI("http://example.com/53c6fb47"), MediaType: pub.MimeType("text/markdown"), Published: time.Date(2018, time.July, 5, 16, 46, 44, 0, zLoc),
- @@ -361,8 +361,8 @@ var allTests = testMaps{
 &pub.Object{ ID: pub.ID("http://example.com/outbox/53c6fb47"), Type: pub.ArticleType, - Name: pub.NaturalLanguageValues{{pub.NilLangRef, "Example title"}}, - Content: pub.NaturalLanguageValues{{pub.NilLangRef, "Example content!"}}, + Name: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Example title")}}, + Content: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Example content!")}}, URL: pub.IRI("http://example.com/53c6fb47"), MediaType: pub.MimeType("text/markdown"), Published: time.Date(2018, time.July, 5, 16, 46, 44, 0, zLoc),
- @@ -377,12 +377,12 @@ var allTests = testMaps{
 blank: &pub.NaturalLanguageValues{}, result: &pub.NaturalLanguageValues{ { - pub.NilLangRef, ` + pub.NilLangRef, pub.Content(` - `}, - {pub.LangRef("en"), "Ana got apples ⓐ"}, - {pub.LangRef("fr"), "Aná a des pommes ⒜"}, - {pub.LangRef("ro"), "Ana are mere"}, + `)}, + {pub.LangRef("en"), pub.Content("Ana got apples ⓐ")}, + {pub.LangRef("fr"), pub.Content("Aná a des pommes ⒜")}, + {pub.LangRef("ro"), pub.Content("Ana are mere")}, }, }, "activity_create_simple": {
- @@ -395,7 +395,7 @@ var allTests = testMaps{
 Type: pub.NoteType, AttributedTo: pub.IRI("https://littr.git/api/accounts/anonymous"), InReplyTo: pub.ItemCollection{pub.IRI("https://littr.git/api/accounts/system/outbox/7ca154ff")}, - Content: pub.NaturalLanguageValues{{pub.NilLangRef, "Hello world"}}, + Content: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Hello world")}}, To: pub.ItemCollection{pub.IRI("https://www.w3.org/ns/activitystreams#Public")}, }, },
- @@ -406,12 +406,12 @@ var allTests = testMaps{
 result: &pub.Create{ Type: pub.CreateType, Actor: pub.IRI("https://littr.git/api/accounts/anonymous"), - Object:pub.ItemCollection{ + Object: pub.ItemCollection{ &pub.Object{ Type: pub.NoteType, AttributedTo: pub.IRI("https://littr.git/api/accounts/anonymous"), InReplyTo: pub.ItemCollection{pub.IRI("https://littr.git/api/accounts/system/outbox/7ca154ff")}, - Content: pub.NaturalLanguageValues{{pub.NilLangRef, "Hello world"}}, + Content: pub.NaturalLanguageValues{{pub.NilLangRef, pub.Content("Hello world")}}, To: pub.ItemCollection{pub.IRI("https://www.w3.org/ns/activitystreams#Public")}, }, &pub.Article{
- @@ -420,7 +420,7 @@ var allTests = testMaps{
 Name: pub.NaturalLanguageValues{ { pub.NilLangRef, - "This someday will grow up to be an article", + pub.Content("This someday will grow up to be an article"), }, }, InReplyTo: pub.ItemCollection{
- @@ -461,7 +461,7 @@ var allTests = testMaps{
 Name: pub.NaturalLanguageValues{ { pub.NilLangRef, - "This someday will grow up to be an article", + pub.Content("This someday will grow up to be an article"), }, }, InReplyTo: pub.ItemCollection{