tests + announce notification fix (#193)
This commit is contained in:
parent
25edd57eaf
commit
ff05046df7
|
@ -24,37 +24,12 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/stretchr/testify/suite"
|
"github.com/stretchr/testify/suite"
|
||||||
"github.com/superseriousbusiness/gotosocial/testrig"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type AccountTestSuite struct {
|
type AccountTestSuite struct {
|
||||||
BunDBStandardTestSuite
|
BunDBStandardTestSuite
|
||||||
}
|
}
|
||||||
|
|
||||||
func (suite *AccountTestSuite) SetupSuite() {
|
|
||||||
suite.testTokens = testrig.NewTestTokens()
|
|
||||||
suite.testClients = testrig.NewTestClients()
|
|
||||||
suite.testApplications = testrig.NewTestApplications()
|
|
||||||
suite.testUsers = testrig.NewTestUsers()
|
|
||||||
suite.testAccounts = testrig.NewTestAccounts()
|
|
||||||
suite.testAttachments = testrig.NewTestAttachments()
|
|
||||||
suite.testStatuses = testrig.NewTestStatuses()
|
|
||||||
suite.testTags = testrig.NewTestTags()
|
|
||||||
suite.testMentions = testrig.NewTestMentions()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *AccountTestSuite) SetupTest() {
|
|
||||||
suite.config = testrig.NewTestConfig()
|
|
||||||
suite.db = testrig.NewTestDB()
|
|
||||||
suite.log = testrig.NewTestLog()
|
|
||||||
|
|
||||||
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *AccountTestSuite) TearDownTest() {
|
|
||||||
testrig.StandardDBTeardown(suite.db)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *AccountTestSuite) TestGetAccountByIDWithExtras() {
|
func (suite *AccountTestSuite) TestGetAccountByIDWithExtras() {
|
||||||
account, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID)
|
account, err := suite.db.GetAccountByID(context.Background(), suite.testAccounts["local_account_1"].ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -24,37 +24,12 @@ import (
|
||||||
|
|
||||||
"github.com/stretchr/testify/suite"
|
"github.com/stretchr/testify/suite"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||||
"github.com/superseriousbusiness/gotosocial/testrig"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type BasicTestSuite struct {
|
type BasicTestSuite struct {
|
||||||
BunDBStandardTestSuite
|
BunDBStandardTestSuite
|
||||||
}
|
}
|
||||||
|
|
||||||
func (suite *BasicTestSuite) SetupSuite() {
|
|
||||||
suite.testTokens = testrig.NewTestTokens()
|
|
||||||
suite.testClients = testrig.NewTestClients()
|
|
||||||
suite.testApplications = testrig.NewTestApplications()
|
|
||||||
suite.testUsers = testrig.NewTestUsers()
|
|
||||||
suite.testAccounts = testrig.NewTestAccounts()
|
|
||||||
suite.testAttachments = testrig.NewTestAttachments()
|
|
||||||
suite.testStatuses = testrig.NewTestStatuses()
|
|
||||||
suite.testTags = testrig.NewTestTags()
|
|
||||||
suite.testMentions = testrig.NewTestMentions()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *BasicTestSuite) SetupTest() {
|
|
||||||
suite.config = testrig.NewTestConfig()
|
|
||||||
suite.db = testrig.NewTestDB()
|
|
||||||
suite.log = testrig.NewTestLog()
|
|
||||||
|
|
||||||
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *BasicTestSuite) TearDownTest() {
|
|
||||||
testrig.StandardDBTeardown(suite.db)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *BasicTestSuite) TestGetAccountByID() {
|
func (suite *BasicTestSuite) TestGetAccountByID() {
|
||||||
testAccount := suite.testAccounts["local_account_1"]
|
testAccount := suite.testAccounts["local_account_1"]
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ import (
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/config"
|
"github.com/superseriousbusiness/gotosocial/internal/config"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/testrig"
|
||||||
)
|
)
|
||||||
|
|
||||||
type BunDBStandardTestSuite struct {
|
type BunDBStandardTestSuite struct {
|
||||||
|
@ -44,3 +45,27 @@ type BunDBStandardTestSuite struct {
|
||||||
testTags map[string]*gtsmodel.Tag
|
testTags map[string]*gtsmodel.Tag
|
||||||
testMentions map[string]*gtsmodel.Mention
|
testMentions map[string]*gtsmodel.Mention
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (suite *BunDBStandardTestSuite) SetupSuite() {
|
||||||
|
suite.testTokens = testrig.NewTestTokens()
|
||||||
|
suite.testClients = testrig.NewTestClients()
|
||||||
|
suite.testApplications = testrig.NewTestApplications()
|
||||||
|
suite.testUsers = testrig.NewTestUsers()
|
||||||
|
suite.testAccounts = testrig.NewTestAccounts()
|
||||||
|
suite.testAttachments = testrig.NewTestAttachments()
|
||||||
|
suite.testStatuses = testrig.NewTestStatuses()
|
||||||
|
suite.testTags = testrig.NewTestTags()
|
||||||
|
suite.testMentions = testrig.NewTestMentions()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *BunDBStandardTestSuite) SetupTest() {
|
||||||
|
suite.config = testrig.NewTestConfig()
|
||||||
|
suite.db = testrig.NewTestDB()
|
||||||
|
suite.log = testrig.NewTestLog()
|
||||||
|
|
||||||
|
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *BunDBStandardTestSuite) TearDownTest() {
|
||||||
|
testrig.StandardDBTeardown(suite.db)
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
/*
|
||||||
|
GoToSocial
|
||||||
|
Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package bundb_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/suite"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MentionTestSuite struct {
|
||||||
|
BunDBStandardTestSuite
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *MentionTestSuite) TestGetMention() {
|
||||||
|
m := suite.testMentions["local_user_2_mention_zork"]
|
||||||
|
|
||||||
|
dbMention, err := suite.db.GetMention(context.Background(), m.ID)
|
||||||
|
suite.NoError(err)
|
||||||
|
suite.NotNil(dbMention)
|
||||||
|
suite.Equal(m.ID, dbMention.ID)
|
||||||
|
suite.Equal(m.OriginAccountID, dbMention.OriginAccountID)
|
||||||
|
suite.NotNil(dbMention.OriginAccount)
|
||||||
|
suite.Equal(m.TargetAccountID, dbMention.TargetAccountID)
|
||||||
|
suite.NotNil(dbMention.TargetAccount)
|
||||||
|
suite.Equal(m.StatusID, dbMention.StatusID)
|
||||||
|
suite.NotNil(dbMention.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *MentionTestSuite) TestGetMentions() {
|
||||||
|
m := suite.testMentions["local_user_2_mention_zork"]
|
||||||
|
|
||||||
|
dbMentions, err := suite.db.GetMentions(context.Background(), []string{m.ID})
|
||||||
|
suite.NoError(err)
|
||||||
|
suite.Len(dbMentions, 1)
|
||||||
|
dbMention := dbMentions[0]
|
||||||
|
suite.Equal(m.ID, dbMention.ID)
|
||||||
|
suite.Equal(m.OriginAccountID, dbMention.OriginAccountID)
|
||||||
|
suite.NotNil(dbMention.OriginAccount)
|
||||||
|
suite.Equal(m.TargetAccountID, dbMention.TargetAccountID)
|
||||||
|
suite.NotNil(dbMention.TargetAccount)
|
||||||
|
suite.Equal(m.StatusID, dbMention.StatusID)
|
||||||
|
suite.NotNil(dbMention.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMentionTestSuite(t *testing.T) {
|
||||||
|
suite.Run(t, new(MentionTestSuite))
|
||||||
|
}
|
|
@ -25,37 +25,12 @@ import (
|
||||||
|
|
||||||
"github.com/stretchr/testify/suite"
|
"github.com/stretchr/testify/suite"
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||||
"github.com/superseriousbusiness/gotosocial/testrig"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type RelationshipTestSuite struct {
|
type RelationshipTestSuite struct {
|
||||||
BunDBStandardTestSuite
|
BunDBStandardTestSuite
|
||||||
}
|
}
|
||||||
|
|
||||||
func (suite *RelationshipTestSuite) SetupSuite() {
|
|
||||||
suite.testTokens = testrig.NewTestTokens()
|
|
||||||
suite.testClients = testrig.NewTestClients()
|
|
||||||
suite.testApplications = testrig.NewTestApplications()
|
|
||||||
suite.testUsers = testrig.NewTestUsers()
|
|
||||||
suite.testAccounts = testrig.NewTestAccounts()
|
|
||||||
suite.testAttachments = testrig.NewTestAttachments()
|
|
||||||
suite.testStatuses = testrig.NewTestStatuses()
|
|
||||||
suite.testTags = testrig.NewTestTags()
|
|
||||||
suite.testMentions = testrig.NewTestMentions()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *RelationshipTestSuite) SetupTest() {
|
|
||||||
suite.config = testrig.NewTestConfig()
|
|
||||||
suite.db = testrig.NewTestDB()
|
|
||||||
suite.log = testrig.NewTestLog()
|
|
||||||
|
|
||||||
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *RelationshipTestSuite) TearDownTest() {
|
|
||||||
testrig.StandardDBTeardown(suite.db)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *RelationshipTestSuite) TestIsBlocked() {
|
func (suite *RelationshipTestSuite) TestIsBlocked() {
|
||||||
suite.Suite.T().Skip("TODO: implement")
|
suite.Suite.T().Skip("TODO: implement")
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,37 +23,12 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/suite"
|
"github.com/stretchr/testify/suite"
|
||||||
"github.com/superseriousbusiness/gotosocial/testrig"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type SessionTestSuite struct {
|
type SessionTestSuite struct {
|
||||||
BunDBStandardTestSuite
|
BunDBStandardTestSuite
|
||||||
}
|
}
|
||||||
|
|
||||||
func (suite *SessionTestSuite) SetupSuite() {
|
|
||||||
suite.testTokens = testrig.NewTestTokens()
|
|
||||||
suite.testClients = testrig.NewTestClients()
|
|
||||||
suite.testApplications = testrig.NewTestApplications()
|
|
||||||
suite.testUsers = testrig.NewTestUsers()
|
|
||||||
suite.testAccounts = testrig.NewTestAccounts()
|
|
||||||
suite.testAttachments = testrig.NewTestAttachments()
|
|
||||||
suite.testStatuses = testrig.NewTestStatuses()
|
|
||||||
suite.testTags = testrig.NewTestTags()
|
|
||||||
suite.testMentions = testrig.NewTestMentions()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *SessionTestSuite) SetupTest() {
|
|
||||||
suite.config = testrig.NewTestConfig()
|
|
||||||
suite.db = testrig.NewTestDB()
|
|
||||||
suite.log = testrig.NewTestLog()
|
|
||||||
|
|
||||||
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *SessionTestSuite) TearDownTest() {
|
|
||||||
testrig.StandardDBTeardown(suite.db)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *SessionTestSuite) TestGetSession() {
|
func (suite *SessionTestSuite) TestGetSession() {
|
||||||
session, err := suite.db.GetSession(context.Background())
|
session, err := suite.db.GetSession(context.Background())
|
||||||
suite.NoError(err)
|
suite.NoError(err)
|
||||||
|
|
|
@ -25,37 +25,12 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/stretchr/testify/suite"
|
"github.com/stretchr/testify/suite"
|
||||||
"github.com/superseriousbusiness/gotosocial/testrig"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type StatusTestSuite struct {
|
type StatusTestSuite struct {
|
||||||
BunDBStandardTestSuite
|
BunDBStandardTestSuite
|
||||||
}
|
}
|
||||||
|
|
||||||
func (suite *StatusTestSuite) SetupSuite() {
|
|
||||||
suite.testTokens = testrig.NewTestTokens()
|
|
||||||
suite.testClients = testrig.NewTestClients()
|
|
||||||
suite.testApplications = testrig.NewTestApplications()
|
|
||||||
suite.testUsers = testrig.NewTestUsers()
|
|
||||||
suite.testAccounts = testrig.NewTestAccounts()
|
|
||||||
suite.testAttachments = testrig.NewTestAttachments()
|
|
||||||
suite.testStatuses = testrig.NewTestStatuses()
|
|
||||||
suite.testTags = testrig.NewTestTags()
|
|
||||||
suite.testMentions = testrig.NewTestMentions()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *StatusTestSuite) SetupTest() {
|
|
||||||
suite.config = testrig.NewTestConfig()
|
|
||||||
suite.db = testrig.NewTestDB()
|
|
||||||
suite.log = testrig.NewTestLog()
|
|
||||||
|
|
||||||
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *StatusTestSuite) TearDownTest() {
|
|
||||||
testrig.StandardDBTeardown(suite.db)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *StatusTestSuite) TestGetStatusByID() {
|
func (suite *StatusTestSuite) TestGetStatusByID() {
|
||||||
status, err := suite.db.GetStatusByID(context.Background(), suite.testStatuses["local_account_1_status_1"].ID)
|
status, err := suite.db.GetStatusByID(context.Background(), suite.testStatuses["local_account_1_status_1"].ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -23,37 +23,12 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/suite"
|
"github.com/stretchr/testify/suite"
|
||||||
"github.com/superseriousbusiness/gotosocial/testrig"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type TimelineTestSuite struct {
|
type TimelineTestSuite struct {
|
||||||
BunDBStandardTestSuite
|
BunDBStandardTestSuite
|
||||||
}
|
}
|
||||||
|
|
||||||
func (suite *TimelineTestSuite) SetupSuite() {
|
|
||||||
suite.testTokens = testrig.NewTestTokens()
|
|
||||||
suite.testClients = testrig.NewTestClients()
|
|
||||||
suite.testApplications = testrig.NewTestApplications()
|
|
||||||
suite.testUsers = testrig.NewTestUsers()
|
|
||||||
suite.testAccounts = testrig.NewTestAccounts()
|
|
||||||
suite.testAttachments = testrig.NewTestAttachments()
|
|
||||||
suite.testStatuses = testrig.NewTestStatuses()
|
|
||||||
suite.testTags = testrig.NewTestTags()
|
|
||||||
suite.testMentions = testrig.NewTestMentions()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *TimelineTestSuite) SetupTest() {
|
|
||||||
suite.config = testrig.NewTestConfig()
|
|
||||||
suite.db = testrig.NewTestDB()
|
|
||||||
suite.log = testrig.NewTestLog()
|
|
||||||
|
|
||||||
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *TimelineTestSuite) TearDownTest() {
|
|
||||||
testrig.StandardDBTeardown(suite.db)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (suite *TimelineTestSuite) TestGetPublicTimeline() {
|
func (suite *TimelineTestSuite) TestGetPublicTimeline() {
|
||||||
viewingAccount := suite.testAccounts["local_account_1"]
|
viewingAccount := suite.testAccounts["local_account_1"]
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ import (
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/messages"
|
"github.com/superseriousbusiness/gotosocial/internal/messages"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (p *processor) processFromClientAPI(ctx context.Context, clientMsg messages.FromClientAPI) error {
|
func (p *processor) ProcessFromClientAPI(ctx context.Context, clientMsg messages.FromClientAPI) error {
|
||||||
switch clientMsg.APActivityType {
|
switch clientMsg.APActivityType {
|
||||||
case ap.ActivityCreate:
|
case ap.ActivityCreate:
|
||||||
// CREATE
|
// CREATE
|
||||||
|
|
|
@ -61,17 +61,15 @@ func (p *processor) notifyStatus(ctx context.Context, status *gtsmodel.Status) e
|
||||||
}
|
}
|
||||||
|
|
||||||
// make sure a notif doesn't already exist for this mention
|
// make sure a notif doesn't already exist for this mention
|
||||||
err := p.db.GetWhere(ctx, []db.Where{
|
if err := p.db.GetWhere(ctx, []db.Where{
|
||||||
{Key: "notification_type", Value: gtsmodel.NotificationMention},
|
{Key: "notification_type", Value: gtsmodel.NotificationMention},
|
||||||
{Key: "target_account_id", Value: m.TargetAccountID},
|
{Key: "target_account_id", Value: m.TargetAccountID},
|
||||||
{Key: "origin_account_id", Value: status.AccountID},
|
{Key: "origin_account_id", Value: m.OriginAccountID},
|
||||||
{Key: "status_id", Value: status.ID},
|
{Key: "status_id", Value: m.StatusID},
|
||||||
}, >smodel.Notification{})
|
}, >smodel.Notification{}); err == nil {
|
||||||
if err == nil {
|
|
||||||
// notification exists already so just continue
|
// notification exists already so just continue
|
||||||
continue
|
continue
|
||||||
}
|
} else if err != db.ErrNoEntries {
|
||||||
if err != db.ErrNoEntries {
|
|
||||||
// there's a real error in the db
|
// there's a real error in the db
|
||||||
return fmt.Errorf("notifyStatus: error checking existence of notification for mention with id %s : %s", m.ID, err)
|
return fmt.Errorf("notifyStatus: error checking existence of notification for mention with id %s : %s", m.ID, err)
|
||||||
}
|
}
|
||||||
|
@ -254,7 +252,7 @@ func (p *processor) notifyAnnounce(ctx context.Context, status *gtsmodel.Status)
|
||||||
status.BoostOfAccount = boostedAcct
|
status.BoostOfAccount = boostedAcct
|
||||||
}
|
}
|
||||||
|
|
||||||
if status.BoostOfAccount.Domain == "" {
|
if status.BoostOfAccount.Domain != "" {
|
||||||
// remote account, nothing to do
|
// remote account, nothing to do
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ import (
|
||||||
"github.com/superseriousbusiness/gotosocial/internal/messages"
|
"github.com/superseriousbusiness/gotosocial/internal/messages"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (p *processor) processFromFederator(ctx context.Context, federatorMsg messages.FromFederator) error {
|
func (p *processor) ProcessFromFederator(ctx context.Context, federatorMsg messages.FromFederator) error {
|
||||||
l := p.log.WithFields(logrus.Fields{
|
l := p.log.WithFields(logrus.Fields{
|
||||||
"func": "processFromFederator",
|
"func": "processFromFederator",
|
||||||
"federatorMsg": fmt.Sprintf("%+v", federatorMsg),
|
"federatorMsg": fmt.Sprintf("%+v", federatorMsg),
|
||||||
|
@ -104,9 +104,7 @@ func (p *processor) processFromFederator(ctx context.Context, federatorMsg messa
|
||||||
incomingAnnounce.ID = incomingAnnounceID
|
incomingAnnounce.ID = incomingAnnounceID
|
||||||
|
|
||||||
if err := p.db.PutStatus(ctx, incomingAnnounce); err != nil {
|
if err := p.db.PutStatus(ctx, incomingAnnounce); err != nil {
|
||||||
if err != db.ErrNoEntries {
|
return fmt.Errorf("error adding dereferenced announce to the db: %s", err)
|
||||||
return fmt.Errorf("error adding dereferenced announce to the db: %s", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := p.timelineStatus(ctx, incomingAnnounce); err != nil {
|
if err := p.timelineStatus(ctx, incomingAnnounce); err != nil {
|
||||||
|
|
|
@ -0,0 +1,86 @@
|
||||||
|
/*
|
||||||
|
GoToSocial
|
||||||
|
Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package processing_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/suite"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/ap"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/messages"
|
||||||
|
)
|
||||||
|
|
||||||
|
type FromFederatorTestSuite struct {
|
||||||
|
ProcessingStandardTestSuite
|
||||||
|
}
|
||||||
|
|
||||||
|
// remote_account_1 boosts the first status of local_account_1
|
||||||
|
func (suite *FromFederatorTestSuite) TestProcessFederationAnnounce() {
|
||||||
|
boostedStatus := suite.testStatuses["local_account_1_status_1"]
|
||||||
|
boostingAccount := suite.testAccounts["remote_account_1"]
|
||||||
|
announceStatus := >smodel.Status{}
|
||||||
|
announceStatus.URI = "https://example.org/some-announce-uri"
|
||||||
|
announceStatus.BoostOf = >smodel.Status{
|
||||||
|
URI: boostedStatus.URI,
|
||||||
|
}
|
||||||
|
announceStatus.CreatedAt = time.Now()
|
||||||
|
announceStatus.UpdatedAt = time.Now()
|
||||||
|
announceStatus.AccountID = boostingAccount.ID
|
||||||
|
announceStatus.AccountURI = boostingAccount.URI
|
||||||
|
announceStatus.Account = boostingAccount
|
||||||
|
announceStatus.Visibility = boostedStatus.Visibility
|
||||||
|
|
||||||
|
err := suite.processor.ProcessFromFederator(context.Background(), messages.FromFederator{
|
||||||
|
APObjectType: ap.ActivityAnnounce,
|
||||||
|
APActivityType: ap.ActivityCreate,
|
||||||
|
GTSModel: announceStatus,
|
||||||
|
ReceivingAccount: suite.testAccounts["local_account_1"],
|
||||||
|
})
|
||||||
|
suite.NoError(err)
|
||||||
|
|
||||||
|
// side effects should be triggered
|
||||||
|
// 1. status should have an ID, and be in the database
|
||||||
|
suite.NotEmpty(announceStatus.ID)
|
||||||
|
_, err = suite.db.GetStatusByID(context.Background(), announceStatus.ID)
|
||||||
|
suite.NoError(err)
|
||||||
|
|
||||||
|
// 2. a notification should exist for the announce
|
||||||
|
where := []db.Where{
|
||||||
|
{
|
||||||
|
Key: "status_id",
|
||||||
|
Value: announceStatus.ID,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
notif := >smodel.Notification{}
|
||||||
|
err = suite.db.GetWhere(context.Background(), where, notif)
|
||||||
|
suite.NoError(err)
|
||||||
|
suite.Equal(gtsmodel.NotificationReblog, notif.NotificationType)
|
||||||
|
suite.Equal(boostedStatus.AccountID, notif.TargetAccountID)
|
||||||
|
suite.Equal(announceStatus.AccountID, notif.OriginAccountID)
|
||||||
|
suite.Equal(announceStatus.ID, notif.StatusID)
|
||||||
|
suite.False(notif.Read)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFromFederatorTestSuite(t *testing.T) {
|
||||||
|
suite.Run(t, &FromFederatorTestSuite{})
|
||||||
|
}
|
|
@ -0,0 +1,47 @@
|
||||||
|
/*
|
||||||
|
GoToSocial
|
||||||
|
Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package processing_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/suite"
|
||||||
|
)
|
||||||
|
|
||||||
|
type NotificationTestSuite struct {
|
||||||
|
ProcessingStandardTestSuite
|
||||||
|
}
|
||||||
|
|
||||||
|
// get a notification where someone has liked our status
|
||||||
|
func (suite *NotificationTestSuite) TestGetNotifications() {
|
||||||
|
receivingAccount := suite.testAccounts["local_account_1"]
|
||||||
|
notifs, err := suite.processor.NotificationsGet(context.Background(), suite.testAutheds["local_account_1"], 10, "", "")
|
||||||
|
suite.NoError(err)
|
||||||
|
suite.Len(notifs, 1)
|
||||||
|
notif := notifs[0]
|
||||||
|
suite.NotNil(notif.Status)
|
||||||
|
suite.NotNil(notif.Status)
|
||||||
|
suite.NotNil(notif.Status.Account)
|
||||||
|
suite.Equal(receivingAccount.ID, notif.Status.Account.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNotificationTestSuite(t *testing.T) {
|
||||||
|
suite.Run(t, &NotificationTestSuite{})
|
||||||
|
}
|
|
@ -56,6 +56,10 @@ type Processor interface {
|
||||||
Start(ctx context.Context) error
|
Start(ctx context.Context) error
|
||||||
// Stop stops the processor cleanly, finishing handling any remaining messages before closing down.
|
// Stop stops the processor cleanly, finishing handling any remaining messages before closing down.
|
||||||
Stop() error
|
Stop() error
|
||||||
|
// ProcessFromClientAPI processes one message coming from the clientAPI channel, and triggers appropriate side effects.
|
||||||
|
ProcessFromClientAPI(ctx context.Context, clientMsg messages.FromClientAPI) error
|
||||||
|
// ProcessFromFederator processes one message coming from the federator channel, and triggers appropriate side effects.
|
||||||
|
ProcessFromFederator(ctx context.Context, federatorMsg messages.FromFederator) error
|
||||||
|
|
||||||
/*
|
/*
|
||||||
CLIENT API-FACING PROCESSING FUNCTIONS
|
CLIENT API-FACING PROCESSING FUNCTIONS
|
||||||
|
@ -290,14 +294,14 @@ func (p *processor) Start(ctx context.Context) error {
|
||||||
case clientMsg := <-p.fromClientAPI:
|
case clientMsg := <-p.fromClientAPI:
|
||||||
p.log.Tracef("received message FROM client API: %+v", clientMsg)
|
p.log.Tracef("received message FROM client API: %+v", clientMsg)
|
||||||
go func() {
|
go func() {
|
||||||
if err := p.processFromClientAPI(ctx, clientMsg); err != nil {
|
if err := p.ProcessFromClientAPI(ctx, clientMsg); err != nil {
|
||||||
p.log.Error(err)
|
p.log.Error(err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
case federatorMsg := <-p.fromFederator:
|
case federatorMsg := <-p.fromFederator:
|
||||||
p.log.Tracef("received message FROM federator: %+v", federatorMsg)
|
p.log.Tracef("received message FROM federator: %+v", federatorMsg)
|
||||||
go func() {
|
go func() {
|
||||||
if err := p.processFromFederator(ctx, federatorMsg); err != nil {
|
if err := p.ProcessFromFederator(ctx, federatorMsg); err != nil {
|
||||||
p.log.Error(err)
|
p.log.Error(err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -0,0 +1,124 @@
|
||||||
|
/*
|
||||||
|
GoToSocial
|
||||||
|
Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package processing_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"github.com/stretchr/testify/suite"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/blob"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/config"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/federation"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/media"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/oauth"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/processing"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/timeline"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/transport"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
|
||||||
|
"github.com/superseriousbusiness/gotosocial/testrig"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ProcessingStandardTestSuite struct {
|
||||||
|
// standard suite interfaces
|
||||||
|
suite.Suite
|
||||||
|
config *config.Config
|
||||||
|
db db.DB
|
||||||
|
log *logrus.Logger
|
||||||
|
storage blob.Storage
|
||||||
|
typeconverter typeutils.TypeConverter
|
||||||
|
transportController transport.Controller
|
||||||
|
federator federation.Federator
|
||||||
|
oauthServer oauth.Server
|
||||||
|
mediaHandler media.Handler
|
||||||
|
timelineManager timeline.Manager
|
||||||
|
|
||||||
|
// standard suite models
|
||||||
|
testTokens map[string]*gtsmodel.Token
|
||||||
|
testClients map[string]*gtsmodel.Client
|
||||||
|
testApplications map[string]*gtsmodel.Application
|
||||||
|
testUsers map[string]*gtsmodel.User
|
||||||
|
testAccounts map[string]*gtsmodel.Account
|
||||||
|
testAttachments map[string]*gtsmodel.MediaAttachment
|
||||||
|
testStatuses map[string]*gtsmodel.Status
|
||||||
|
testTags map[string]*gtsmodel.Tag
|
||||||
|
testMentions map[string]*gtsmodel.Mention
|
||||||
|
testAutheds map[string]*oauth.Auth
|
||||||
|
|
||||||
|
processor processing.Processor
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *ProcessingStandardTestSuite) SetupSuite() {
|
||||||
|
suite.testTokens = testrig.NewTestTokens()
|
||||||
|
suite.testClients = testrig.NewTestClients()
|
||||||
|
suite.testApplications = testrig.NewTestApplications()
|
||||||
|
suite.testUsers = testrig.NewTestUsers()
|
||||||
|
suite.testAccounts = testrig.NewTestAccounts()
|
||||||
|
suite.testAttachments = testrig.NewTestAttachments()
|
||||||
|
suite.testStatuses = testrig.NewTestStatuses()
|
||||||
|
suite.testTags = testrig.NewTestTags()
|
||||||
|
suite.testMentions = testrig.NewTestMentions()
|
||||||
|
suite.testAutheds = map[string]*oauth.Auth{
|
||||||
|
"local_account_1": {
|
||||||
|
Application: suite.testApplications["local_account_1"],
|
||||||
|
User: suite.testUsers["local_account_1"],
|
||||||
|
Account: suite.testAccounts["local_account_1"],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *ProcessingStandardTestSuite) SetupTest() {
|
||||||
|
suite.config = testrig.NewTestConfig()
|
||||||
|
suite.db = testrig.NewTestDB()
|
||||||
|
suite.log = testrig.NewTestLog()
|
||||||
|
suite.storage = testrig.NewTestStorage()
|
||||||
|
suite.typeconverter = testrig.NewTestTypeConverter(suite.db)
|
||||||
|
suite.transportController = testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil), suite.db)
|
||||||
|
suite.federator = testrig.NewTestFederator(suite.db, suite.transportController, suite.storage)
|
||||||
|
suite.oauthServer = testrig.NewTestOauthServer(suite.db)
|
||||||
|
suite.mediaHandler = testrig.NewTestMediaHandler(suite.db, suite.storage)
|
||||||
|
suite.timelineManager = testrig.NewTestTimelineManager(suite.db)
|
||||||
|
|
||||||
|
suite.processor = processing.NewProcessor(
|
||||||
|
suite.config,
|
||||||
|
suite.typeconverter,
|
||||||
|
suite.federator,
|
||||||
|
suite.oauthServer,
|
||||||
|
suite.mediaHandler,
|
||||||
|
suite.storage,
|
||||||
|
suite.timelineManager,
|
||||||
|
suite.db,
|
||||||
|
suite.log)
|
||||||
|
|
||||||
|
testrig.StandardDBSetup(suite.db, suite.testAccounts)
|
||||||
|
testrig.StandardStorageSetup(suite.storage, "../../testrig/media")
|
||||||
|
if err := suite.processor.Start(context.Background()); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (suite *ProcessingStandardTestSuite) TearDownTest() {
|
||||||
|
testrig.StandardDBTeardown(suite.db)
|
||||||
|
testrig.StandardStorageTeardown(suite.storage)
|
||||||
|
if err := suite.processor.Stop(); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue