diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-12-08 17:35:14 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-12-08 18:35:14 +0100 |
| commit | e58d2d81226c4cc4110747305d083b67903d621c (patch) | |
| tree | 249f8b3f4732ccdb1e77b2d4243fafb4ee4c1c86 /internal/db/bundb/admin.go | |
| parent | [chore] Remove deprecated linters (#1228) (diff) | |
| download | gotosocial-e58d2d81226c4cc4110747305d083b67903d621c.tar.xz | |
[chore] move caches to a separate State{} structure (#1078)
* move caches to a separate State{} structure
Signed-off-by: kim <grufwub@gmail.com>
* fix call to log.Panic not using formatted call
Signed-off-by: kim <grufwub@gmail.com>
* move caches to use interfaces, to make switchouts easier in future
Signed-off-by: kim <grufwub@gmail.com>
* fix rebase issue
Signed-off-by: kim <grufwub@gmail.com>
* improve code comment
Signed-off-by: kim <grufwub@gmail.com>
* fix further issues after rebase
Signed-off-by: kim <grufwub@gmail.com>
* heh
Signed-off-by: kim <grufwub@gmail.com>
* add missing license text
Signed-off-by: kim <grufwub@gmail.com>
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/db/bundb/admin.go')
| -rw-r--r-- | internal/db/bundb/admin.go | 12 |
1 files changed, 6 insertions, 6 deletions
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 } |