From 611f9de39b7a29e89616c9ffe76d2aca1194877b Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Tue, 11 Jun 2024 11:54:59 +0200
Subject: [bugfix] Deref stats async, serve stub collections if handshaking
 (#2990)

* [bugfix] Deref stats async, allow peek if handshaking

* don't return totalItems when handshaking or hiding collections

* use GetLimit()

* use StubAccountStats
---
 internal/db/bundb/admin.go | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'internal/db/bundb/admin.go')

diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go
index e9191b7c7..ff398fca5 100644
--- a/internal/db/bundb/admin.go
+++ b/internal/db/bundb/admin.go
@@ -120,16 +120,6 @@ func (a *adminDB) NewSignup(ctx context.Context, newSignup gtsmodel.NewSignup) (
 			return nil, err
 		}
 
-		settings := &gtsmodel.AccountSettings{
-			AccountID: accountID,
-			Privacy:   gtsmodel.VisibilityDefault,
-		}
-
-		// Insert the settings!
-		if err := a.state.DB.PutAccountSettings(ctx, settings); err != nil {
-			return nil, err
-		}
-
 		account = &gtsmodel.Account{
 			ID:                    accountID,
 			Username:              newSignup.Username,
@@ -145,13 +135,26 @@ func (a *adminDB) NewSignup(ctx context.Context, newSignup gtsmodel.NewSignup) (
 			PrivateKey:            privKey,
 			PublicKey:             &privKey.PublicKey,
 			PublicKeyURI:          uris.PublicKeyURI,
-			Settings:              settings,
 		}
 
 		// Insert the new account!
 		if err := a.state.DB.PutAccount(ctx, account); err != nil {
 			return nil, err
 		}
+
+		// Insert basic settings for new account.
+		account.Settings = &gtsmodel.AccountSettings{
+			AccountID: accountID,
+			Privacy:   gtsmodel.VisibilityDefault,
+		}
+		if err := a.state.DB.PutAccountSettings(ctx, account.Settings); err != nil {
+			return nil, err
+		}
+
+		// Stub empty stats for new account.
+		if err := a.state.DB.StubAccountStats(ctx, account); err != nil {
+			return nil, err
+		}
 	}
 
 	// Created or already had an account.
-- 
cgit v1.2.3