From e58d2d81226c4cc4110747305d083b67903d621c Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Thu, 8 Dec 2022 17:35:14 +0000 Subject: [chore] move caches to a separate State{} structure (#1078) * move caches to a separate State{} structure Signed-off-by: kim * fix call to log.Panic not using formatted call Signed-off-by: kim * move caches to use interfaces, to make switchouts easier in future Signed-off-by: kim * fix rebase issue Signed-off-by: kim * improve code comment Signed-off-by: kim * fix further issues after rebase Signed-off-by: kim * heh Signed-off-by: kim * add missing license text Signed-off-by: kim Signed-off-by: kim --- internal/db/bundb/admin.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'internal/db/bundb/admin.go') diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go index 2a8851684..d3554f298 100644 --- a/internal/db/bundb/admin.go +++ b/internal/db/bundb/admin.go @@ -34,6 +34,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" "github.com/superseriousbusiness/gotosocial/internal/log" + "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/uris" "github.com/uptrace/bun" "golang.org/x/crypto/bcrypt" @@ -43,9 +44,8 @@ import ( const rsaKeyBits = 2048 type adminDB struct { - conn *DBConn - accounts *accountDB - users *userDB + conn *DBConn + state *state.State } func (a *adminDB) IsUsernameAvailable(ctx context.Context, username string) (bool, db.Error) { @@ -139,7 +139,7 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string, } // insert the new account! - if err := a.accounts.PutAccount(ctx, acct); err != nil { + if err := a.state.DB.PutAccount(ctx, acct); err != nil { return nil, err } } @@ -185,7 +185,7 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string, } // insert the user! - if err := a.users.PutUser(ctx, u); err != nil { + if err := a.state.DB.PutUser(ctx, u); err != nil { return nil, err } @@ -241,7 +241,7 @@ func (a *adminDB) CreateInstanceAccount(ctx context.Context) db.Error { } // insert the new account! - if err := a.accounts.PutAccount(ctx, acct); err != nil { + if err := a.state.DB.PutAccount(ctx, acct); err != nil { return err } -- cgit v1.2.3