summaryrefslogtreecommitdiff
path: root/internal/processing
diff options
context:
space:
mode:
Diffstat (limited to 'internal/processing')
-rw-r--r--internal/processing/account_test.go27
-rw-r--r--internal/processing/followrequest_test.go83
-rw-r--r--internal/processing/workers/federate.go11
-rw-r--r--internal/processing/workers/fromfediapi_test.go42
4 files changed, 99 insertions, 64 deletions
diff --git a/internal/processing/account_test.go b/internal/processing/account_test.go
index 83eebedba..82c28115e 100644
--- a/internal/processing/account_test.go
+++ b/internal/processing/account_test.go
@@ -21,6 +21,7 @@ import (
"context"
"encoding/json"
"fmt"
+ "io"
"testing"
"time"
@@ -55,7 +56,7 @@ func (suite *AccountTestSuite) TestAccountDeleteLocal() {
suite.NoError(errWithCode)
// the delete should be federated outwards to the following account's inbox
- var sent [][]byte
+ var sent []byte
delete := new(struct {
Actor string `json:"actor"`
ID string `json:"id"`
@@ -66,16 +67,22 @@ func (suite *AccountTestSuite) TestAccountDeleteLocal() {
})
if !testrig.WaitFor(func() bool {
- sentI, ok := suite.httpClient.SentMessages.Load(*followingAccount.SharedInboxURI)
- if ok {
- sent, ok = sentI.([][]byte)
- if !ok {
- panic("SentMessages entry was not [][]byte")
- }
- err = json.Unmarshal(sent[0], delete)
- return err == nil
+ delivery, ok := suite.state.Workers.Delivery.Queue.Pop()
+ if !ok {
+ return false
}
- return false
+ if !testrig.EqualRequestURIs(delivery.Request.URL, *followingAccount.SharedInboxURI) {
+ panic("differing request uris")
+ }
+ sent, err = io.ReadAll(delivery.Request.Body)
+ if err != nil {
+ panic("error reading body: " + err.Error())
+ }
+ err = json.Unmarshal(sent, delete)
+ if err != nil {
+ panic("error unmarshaling json: " + err.Error())
+ }
+ return true
}) {
suite.FailNow("timed out waiting for message")
}
diff --git a/internal/processing/followrequest_test.go b/internal/processing/followrequest_test.go
index 4c089be4a..db0419522 100644
--- a/internal/processing/followrequest_test.go
+++ b/internal/processing/followrequest_test.go
@@ -21,6 +21,7 @@ import (
"context"
"encoding/json"
"fmt"
+ "io"
"testing"
"time"
@@ -77,22 +78,6 @@ func (suite *FollowRequestTestSuite) TestFollowRequestAccept() {
Note: "",
}, relationship)
- // accept should be sent to Some_User
- var sent [][]byte
- if !testrig.WaitFor(func() bool {
- sentI, ok := suite.httpClient.SentMessages.Load(targetAccount.InboxURI)
- if ok {
- sent, ok = sentI.([][]byte)
- if !ok {
- panic("SentMessages entry was not []byte")
- }
- return true
- }
- return false
- }) {
- suite.FailNow("timed out waiting for message")
- }
-
accept := &struct {
Actor string `json:"actor"`
ID string `json:"id"`
@@ -106,8 +91,29 @@ func (suite *FollowRequestTestSuite) TestFollowRequestAccept() {
To string `json:"to"`
Type string `json:"type"`
}{}
- err = json.Unmarshal(sent[0], accept)
- suite.NoError(err)
+
+ // accept should be sent to Some_User
+ var sent []byte
+ if !testrig.WaitFor(func() bool {
+ delivery, ok := suite.state.Workers.Delivery.Queue.Pop()
+ if !ok {
+ return false
+ }
+ if !testrig.EqualRequestURIs(delivery.Request.URL, targetAccount.InboxURI) {
+ panic("differing request uris")
+ }
+ sent, err = io.ReadAll(delivery.Request.Body)
+ if err != nil {
+ panic("error reading body: " + err.Error())
+ }
+ err = json.Unmarshal(sent, accept)
+ if err != nil {
+ panic("error unmarshaling json: " + err.Error())
+ }
+ return true
+ }) {
+ suite.FailNow("timed out waiting for message")
+ }
suite.Equal(requestingAccount.URI, accept.Actor)
suite.Equal(targetAccount.URI, accept.Object.Actor)
@@ -144,22 +150,6 @@ func (suite *FollowRequestTestSuite) TestFollowRequestReject() {
suite.NoError(errWithCode)
suite.EqualValues(&apimodel.Relationship{ID: "01FHMQX3GAABWSM0S2VZEC2SWC", Following: false, ShowingReblogs: false, Notifying: false, FollowedBy: false, Blocking: false, BlockedBy: false, Muting: false, MutingNotifications: false, Requested: false, DomainBlocking: false, Endorsed: false, Note: ""}, relationship)
- // reject should be sent to Some_User
- var sent [][]byte
- if !testrig.WaitFor(func() bool {
- sentI, ok := suite.httpClient.SentMessages.Load(targetAccount.InboxURI)
- if ok {
- sent, ok = sentI.([][]byte)
- if !ok {
- panic("SentMessages entry was not []byte")
- }
- return true
- }
- return false
- }) {
- suite.FailNow("timed out waiting for message")
- }
-
reject := &struct {
Actor string `json:"actor"`
ID string `json:"id"`
@@ -173,8 +163,29 @@ func (suite *FollowRequestTestSuite) TestFollowRequestReject() {
To string `json:"to"`
Type string `json:"type"`
}{}
- err = json.Unmarshal(sent[0], reject)
- suite.NoError(err)
+
+ // reject should be sent to Some_User
+ var sent []byte
+ if !testrig.WaitFor(func() bool {
+ delivery, ok := suite.state.Workers.Delivery.Queue.Pop()
+ if !ok {
+ return false
+ }
+ if !testrig.EqualRequestURIs(delivery.Request.URL, targetAccount.InboxURI) {
+ panic("differing request uris")
+ }
+ sent, err = io.ReadAll(delivery.Request.Body)
+ if err != nil {
+ panic("error reading body: " + err.Error())
+ }
+ err = json.Unmarshal(sent, reject)
+ if err != nil {
+ panic("error unmarshaling json: " + err.Error())
+ }
+ return true
+ }) {
+ suite.FailNow("timed out waiting for message")
+ }
suite.Equal(requestingAccount.URI, reject.Actor)
suite.Equal(targetAccount.URI, reject.Object.Actor)
diff --git a/internal/processing/workers/federate.go b/internal/processing/workers/federate.go
index 9fdb8f662..e737513f5 100644
--- a/internal/processing/workers/federate.go
+++ b/internal/processing/workers/federate.go
@@ -75,6 +75,12 @@ func (f *federate) DeleteAccount(ctx context.Context, account *gtsmodel.Account)
return nil
}
+ // Drop any queued outgoing AP requests to / from account,
+ // (this stops any queued likes, boosts, creates etc).
+ f.state.Workers.Delivery.Queue.Delete("ActorID", account.URI)
+ f.state.Workers.Delivery.Queue.Delete("ObjectID", account.URI)
+ f.state.Workers.Delivery.Queue.Delete("TargetID", account.URI)
+
// Parse relevant URI(s).
outboxIRI, err := parseURI(account.OutboxURI)
if err != nil {
@@ -222,6 +228,11 @@ func (f *federate) DeleteStatus(ctx context.Context, status *gtsmodel.Status) er
return nil
}
+ // Drop any queued outgoing http requests for status,
+ // (this stops any queued likes, boosts, creates etc).
+ f.state.Workers.Delivery.Queue.Delete("ObjectID", status.URI)
+ f.state.Workers.Delivery.Queue.Delete("TargetID", status.URI)
+
// Ensure the status model is fully populated.
if err := f.state.DB.PopulateStatus(ctx, status); err != nil {
return gtserror.Newf("error populating status: %w", err)
diff --git a/internal/processing/workers/fromfediapi_test.go b/internal/processing/workers/fromfediapi_test.go
index 1dbefca84..51f61bd12 100644
--- a/internal/processing/workers/fromfediapi_test.go
+++ b/internal/processing/workers/fromfediapi_test.go
@@ -21,6 +21,7 @@ import (
"context"
"encoding/json"
"fmt"
+ "io"
"testing"
"time"
@@ -457,22 +458,6 @@ func (suite *FromFediAPITestSuite) TestProcessFollowRequestUnlocked() {
})
suite.NoError(err)
- // an accept message should be sent to satan's inbox
- var sent [][]byte
- if !testrig.WaitFor(func() bool {
- sentI, ok := suite.httpClient.SentMessages.Load(*originAccount.SharedInboxURI)
- if ok {
- sent, ok = sentI.([][]byte)
- if !ok {
- panic("SentMessages entry was not []byte")
- }
- return true
- }
- return false
- }) {
- suite.FailNow("timed out waiting for message")
- }
-
accept := &struct {
Actor string `json:"actor"`
ID string `json:"id"`
@@ -486,8 +471,29 @@ func (suite *FromFediAPITestSuite) TestProcessFollowRequestUnlocked() {
To string `json:"to"`
Type string `json:"type"`
}{}
- err = json.Unmarshal(sent[0], accept)
- suite.NoError(err)
+
+ // an accept message should be sent to satan's inbox
+ var sent []byte
+ if !testrig.WaitFor(func() bool {
+ delivery, ok := suite.state.Workers.Delivery.Queue.Pop()
+ if !ok {
+ return false
+ }
+ if !testrig.EqualRequestURIs(delivery.Request.URL, *originAccount.SharedInboxURI) {
+ panic("differing request uris")
+ }
+ sent, err = io.ReadAll(delivery.Request.Body)
+ if err != nil {
+ panic("error reading body: " + err.Error())
+ }
+ err = json.Unmarshal(sent, accept)
+ if err != nil {
+ panic("error unmarshaling json: " + err.Error())
+ }
+ return true
+ }) {
+ suite.FailNow("timed out waiting for message")
+ }
suite.Equal(targetAccount.URI, accept.Actor)
suite.Equal(originAccount.URI, accept.Object.Actor)
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-13 12:49:23 +0000