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

Merge pull request #153 from superseriousbusiness/InboxForActor 

Inbox for actor
This commit is contained in:
Cory J Slep 2022-01-19 08:35:45 +01:00 committed by GitHub
parent d2deaac73f bffb780f1b
commit 143897756e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 312 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pub/database.go
View File

@ -58,6 +58,13 @@ type Database interface {
//
// The library makes this call only after acquiring a lock first.
OutboxForInbox(c context.Context, inboxIRI *url.URL) (outboxIRI *url.URL, err error)
// InboxForActor fetches the inbox corresponding to the given actorIRI.
//
// It is acceptable to just return nil for the inboxIRI. In this case, the library will
// attempt to resolve the inbox of the actor by remote dereferencing instead.
//
// The library makes this call only after acquiring a lock first.
InboxForActor(c context.Context, actorIRI *url.URL) (inboxIRI *url.URL, err error)
// Exists returns true if the database has an entry for the specified
// id. It may not be owned by this application instance.
//

466
pub/mock_database_test.go
View File

@ -6,138 +6,37 @@ package pub
import (
context "context"
vocab "github.com/go-fed/activity/streams/vocab"
gomock "github.com/golang/mock/gomock"
url "net/url"
reflect "reflect"
vocab "github.com/go-fed/activity/streams/vocab"
gomock "github.com/golang/mock/gomock"
)
// MockDatabase is a mock of Database interface
// MockDatabase is a mock of Database interface.
type MockDatabase struct {
ctrl *gomock.Controller
recorder *MockDatabaseMockRecorder
}
// MockDatabaseMockRecorder is the mock recorder for MockDatabase
// MockDatabaseMockRecorder is the mock recorder for MockDatabase.
type MockDatabaseMockRecorder struct {
mock *MockDatabase
}
// NewMockDatabase creates a new mock instance
// NewMockDatabase creates a new mock instance.
func NewMockDatabase(ctrl *gomock.Controller) *MockDatabase {
mock := &MockDatabase{ctrl: ctrl}
mock.recorder = &MockDatabaseMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use
// EXPECT returns an object that allows the caller to indicate expected use.
func (m *MockDatabase) EXPECT() *MockDatabaseMockRecorder {
return m.recorder
}
// Lock mocks base method
func (m *MockDatabase) Lock(c context.Context, id *url.URL) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Lock", c, id)
ret0, _ := ret[0].(error)
return ret0
}
// Lock indicates an expected call of Lock
func (mr *MockDatabaseMockRecorder) Lock(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Lock", reflect.TypeOf((*MockDatabase)(nil).Lock), c, id)
}
// Unlock mocks base method
func (m *MockDatabase) Unlock(c context.Context, id *url.URL) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Unlock", c, id)
ret0, _ := ret[0].(error)
return ret0
}
// Unlock indicates an expected call of Unlock
func (mr *MockDatabaseMockRecorder) Unlock(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockDatabase)(nil).Unlock), c, id)
}
// InboxContains mocks base method
func (m *MockDatabase) InboxContains(c context.Context, inbox, id *url.URL) (bool, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "InboxContains", c, inbox, id)
ret0, _ := ret[0].(bool)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// InboxContains indicates an expected call of InboxContains
func (mr *MockDatabaseMockRecorder) InboxContains(c, inbox, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InboxContains", reflect.TypeOf((*MockDatabase)(nil).InboxContains), c, inbox, id)
}
// GetInbox mocks base method
func (m *MockDatabase) GetInbox(c context.Context, inboxIRI *url.URL) (vocab.ActivityStreamsOrderedCollectionPage, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetInbox", c, inboxIRI)
ret0, _ := ret[0].(vocab.ActivityStreamsOrderedCollectionPage)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// GetInbox indicates an expected call of GetInbox
func (mr *MockDatabaseMockRecorder) GetInbox(c, inboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInbox", reflect.TypeOf((*MockDatabase)(nil).GetInbox), c, inboxIRI)
}
// SetInbox mocks base method
func (m *MockDatabase) SetInbox(c context.Context, inbox vocab.ActivityStreamsOrderedCollectionPage) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "SetInbox", c, inbox)
ret0, _ := ret[0].(error)
return ret0
}
// SetInbox indicates an expected call of SetInbox
func (mr *MockDatabaseMockRecorder) SetInbox(c, inbox interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetInbox", reflect.TypeOf((*MockDatabase)(nil).SetInbox), c, inbox)
}
// Owns mocks base method
func (m *MockDatabase) Owns(c context.Context, id *url.URL) (bool, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Owns", c, id)
ret0, _ := ret[0].(bool)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Owns indicates an expected call of Owns
func (mr *MockDatabaseMockRecorder) Owns(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Owns", reflect.TypeOf((*MockDatabase)(nil).Owns), c, id)
}
// ActorForOutbox mocks base method
func (m *MockDatabase) ActorForOutbox(c context.Context, outboxIRI *url.URL) (*url.URL, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ActorForOutbox", c, outboxIRI)
ret0, _ := ret[0].(*url.URL)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// ActorForOutbox indicates an expected call of ActorForOutbox
func (mr *MockDatabaseMockRecorder) ActorForOutbox(c, outboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ActorForOutbox", reflect.TypeOf((*MockDatabase)(nil).ActorForOutbox), c, outboxIRI)
}
// ActorForInbox mocks base method
// ActorForInbox mocks base method.
func (m *MockDatabase) ActorForInbox(c context.Context, inboxIRI *url.URL) (*url.URL, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ActorForInbox", c, inboxIRI)
@ -146,28 +45,56 @@ func (m *MockDatabase) ActorForInbox(c context.Context, inboxIRI *url.URL) (*url
return ret0, ret1
}
// ActorForInbox indicates an expected call of ActorForInbox
// ActorForInbox indicates an expected call of ActorForInbox.
func (mr *MockDatabaseMockRecorder) ActorForInbox(c, inboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ActorForInbox", reflect.TypeOf((*MockDatabase)(nil).ActorForInbox), c, inboxIRI)
}
// OutboxForInbox mocks base method
func (m *MockDatabase) OutboxForInbox(c context.Context, inboxIRI *url.URL) (*url.URL, error) {
// ActorForOutbox mocks base method.
func (m *MockDatabase) ActorForOutbox(c context.Context, outboxIRI *url.URL) (*url.URL, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "OutboxForInbox", c, inboxIRI)
ret := m.ctrl.Call(m, "ActorForOutbox", c, outboxIRI)
ret0, _ := ret[0].(*url.URL)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// OutboxForInbox indicates an expected call of OutboxForInbox
func (mr *MockDatabaseMockRecorder) OutboxForInbox(c, inboxIRI interface{}) *gomock.Call {
// ActorForOutbox indicates an expected call of ActorForOutbox.
func (mr *MockDatabaseMockRecorder) ActorForOutbox(c, outboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OutboxForInbox", reflect.TypeOf((*MockDatabase)(nil).OutboxForInbox), c, inboxIRI)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ActorForOutbox", reflect.TypeOf((*MockDatabase)(nil).ActorForOutbox), c, outboxIRI)
}
// Exists mocks base method
// Create mocks base method.
func (m *MockDatabase) Create(c context.Context, asType vocab.Type) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", c, asType)
ret0, _ := ret[0].(error)
return ret0
}
// Create indicates an expected call of Create.
func (mr *MockDatabaseMockRecorder) Create(c, asType interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockDatabase)(nil).Create), c, asType)
}
// Delete mocks base method.
func (m *MockDatabase) Delete(c context.Context, id *url.URL) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", c, id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete.
func (mr *MockDatabaseMockRecorder) Delete(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockDatabase)(nil).Delete), c, id)
}
// Exists mocks base method.
func (m *MockDatabase) Exists(c context.Context, id *url.URL) (bool, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Exists", c, id)
@ -176,114 +103,13 @@ func (m *MockDatabase) Exists(c context.Context, id *url.URL) (bool, error) {
return ret0, ret1
}
// Exists indicates an expected call of Exists
// Exists indicates an expected call of Exists.
func (mr *MockDatabaseMockRecorder) Exists(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exists", reflect.TypeOf((*MockDatabase)(nil).Exists), c, id)
}
// Get mocks base method
func (m *MockDatabase) Get(c context.Context, id *url.URL) (vocab.Type, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", c, id)
ret0, _ := ret[0].(vocab.Type)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get
func (mr *MockDatabaseMockRecorder) Get(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDatabase)(nil).Get), c, id)
}
// Create mocks base method
func (m *MockDatabase) Create(c context.Context, asType vocab.Type) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Create", c, asType)
ret0, _ := ret[0].(error)
return ret0
}
// Create indicates an expected call of Create
func (mr *MockDatabaseMockRecorder) Create(c, asType interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockDatabase)(nil).Create), c, asType)
}
// Update mocks base method
func (m *MockDatabase) Update(c context.Context, asType vocab.Type) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", c, asType)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update
func (mr *MockDatabaseMockRecorder) Update(c, asType interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockDatabase)(nil).Update), c, asType)
}
// Delete mocks base method
func (m *MockDatabase) Delete(c context.Context, id *url.URL) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Delete", c, id)
ret0, _ := ret[0].(error)
return ret0
}
// Delete indicates an expected call of Delete
func (mr *MockDatabaseMockRecorder) Delete(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockDatabase)(nil).Delete), c, id)
}
// GetOutbox mocks base method
func (m *MockDatabase) GetOutbox(c context.Context, outboxIRI *url.URL) (vocab.ActivityStreamsOrderedCollectionPage, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetOutbox", c, outboxIRI)
ret0, _ := ret[0].(vocab.ActivityStreamsOrderedCollectionPage)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// GetOutbox indicates an expected call of GetOutbox
func (mr *MockDatabaseMockRecorder) GetOutbox(c, outboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOutbox", reflect.TypeOf((*MockDatabase)(nil).GetOutbox), c, outboxIRI)
}
// SetOutbox mocks base method
func (m *MockDatabase) SetOutbox(c context.Context, outbox vocab.ActivityStreamsOrderedCollectionPage) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "SetOutbox", c, outbox)
ret0, _ := ret[0].(error)
return ret0
}
// SetOutbox indicates an expected call of SetOutbox
func (mr *MockDatabaseMockRecorder) SetOutbox(c, outbox interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
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) {
m.ctrl.T.Helper()
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 {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewID", reflect.TypeOf((*MockDatabase)(nil).NewID), c, t)
}
// Followers mocks base method
// Followers mocks base method.
func (m *MockDatabase) Followers(c context.Context, actorIRI *url.URL) (vocab.ActivityStreamsCollection, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Followers", c, actorIRI)
@ -292,13 +118,13 @@ func (m *MockDatabase) Followers(c context.Context, actorIRI *url.URL) (vocab.Ac
return ret0, ret1
}
// Followers indicates an expected call of Followers
// Followers indicates an expected call of Followers.
func (mr *MockDatabaseMockRecorder) Followers(c, actorIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Followers", reflect.TypeOf((*MockDatabase)(nil).Followers), c, actorIRI)
}
// Following mocks base method
// Following mocks base method.
func (m *MockDatabase) Following(c context.Context, actorIRI *url.URL) (vocab.ActivityStreamsCollection, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Following", c, actorIRI)
@ -307,13 +133,88 @@ func (m *MockDatabase) Following(c context.Context, actorIRI *url.URL) (vocab.Ac
return ret0, ret1
}
// Following indicates an expected call of Following
// Following indicates an expected call of Following.
func (mr *MockDatabaseMockRecorder) Following(c, actorIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Following", reflect.TypeOf((*MockDatabase)(nil).Following), c, actorIRI)
}
// Liked mocks base method
// Get mocks base method.
func (m *MockDatabase) Get(c context.Context, id *url.URL) (vocab.Type, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Get", c, id)
ret0, _ := ret[0].(vocab.Type)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Get indicates an expected call of Get.
func (mr *MockDatabaseMockRecorder) Get(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDatabase)(nil).Get), c, id)
}
// GetInbox mocks base method.
func (m *MockDatabase) GetInbox(c context.Context, inboxIRI *url.URL) (vocab.ActivityStreamsOrderedCollectionPage, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetInbox", c, inboxIRI)
ret0, _ := ret[0].(vocab.ActivityStreamsOrderedCollectionPage)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// GetInbox indicates an expected call of GetInbox.
func (mr *MockDatabaseMockRecorder) GetInbox(c, inboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInbox", reflect.TypeOf((*MockDatabase)(nil).GetInbox), c, inboxIRI)
}
// GetOutbox mocks base method.
func (m *MockDatabase) GetOutbox(c context.Context, outboxIRI *url.URL) (vocab.ActivityStreamsOrderedCollectionPage, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetOutbox", c, outboxIRI)
ret0, _ := ret[0].(vocab.ActivityStreamsOrderedCollectionPage)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// GetOutbox indicates an expected call of GetOutbox.
func (mr *MockDatabaseMockRecorder) GetOutbox(c, outboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOutbox", reflect.TypeOf((*MockDatabase)(nil).GetOutbox), c, outboxIRI)
}
// InboxContains mocks base method.
func (m *MockDatabase) InboxContains(c context.Context, inbox, id *url.URL) (bool, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "InboxContains", c, inbox, id)
ret0, _ := ret[0].(bool)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// InboxContains indicates an expected call of InboxContains.
func (mr *MockDatabaseMockRecorder) InboxContains(c, inbox, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InboxContains", reflect.TypeOf((*MockDatabase)(nil).InboxContains), c, inbox, id)
}
// InboxForActor mocks base method.
func (m *MockDatabase) InboxForActor(c context.Context, actorIRI *url.URL) (*url.URL, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "InboxForActor", c, actorIRI)
ret0, _ := ret[0].(*url.URL)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// InboxForActor indicates an expected call of InboxForActor.
func (mr *MockDatabaseMockRecorder) InboxForActor(c, actorIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InboxForActor", reflect.TypeOf((*MockDatabase)(nil).InboxForActor), c, actorIRI)
}
// Liked mocks base method.
func (m *MockDatabase) Liked(c context.Context, actorIRI *url.URL) (vocab.ActivityStreamsCollection, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Liked", c, actorIRI)
@ -322,8 +223,123 @@ func (m *MockDatabase) Liked(c context.Context, actorIRI *url.URL) (vocab.Activi
return ret0, ret1
}
// Liked indicates an expected call of Liked
// Liked indicates an expected call of Liked.
func (mr *MockDatabaseMockRecorder) Liked(c, actorIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Liked", reflect.TypeOf((*MockDatabase)(nil).Liked), c, actorIRI)
}
// Lock mocks base method.
func (m *MockDatabase) Lock(c context.Context, id *url.URL) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Lock", c, id)
ret0, _ := ret[0].(error)
return ret0
}
// Lock indicates an expected call of Lock.
func (mr *MockDatabaseMockRecorder) Lock(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Lock", reflect.TypeOf((*MockDatabase)(nil).Lock), c, id)
}
// 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)
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 {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewID", reflect.TypeOf((*MockDatabase)(nil).NewID), c, t)
}
// OutboxForInbox mocks base method.
func (m *MockDatabase) OutboxForInbox(c context.Context, inboxIRI *url.URL) (*url.URL, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "OutboxForInbox", c, inboxIRI)
ret0, _ := ret[0].(*url.URL)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// OutboxForInbox indicates an expected call of OutboxForInbox.
func (mr *MockDatabaseMockRecorder) OutboxForInbox(c, inboxIRI interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OutboxForInbox", reflect.TypeOf((*MockDatabase)(nil).OutboxForInbox), c, inboxIRI)
}
// Owns mocks base method.
func (m *MockDatabase) Owns(c context.Context, id *url.URL) (bool, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Owns", c, id)
ret0, _ := ret[0].(bool)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// Owns indicates an expected call of Owns.
func (mr *MockDatabaseMockRecorder) Owns(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Owns", reflect.TypeOf((*MockDatabase)(nil).Owns), c, id)
}
// SetInbox mocks base method.
func (m *MockDatabase) SetInbox(c context.Context, inbox vocab.ActivityStreamsOrderedCollectionPage) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "SetInbox", c, inbox)
ret0, _ := ret[0].(error)
return ret0
}
// SetInbox indicates an expected call of SetInbox.
func (mr *MockDatabaseMockRecorder) SetInbox(c, inbox interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetInbox", reflect.TypeOf((*MockDatabase)(nil).SetInbox), c, inbox)
}
// SetOutbox mocks base method.
func (m *MockDatabase) SetOutbox(c context.Context, outbox vocab.ActivityStreamsOrderedCollectionPage) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "SetOutbox", c, outbox)
ret0, _ := ret[0].(error)
return ret0
}
// SetOutbox indicates an expected call of SetOutbox.
func (mr *MockDatabaseMockRecorder) SetOutbox(c, outbox interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetOutbox", reflect.TypeOf((*MockDatabase)(nil).SetOutbox), c, outbox)
}
// Unlock mocks base method.
func (m *MockDatabase) Unlock(c context.Context, id *url.URL) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Unlock", c, id)
ret0, _ := ret[0].(error)
return ret0
}
// Unlock indicates an expected call of Unlock.
func (mr *MockDatabaseMockRecorder) Unlock(c, id interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Unlock", reflect.TypeOf((*MockDatabase)(nil).Unlock), c, id)
}
// Update mocks base method.
func (m *MockDatabase) Update(c context.Context, asType vocab.Type) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Update", c, asType)
ret0, _ := ret[0].(error)
return ret0
}
// Update indicates an expected call of Update.
func (mr *MockDatabaseMockRecorder) Update(c, asType interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockDatabase)(nil).Update), c, asType)
}

61
pub/side_effect_actor.go
View File

@ -4,10 +4,11 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/go-fed/activity/streams"
"github.com/go-fed/activity/streams/vocab"
"net/http"
"net/url"
"github.com/go-fed/activity/streams"
"github.com/go-fed/activity/streams/vocab"
)
// sideEffectActor must satisfy the DelegateActor interface.
@ -676,18 +677,64 @@ func (a *sideEffectActor) prepare(c context.Context, outboxIRI *url.URL, activit
// server MAY deliver that object to all known sharedInbox endpoints
// on the network.
r = filterURLs(r, IsPublic)
// first check if the implemented database logic can return any inboxes
// from our list of actor IRIs.
foundInboxesFromDB := []*url.URL{}
foundActorsFromDB := []*url.URL{}
for _, actorIRI := range r {
// BEGIN LOCK
err = a.db.Lock(c, actorIRI)
if err != nil {
return
}
inbox, err := a.db.InboxForActor(c, actorIRI)
if err != nil {
// bail on error
a.db.Unlock(c, actorIRI)
return nil, err
}
if inbox != nil {
// we have a hit
foundInboxesFromDB = append(foundInboxesFromDB, inbox)
foundActorsFromDB = append(foundActorsFromDB, actorIRI)
}
// END LOCK
a.db.Unlock(c, actorIRI)
if err != nil {
return nil, err
}
}
// for every actor we found an inbox for in the db, we should
// remove it from the list of actors we still need to dereference
for _, actorIRI := range foundActorsFromDB {
r = removeOne(r, actorIRI)
}
// look for any actors' inboxes that weren't already discovered above;
// find these by making dereference calls to remote instances
t, err := a.common.NewTransport(c, outboxIRI, goFedUserAgent())
if err != nil {
return nil, err
}
receiverActors, err := a.resolveInboxes(c, t, r, 0, a.s2s.MaxDeliveryRecursionDepth(c))
foundActorsFromRemote, err := a.resolveActors(c, t, r, 0, a.s2s.MaxDeliveryRecursionDepth(c))
if err != nil {
return nil, err
}
targets, err := getInboxes(receiverActors)
foundInboxesFromRemote, err := getInboxes(foundActorsFromRemote)
if err != nil {
return nil, err
}
// combine this list of dereferenced inbox IRIs with the inboxes we already
// found in the db, to make a complete list of target IRIs
targets := []*url.URL{}
targets = append(targets, foundInboxesFromDB...)
targets = append(targets, foundInboxesFromRemote...)
// Get inboxes of sender.
err = a.db.Lock(c, outboxIRI)
if err != nil {
@ -723,7 +770,7 @@ func (a *sideEffectActor) prepare(c context.Context, outboxIRI *url.URL, activit
return r, nil
}
// resolveInboxes takes a list of Actor id URIs and returns them as concrete
// resolveActors takes a list of Actor id URIs and returns them as concrete
// instances of actorObject. It attempts to apply recursively when it encounters
// a target that is a Collection or OrderedCollection.
//
@ -733,7 +780,7 @@ func (a *sideEffectActor) prepare(c context.Context, outboxIRI *url.URL, activit
// dereference the collection, WITH the user's credentials.
//
// Note that this also applies to CollectionPage and OrderedCollectionPage.
func (a *sideEffectActor) resolveInboxes(c context.Context, t Transport, r []*url.URL, depth, maxDepth int) (actors []vocab.Type, err error) {
func (a *sideEffectActor) resolveActors(c context.Context, t Transport, r []*url.URL, depth, maxDepth int) (actors []vocab.Type, err error) {
if maxDepth > 0 && depth >= maxDepth {
return
}
@ -748,7 +795,7 @@ func (a *sideEffectActor) resolveInboxes(c context.Context, t Transport, r []*ur
continue
}
var recurActors []vocab.Type
recurActors, err = a.resolveInboxes(c, t, more, depth+1, maxDepth)
recurActors, err = a.resolveActors(c, t, more, depth+1, maxDepth)
if err != nil {
return
}

10
pub/util.go
View File

@ -399,6 +399,16 @@ func dedupeIRIs(recipients, ignored []*url.URL) (out []*url.URL) {
return
}
// removeOne removes any occurrences of entry from a slice of entries.
func removeOne(entries []*url.URL, entry *url.URL) (out []*url.URL) {
for _, e := range entries {
if e.String() != entry.String() {
out = append(out, e)
}
}
return out
}
// stripHiddenRecipients removes "bto" and "bcc" from the activity.
//
// Note that this requirement of the specification is under "Section 6: Client