Updated to activitystreams version with plural NaturalLanguageValues array type

Changes

12 changed files (+38/-38)

• actors.go
  • @@ -51,7 +51,7 @@ type actor struct {
    // see 5.3 Followers Collection. Liked as.Item `jsonld:"liked,omitempty"` // A short username which may be used to refer to the actor, with no uniqueness guarantees. - PreferredUsername as.NaturalLanguageValue `jsonld:"preferredUsername,omitempty,collapsible"` + PreferredUsername as.NaturalLanguageValues `jsonld:"preferredUsername,omitempty,collapsible"` // A json object which maps additional (typically server/domain-wide) endpoints which may be useful either // for this actor or someone referencing this actor. // This mapping may be nested inside the actor document as the value or may be a link
  • @@ -85,9 +85,9 @@ func actorNew(id as.ObjectID, typ as.ActivityVocabularyType) *actor {
    } a := actor{Parent: as.Object {ID: id, Type: typ}} - a.Name = as.NaturalLanguageValueNew() - a.Content = as.NaturalLanguageValueNew() - a.Summary = as.NaturalLanguageValueNew() + a.Name = as.NaturalLanguageValuesNew() + a.Content = as.NaturalLanguageValuesNew() + a.Summary = as.NaturalLanguageValuesNew() in := as.OrderedCollectionNew(as.ObjectID("test-inbox")) out := as.OrderedCollectionNew(as.ObjectID("test-outbox")) liked := as.OrderedCollectionNew(as.ObjectID("test-liked"))
  • @@ -95,7 +95,7 @@ func actorNew(id as.ObjectID, typ as.ActivityVocabularyType) *actor {
    a.Inbox = in a.Outbox = out a.Liked = liked - a.PreferredUsername = as.NaturalLanguageValueNew() + a.PreferredUsername = as.NaturalLanguageValuesNew() return &a }
• followers.go
  • @@ -18,9 +18,9 @@ func FollowersNew() *Followers {
    id := as.ObjectID("followers") i := Followers{Parent: as.Parent{ID: id, Type: as.CollectionType}} - i.Name = as.NaturalLanguageValueNew() - i.Content = as.NaturalLanguageValueNew() - i.Summary = as.NaturalLanguageValueNew() + i.Name = as.NaturalLanguageValuesNew() + i.Content = as.NaturalLanguageValuesNew() + i.Summary = as.NaturalLanguageValuesNew() i.TotalItems = 0
• following.go
  • @@ -20,9 +20,9 @@ func FollowingNew() *Following {
    id := as.ObjectID("following") i := Following{Parent: as.Parent{ID: id, Type: as.CollectionType}} - i.Name = as.NaturalLanguageValueNew() - i.Content = as.NaturalLanguageValueNew() - i.Summary = as.NaturalLanguageValueNew() + i.Name = as.NaturalLanguageValuesNew() + i.Content = as.NaturalLanguageValuesNew() + i.Summary = as.NaturalLanguageValuesNew() i.TotalItems = 0
• go.mod
  • @@ -2,6 +2,6 @@ module github.com/go-ap/activitypub
    require ( github.com/buger/jsonparser v0.0.0-20181023193515-52c6e1462ebd - github.com/go-ap/activitystreams v0.0.0-20190131122434-29c67b42e5ce + github.com/go-ap/activitystreams v0.0.0-20190221165712-0b102fbb674e github.com/go-ap/jsonld v0.0.0-20190128144341-adfba0c0ddf2 )
• inbox.go
  • @@ -23,8 +23,8 @@ func InboxNew() *as.OrderedCollection {
    id := as.ObjectID("inbox") i := as.OrderedCollection{Parent: as.Parent{ID: id, Type: as.CollectionType}} - i.Name = as.NaturalLanguageValueNew() - i.Content = as.NaturalLanguageValueNew() + i.Name = as.NaturalLanguageValuesNew() + i.Content = as.NaturalLanguageValuesNew() i.TotalItems = 0
• liked.go
  • @@ -18,8 +18,8 @@ func LikedNew() *as.OrderedCollection {
    id := as.ObjectID("liked") l := as.OrderedCollection{Parent: as.Parent{ID: id, Type: as.CollectionType}} - l.Name = as.NaturalLanguageValueNew() - l.Content = as.NaturalLanguageValueNew() + l.Name = as.NaturalLanguageValuesNew() + l.Content = as.NaturalLanguageValuesNew() l.TotalItems = 0
• likes.go
  • @@ -18,8 +18,8 @@ func LikesNew() *Likes {
    id := as.ObjectID("likes") l := Likes{Parent: as.Parent{ID: id, Type: as.CollectionType}} - l.Name = as.NaturalLanguageValueNew() - l.Content = as.NaturalLanguageValueNew() + l.Name = as.NaturalLanguageValuesNew() + l.Content = as.NaturalLanguageValuesNew() l.TotalItems = 0
• object.go
  • @@ -9,7 +9,7 @@ import (
    // as a form of provenance, or to support future editing by clients. type Source struct { // Content - Content as.NaturalLanguageValue `jsonld:"content"` + Content as.NaturalLanguageValues `jsonld:"content"` // MediaType MediaType as.MimeType `jsonld:"mediaType"` }
• outbox.go
  • @@ -17,8 +17,8 @@ func OutboxNew() *Outbox {
    id := as.ObjectID("outbox") i := Outbox{Parent: as.Parent{ID: id, Type: as.CollectionType}} - i.Name = as.NaturalLanguageValueNew() - i.Content = as.NaturalLanguageValueNew() + i.Name = as.NaturalLanguageValuesNew() + i.Content = as.NaturalLanguageValuesNew() i.TotalItems = 0
• shares.go
  • @@ -18,8 +18,8 @@ func SharesNew() *Shares {
    id := as.ObjectID("Shares") i := Shares{Parent: as.Parent{ID: id, Type: as.CollectionType}} - i.Name = as.NaturalLanguageValueNew() - i.Content = as.NaturalLanguageValueNew() + i.Name = as.NaturalLanguageValuesNew() + i.Content = as.NaturalLanguageValuesNew() i.TotalItems = 0
• tests/integration_test.go
  • @@ -11,7 +11,7 @@ import (
    func TestAcceptSerialization(t *testing.T) { obj := a.AcceptNew("https://localhost/myactivity", nil) - obj.Name = make(a.NaturalLanguageValue, 1) + obj.Name = make(a.NaturalLanguageValues, 1) obj.Name.Set("en", "test") obj.Name.Set("fr", "teste")
• tests/unmarshalling_test.go
  • @@ -223,7 +223,7 @@ var allTests = tests{
    Parent: a.Object{ Type: a.ObjectType, ID: a.ObjectID("http://www.test.example/object/1"), - Name: a.NaturalLanguageValue{{ + Name: a.NaturalLanguageValues{{ a.NilLangRef, "A Simple, non-specific object", }}, },
  • @@ -236,18 +236,18 @@ var allTests = tests{
    Parent: a.Object{ Type: a.ObjectType, ID: a.ObjectID("http://www.test.example/object/1"), - Name: a.NaturalLanguageValue{{ + Name: a.NaturalLanguageValues{{ a.NilLangRef, "A Simple, non-specific object", }}, Tag: a.ItemCollection{ &a.Object{ - Name: a.NaturalLanguageValue{{ + Name: a.NaturalLanguageValues{{ a.NilLangRef, "#my_tag", }}, ID: a.ObjectID("http://example.com/tag/my_tag"), }, &a.Mention{ - Name: a.NaturalLanguageValue{{ + Name: a.NaturalLanguageValues{{ a.NilLangRef, "@ana", }}, Type: a.MentionType,
  • @@ -274,7 +274,7 @@ var allTests = tests{
    &a.Object{ ID: a.ObjectID("http://www.test.example/object/1/replies/2"), Type: a.ArticleType, - Name: a.NaturalLanguageValue{{a.NilLangRef, "Example title"}}, + Name: a.NaturalLanguageValues{{a.NilLangRef, "Example title"}}, }, }, },
  • @@ -288,10 +288,10 @@ var allTests = tests{
    // Parent: a.Parent{ // ID: a.ObjectID("http://example.com/accounts/ana"), // Type: a.PersonType, - // Name: a.NaturalLanguageValue{{a.NilLangRef, "ana"}}, + // Name: a.NaturalLanguageValues{{a.NilLangRef, "ana"}}, // URL: a.IRI("http://example.com/accounts/ana"), // }, - // PreferredUsername: a.NaturalLanguageValue{{a.NilLangRef, "Ana"}}, + // PreferredUsername: a.NaturalLanguageValues{{a.NilLangRef, "Ana"}}, // Outbox: &a.OrderedCollection{ // Parent: a.Parent{ // ID: a.ObjectID("http://example.com/accounts/ana/outbox"),
  • @@ -315,8 +315,8 @@ var allTests = tests{
    &a.Object{ ID: a.ObjectID("http://example.com/outbox/53c6fb47"), Type: a.ArticleType, - Name: a.NaturalLanguageValue{{a.NilLangRef, "Example title"}}, - Content: a.NaturalLanguageValue{{a.NilLangRef, "Example content!"}}, + Name: a.NaturalLanguageValues{{a.NilLangRef, "Example title"}}, + Content: a.NaturalLanguageValues{{a.NilLangRef, "Example content!"}}, URL: a.IRI("http://example.com/53c6fb47"), MediaType: a.MimeType("text/markdown"), Published: time.Date(2018, time.July, 5, 16, 46, 44, 0, zLoc),
  • @@ -345,8 +345,8 @@ var allTests = tests{
    &a.Object{ ID: a.ObjectID("http://example.com/outbox/53c6fb47"), Type: a.ArticleType, - Name: a.NaturalLanguageValue{{a.NilLangRef, "Example title"}}, - Content: a.NaturalLanguageValue{{a.NilLangRef, "Example content!"}}, + Name: a.NaturalLanguageValues{{a.NilLangRef, "Example title"}}, + Content: a.NaturalLanguageValues{{a.NilLangRef, "Example content!"}}, URL: a.IRI("http://example.com/53c6fb47"), MediaType: a.MimeType("text/markdown"), Published: time.Date(2018, time.July, 5, 16, 46, 44, 0, zLoc),
  • @@ -359,8 +359,8 @@ var allTests = tests{
    }, "natural_language_values": { expected: true, - blank: &a.NaturalLanguageValue{}, - result: &a.NaturalLanguageValue{ + blank: &a.NaturalLanguageValues{}, + result: &a.NaturalLanguageValues{ { a.NilLangRef, `
  • @@ -382,7 +382,7 @@ var allTests = tests{
    Type: a.NoteType, AttributedTo: a.IRI("https://littr.git/api/accounts/anonymous"), InReplyTo: a.IRI("https://littr.git/api/accounts/system/outbox/7ca154ff"), - Content: a.NaturalLanguageValue{{a.NilLangRef, "<p>Hello world</p>"}}, + Content: a.NaturalLanguageValues{{a.NilLangRef, "<p>Hello world</p>"}}, To: a.ItemCollection{a.IRI("https://www.w3.org/ns/activitystreams#Public")}, }, },