summaryrefslogtreecommitdiff
path: root/internal/federation/federatingdb/get.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/get.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/get.go')
-rw-r--r--internal/federation/federatingdb/get.go40
1 files changed, 26 insertions, 14 deletions
diff --git a/internal/federation/federatingdb/get.go b/internal/federation/federatingdb/get.go
index 92c2d1d8d..58dcfecdc 100644
--- a/internal/federation/federatingdb/get.go
+++ b/internal/federation/federatingdb/get.go
@@ -19,16 +19,19 @@ package federatingdb
import (
"context"
+ "errors"
"net/url"
"code.superseriousbusiness.org/activity/streams/vocab"
"code.superseriousbusiness.org/gotosocial/internal/config"
- "code.superseriousbusiness.org/gotosocial/internal/db"
+ "code.superseriousbusiness.org/gotosocial/internal/gtscontext"
"code.superseriousbusiness.org/gotosocial/internal/gtserror"
"code.superseriousbusiness.org/gotosocial/internal/log"
"code.superseriousbusiness.org/gotosocial/internal/uris"
)
+var ErrNotImplemented = errors.New("not implemented")
+
// Get returns the database entry for the specified id.
//
// The library makes this call only after acquiring a lock first.
@@ -48,30 +51,38 @@ import (
//
// It may be useful in future to add more matching here so that more
// stuff can be shortcutted by the dereferencer, saving HTTP calls.
-func (f *federatingDB) Get(ctx context.Context, id *url.URL) (value vocab.Type, err error) {
+func (f *DB) Get(ctx context.Context, id *url.URL) (value vocab.Type, err error) {
log.DebugKV(ctx, "id", id)
// Ensure our host, for safety.
if id.Host != config.GetHost() {
- return nil, gtserror.Newf("%s was not for our host", id.String())
+ return nil, gtserror.Newf("%s was not for our host", id)
}
- if username, err := uris.ParseUserPath(id); err == nil && username != "" {
- acct, err := f.state.DB.GetAccountByUsernameDomain(ctx, username, "")
+ if username, _ := uris.ParseUserPath(id); username != "" {
+ acct, err := f.state.DB.GetAccountByUsernameDomain(
+ gtscontext.SetBarebones(ctx),
+ username,
+ "",
+ )
if err != nil {
return nil, err
}
return f.converter.AccountToAS(ctx, acct)
- } else if _, statusID, err := uris.ParseStatusesPath(id); err == nil && statusID != "" {
+ } else if _, statusID, _ := uris.ParseStatusesPath(id); statusID != "" {
status, err := f.state.DB.GetStatusByID(ctx, statusID)
if err != nil {
return nil, err
}
return f.converter.StatusToAS(ctx, status)
- } else if username, err := uris.ParseFollowersPath(id); err == nil && username != "" {
- acct, err := f.state.DB.GetAccountByUsernameDomain(ctx, username, "")
+ } else if username, _ := uris.ParseFollowersPath(id); username != "" {
+ acct, err := f.state.DB.GetAccountByUsernameDomain(
+ gtscontext.SetBarebones(ctx),
+ username,
+ "",
+ )
if err != nil {
return nil, err
}
@@ -83,8 +94,12 @@ func (f *federatingDB) Get(ctx context.Context, id *url.URL) (value vocab.Type,
return f.Followers(ctx, acctURI)
- } else if username, err := uris.ParseFollowingPath(id); err == nil && username != "" {
- acct, err := f.state.DB.GetAccountByUsernameDomain(ctx, username, "")
+ } else if username, _ := uris.ParseFollowingPath(id); username != "" {
+ acct, err := f.state.DB.GetAccountByUsernameDomain(
+ gtscontext.SetBarebones(ctx),
+ username,
+ "",
+ )
if err != nil {
return nil, err
}
@@ -102,8 +117,5 @@ func (f *federatingDB) Get(ctx context.Context, id *url.URL) (value vocab.Type,
// Nothing found, the caller
// will have to deal with this.
- return nil, gtserror.Newf(
- "not implemented for %s: %w",
- id.String(), db.ErrNoEntries,
- )
+ return nil, ErrNotImplemented
}