summaryrefslogtreecommitdiff
path: root/internal/federation/federatingdb/accept.go
diff options
context:
space:
mode:
authorLibravatar kim <grufwub@gmail.com>2025-05-15 09:40:48 +0000
committerLibravatar kim <gruf@noreply.codeberg.org>2025-05-15 09:40:48 +0000
commit3cff4b2d7d138f45787a94e6e64acdccb00e8951 (patch)
treed18f18289b3082b129d6e129aa383ddde5869521 /internal/federation/federatingdb/accept.go
parent[chore] Change default database in example config to sqlite, update docs. (#4... (diff)
downloadgotosocial-3cff4b2d7d138f45787a94e6e64acdccb00e8951.tar.xz
[chore] various federatingdb tweaks (#4178)
after seeing a potential reported federating worker lockup i decided to start digging into the federatingdb code. this PR encompasses: - removes one of our last unused interface types `federatingdb.DB{}`, replacing it with a struct type `*federatingdb.DB{}` - in `transport.dereferenceLocal()` differentiates between an unsupported lookup type and ErrNoEntries to reduce unnecessary calls, and reduce potential lockups that may occur while trying to call our own endpoints that then call `federatingdb.Lock()` - removes a bunch of the locks on follow state changes since the DB already synchronizes that - removes the unnecessary `pub.Clock{}` struct field and type passed to the transport controller frankly it would be great if we could remove the locking in `federatingdb.Lock()` and instead handle it ourselves as it gets very confusing trying to figure out what functions will have locks held. but i guess that's one for when we move further away from the go-fed/activity/pub package usage. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4178 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/federation/federatingdb/accept.go')
-rw-r--r--internal/federation/federatingdb/accept.go30
1 files changed, 9 insertions, 21 deletions
diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go
index 273b9255f..2e4948a0e 100644
--- a/internal/federation/federatingdb/accept.go
+++ b/internal/federation/federatingdb/accept.go
@@ -35,7 +35,7 @@ import (
"code.superseriousbusiness.org/gotosocial/internal/util"
)
-func (f *federatingDB) GetAccept(
+func (f *DB) GetAccept(
ctx context.Context,
acceptIRI *url.URL,
) (vocab.ActivityStreamsAccept, error) {
@@ -46,7 +46,7 @@ func (f *federatingDB) GetAccept(
return f.converter.InteractionReqToASAccept(ctx, approval)
}
-func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsAccept) error {
+func (f *DB) Accept(ctx context.Context, accept vocab.ActivityStreamsAccept) error {
log.DebugKV(ctx, "accept", serialize{accept})
activityContext := getActivityContext(ctx)
@@ -202,7 +202,7 @@ func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsA
return nil
}
-func (f *federatingDB) acceptFollowType(
+func (f *DB) acceptFollowType(
ctx context.Context,
asType vocab.Type,
receivingAcct *gtsmodel.Account,
@@ -218,11 +218,6 @@ func (f *federatingDB) acceptFollowType(
return gtserror.NewErrorInternalError(err)
}
- // Lock on the Follow URI
- // as we may be updating it.
- unlock := f.state.FedLocks.Lock(follow.URI)
- defer unlock()
-
// Make sure the creator of the original follow
// is the same as whatever inbox this landed in.
if follow.AccountID != receivingAcct.ID {
@@ -238,8 +233,7 @@ func (f *federatingDB) acceptFollowType(
}
// Accept and get the populated follow back.
- follow, err = f.state.DB.AcceptFollowRequest(
- ctx,
+ follow, err = f.state.DB.AcceptFollowRequest(ctx,
follow.AccountID,
follow.TargetAccountID,
)
@@ -267,17 +261,12 @@ func (f *federatingDB) acceptFollowType(
return nil
}
-func (f *federatingDB) acceptFollowIRI(
+func (f *DB) acceptFollowIRI(
ctx context.Context,
objectIRI string,
receivingAcct *gtsmodel.Account,
requestingAcct *gtsmodel.Account,
) error {
- // Lock on this potential Follow
- // URI as we may be updating it.
- unlock := f.state.FedLocks.Lock(objectIRI)
- defer unlock()
-
// Get the follow req from the db.
followReq, err := f.state.DB.GetFollowRequestByURI(ctx, objectIRI)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
@@ -307,8 +296,7 @@ func (f *federatingDB) acceptFollowIRI(
}
// Accept and get the populated follow back.
- follow, err := f.state.DB.AcceptFollowRequest(
- ctx,
+ follow, err := f.state.DB.AcceptFollowRequest(ctx,
followReq.AccountID,
followReq.TargetAccountID,
)
@@ -336,7 +324,7 @@ func (f *federatingDB) acceptFollowIRI(
return nil
}
-func (f *federatingDB) acceptOtherIRI(
+func (f *DB) acceptOtherIRI(
ctx context.Context,
acceptID *url.URL,
accept vocab.ActivityStreamsAccept,
@@ -419,7 +407,7 @@ func (f *federatingDB) acceptOtherIRI(
return nil
}
-func (f *federatingDB) acceptStoredStatus(
+func (f *DB) acceptStoredStatus(
ctx context.Context,
acceptID *url.URL,
accept vocab.ActivityStreamsAccept,
@@ -489,7 +477,7 @@ func (f *federatingDB) acceptStoredStatus(
return nil
}
-func (f *federatingDB) acceptLikeIRI(
+func (f *DB) acceptLikeIRI(
ctx context.Context,
acceptID *url.URL,
accept vocab.ActivityStreamsAccept,