gitea-mirror
/
go-fed-activity
mirror of https://gitea.com/gitea/go-fed-activity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change delegate actor to use upper 'ID', fix tests

This commit is contained in:
Cory Slep 2020-07-05 22:37:26 +02:00
parent 574f22607b
commit ee53bc0369
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pub/base_actor.go
View File

@ -432,7 +432,7 @@ func (b *baseActor) deliver(c context.Context, outbox *url.URL, asValue vocab.Ty
return
}
// Delegate generating new IDs for the activity and all new objects.
if err = b.delegate.AddNewIds(c, activity); err != nil {
if err = b.delegate.AddNewIDs(c, activity); err != nil {
return
}
// Post the activity to the actor's outbox and trigger side effects for

12
pub/base_actor_test.go
View File

@ -187,7 +187,7 @@ func TestBaseActorSocialProtocol(t *testing.T) {
req := toAPRequest(toPostOutboxRequest(testCreateNoId))
delegate.EXPECT().AuthenticatePostOutbox(ctx, resp, req).Return(ctx, true, nil)
delegate.EXPECT().PostOutboxRequestBodyHook(ctx, req, toDeserializedForm(testCreateNoId)).Return(ctx, nil)
delegate.EXPECT().AddNewIds(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
delegate.EXPECT().AddNewIDs(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
withNewId(activity)
return nil
})
@ -218,7 +218,7 @@ func TestBaseActorSocialProtocol(t *testing.T) {
delegate.EXPECT().WrapInCreate(ctx, toDeserializedForm(testMyNote), mustParse(testMyOutboxIRI)).DoAndReturn(func(c context.Context, t vocab.Type, u *url.URL) (vocab.ActivityStreamsCreate, error) {
return wrappedInCreate(t), nil
})
delegate.EXPECT().AddNewIds(ctx, wrappedInCreate(toDeserializedForm(testMyNote))).DoAndReturn(func(c context.Context, activity Activity) error {
delegate.EXPECT().AddNewIDs(ctx, wrappedInCreate(toDeserializedForm(testMyNote))).DoAndReturn(func(c context.Context, activity Activity) error {
withNewId(activity)
return nil
})
@ -244,7 +244,7 @@ func TestBaseActorSocialProtocol(t *testing.T) {
req := toAPRequest(toPostOutboxRequest(testCreateNoId))
delegate.EXPECT().AuthenticatePostOutbox(ctx, resp, req).Return(ctx, true, nil)
delegate.EXPECT().PostOutboxRequestBodyHook(ctx, req, toDeserializedForm(testCreateNoId)).Return(ctx, nil)
delegate.EXPECT().AddNewIds(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
delegate.EXPECT().AddNewIDs(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
withNewId(activity)
return nil
})
@ -270,7 +270,7 @@ func TestBaseActorSocialProtocol(t *testing.T) {
req := toAPRequest(toPostOutboxRequest(testCreateNoId))
delegate.EXPECT().AuthenticatePostOutbox(ctx, resp, req).Return(ctx, true, nil)
delegate.EXPECT().PostOutboxRequestBodyHook(ctx, req, toDeserializedForm(testCreateNoId)).Return(ctx, nil)
delegate.EXPECT().AddNewIds(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
delegate.EXPECT().AddNewIDs(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
withNewId(activity)
return nil
})
@ -705,7 +705,7 @@ func TestBaseActor(t *testing.T) {
req := toAPRequest(toPostOutboxRequest(testCreateNoId))
delegate.EXPECT().AuthenticatePostOutbox(ctx, resp, req).Return(ctx, true, nil)
delegate.EXPECT().PostOutboxRequestBodyHook(ctx, req, toDeserializedForm(testCreateNoId)).Return(ctx, nil)
delegate.EXPECT().AddNewIds(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
delegate.EXPECT().AddNewIDs(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
withNewId(activity)
return nil
})
@ -733,7 +733,7 @@ func TestBaseActor(t *testing.T) {
req := toAPRequest(toPostOutboxRequest(testCreateNoId))
delegate.EXPECT().AuthenticatePostOutbox(ctx, resp, req).Return(ctx, true, nil)
delegate.EXPECT().PostOutboxRequestBodyHook(ctx, req, toDeserializedForm(testCreateNoId)).Return(ctx, nil)
delegate.EXPECT().AddNewIds(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
delegate.EXPECT().AddNewIDs(ctx, toDeserializedForm(testCreateNoId)).DoAndReturn(func(c context.Context, activity Activity) error {
withNewId(activity)
return nil
})

4
pub/delegate_actor.go
View File

@ -166,13 +166,13 @@ type DelegateActor interface {
// values that are simply not present, the 'rawJSON' map is ONLY needed
// for this narrow and specific use case.
PostOutbox(c context.Context, a Activity, outboxIRI *url.URL, rawJSON map[string]interface{}) (deliverable bool, e error)
// AddNewIds sets new URL ids on the activity. It also does so for all
// AddNewIDs sets new URL ids on the activity. It also does so for all
// 'object' properties if the Activity is a Create type.
//
// Only called if the Social API is enabled.
//
// If an error is returned, it is returned to the caller of PostOutbox.
AddNewIds(c context.Context, a Activity) error
AddNewIDs(c context.Context, a Activity) error
// Deliver sends a federated message. Called only if federation is
// enabled.
//

12
pub/mock_database_test.go
View File

@ -268,19 +268,19 @@ func (mr *MockDatabaseMockRecorder) SetOutbox(c, outbox interface{}) *gomock.Cal
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetOutbox", reflect.TypeOf((*MockDatabase)(nil).SetOutbox), c, outbox)
}
// NewId mocks base method
func (m *MockDatabase) NewId(c context.Context, t vocab.Type) (*url.URL, error) {
// NewID mocks base method
func (m *MockDatabase) NewID(c context.Context, t vocab.Type) (*url.URL, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "NewId", c, t)
ret := m.ctrl.Call(m, "NewID", c, t)
ret0, _ := ret[0].(*url.URL)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// NewId indicates an expected call of NewId
func (mr *MockDatabaseMockRecorder) NewId(c, t interface{}) *gomock.Call {
// NewID indicates an expected call of NewID
func (mr *MockDatabaseMockRecorder) NewID(c, t interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewId", reflect.TypeOf((*MockDatabase)(nil).NewId), c, t)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewID", reflect.TypeOf((*MockDatabase)(nil).NewID), c, t)
}
// Followers mocks base method

14
pub/mock_delegate_actor_test.go
View File

@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: pub/delegate_actor.go
// Source: delegate_actor.go
// Package pub is a generated GoMock package.
package pub
@ -156,18 +156,18 @@ func (mr *MockDelegateActorMockRecorder) PostOutbox(c, a, outboxIRI, rawJSON int
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PostOutbox", reflect.TypeOf((*MockDelegateActor)(nil).PostOutbox), c, a, outboxIRI, rawJSON)
}
// AddNewIds mocks base method
func (m *MockDelegateActor) AddNewIds(c context.Context, a Activity) error {
// AddNewIDs mocks base method
func (m *MockDelegateActor) AddNewIDs(c context.Context, a Activity) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "AddNewIds", c, a)
ret := m.ctrl.Call(m, "AddNewIDs", c, a)
ret0, _ := ret[0].(error)
return ret0
}
// AddNewIds indicates an expected call of AddNewIds
func (mr *MockDelegateActorMockRecorder) AddNewIds(c, a interface{}) *gomock.Call {
// AddNewIDs indicates an expected call of AddNewIDs
func (mr *MockDelegateActorMockRecorder) AddNewIDs(c, a interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNewIds", reflect.TypeOf((*MockDelegateActor)(nil).AddNewIds), c, a)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNewIDs", reflect.TypeOf((*MockDelegateActor)(nil).AddNewIDs), c, a)
}
// Deliver mocks base method

10
pub/side_effect_actor.go
View File

@ -119,7 +119,7 @@ func (a *sideEffectActor) PostInbox(c context.Context, inboxIRI *url.URL, activi
wrapped.inboxIRI = inboxIRI
wrapped.newTransport = a.common.NewTransport
wrapped.deliver = a.Deliver
wrapped.addNewIds = a.AddNewIds
wrapped.addNewIds = a.AddNewIDs
res, err := streams.NewTypeResolver(wrapped.callbacks(other)...)
if err != nil {
return err
@ -360,10 +360,10 @@ func (a *sideEffectActor) PostOutbox(c context.Context, activity Activity, outbo
return
}
// AddNewIds creates new 'id' entries on an activity and its objects if it is a
// AddNewIDs creates new 'id' entries on an activity and its objects if it is a
// Create activity.
func (a *sideEffectActor) AddNewIds(c context.Context, activity Activity) error {
id, err := a.db.NewId(c, activity)
func (a *sideEffectActor) AddNewIDs(c context.Context, activity Activity) error {
id, err := a.db.NewID(c, activity)
if err != nil {
return err
}
@ -381,7 +381,7 @@ func (a *sideEffectActor) AddNewIds(c context.Context, activity Activity) error
if t == nil {
return fmt.Errorf("cannot add new id for object in Create: object is not embedded as a value literal")
}
id, err = a.db.NewId(c, t)
id, err = a.db.NewID(c, t)
if err != nil {
return err
}

22
pub/side_effect_actor_test.go
View File

@ -981,9 +981,9 @@ func TestPostOutbox(t *testing.T) {
})
}
// TestAddNewIds ensures that new 'id' properties are set on an activity and all
// TestAddNewIDs ensures that new 'id' properties are set on an activity and all
// of its 'object' property values if it is a Create activity.
func TestAddNewIds(t *testing.T) {
func TestAddNewIDs(t *testing.T) {
ctx := context.Background()
setupFn := func(ctl *gomock.Controller) (c *MockCommonBehavior, fp *MockFederatingProtocol, sp *MockSocialProtocol, db *MockDatabase, cl *MockClock, a DelegateActor) {
setupData()
@ -1006,9 +1006,9 @@ func TestAddNewIds(t *testing.T) {
ctl := gomock.NewController(t)
defer ctl.Finish()
_, _, _, db, _, a := setupFn(ctl)
db.EXPECT().NewId(ctx, testMyListenNoId).Return(mustParse(testNewActivityIRI2), nil)
db.EXPECT().NewID(ctx, testMyListenNoId).Return(mustParse(testNewActivityIRI2), nil)
// Run
err := a.AddNewIds(ctx, testMyListenNoId)
err := a.AddNewIDs(ctx, testMyListenNoId)
// Verify
assertEqual(t, err, nil)
resultId := testMyListenNoId.GetJSONLDId()
@ -1020,9 +1020,9 @@ func TestAddNewIds(t *testing.T) {
ctl := gomock.NewController(t)
defer ctl.Finish()
_, _, _, db, _, a := setupFn(ctl)
db.EXPECT().NewId(ctx, testMyListen).Return(mustParse(testNewActivityIRI2), nil)
db.EXPECT().NewID(ctx, testMyListen).Return(mustParse(testNewActivityIRI2), nil)
// Run
err := a.AddNewIds(ctx, testMyListen)
err := a.AddNewIDs(ctx, testMyListen)
// Verify
assertEqual(t, err, nil)
resultId := testMyListen.GetJSONLDId()
@ -1034,10 +1034,10 @@ func TestAddNewIds(t *testing.T) {
ctl := gomock.NewController(t)
defer ctl.Finish()
_, _, _, db, _, a := setupFn(ctl)
db.EXPECT().NewId(ctx, testMyCreate).Return(mustParse(testNewActivityIRI2), nil)
db.EXPECT().NewId(ctx, testMyNote).Return(mustParse(testNewActivityIRI3), nil)
db.EXPECT().NewID(ctx, testMyCreate).Return(mustParse(testNewActivityIRI2), nil)
db.EXPECT().NewID(ctx, testMyNote).Return(mustParse(testNewActivityIRI3), nil)
// Run
err := a.AddNewIds(ctx, testMyCreate)
err := a.AddNewIDs(ctx, testMyCreate)
// Verify
assertEqual(t, err, nil)
op := testMyCreate.GetActivityStreamsObject()
@ -1054,9 +1054,9 @@ func TestAddNewIds(t *testing.T) {
ctl := gomock.NewController(t)
defer ctl.Finish()
_, _, _, db, _, a := setupFn(ctl)
db.EXPECT().NewId(ctx, testMyListenNoId).Return(mustParse(testNewActivityIRI2), nil)
db.EXPECT().NewID(ctx, testMyListenNoId).Return(mustParse(testNewActivityIRI2), nil)
// Run
err := a.AddNewIds(ctx, testMyListenNoId)
err := a.AddNewIDs(ctx, testMyListenNoId)
// Verify
assertEqual(t, err, nil)
op := testMyListenNoId.GetActivityStreamsObject()