gtsocial-umbx

commit 2eea3d57e0624d4472e50b8cf37facd3f33c6834
parent 5d55e8d920cd5969e5cff567ee88afb13f40a1b9
Author: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date:   Sun, 20 Nov 2022 16:38:58 +0000

[chore] improve errors returned fetching account/statues from DB (#1084)

Signed-off-by: kim <grufwub@gmail.com>

Signed-off-by: kim <grufwub@gmail.com>
Diffstat:
M
internal/db/bundb/account.go
 | 
3
++-
M
internal/db/bundb/status.go
 | 
15
++++++++-------

2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/internal/db/bundb/account.go b/internal/db/bundb/account.go
@@ -21,6 +21,7 @@ package bundb
 import (
 	"context"
 	"errors"
+	"fmt"
 	"strings"
 	"time"
 
@@ -168,7 +169,7 @@ func (a *accountDB) getAccount(ctx context.Context, lookup string, dbQuery func(
 		// Set the account's related emojis
 		account.Emojis, err = a.emojis.emojisFromIDs(ctx, account.EmojiIDs)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error getting account emojis: %w", err)
 		}
 	}
 
diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go
@@ -23,6 +23,7 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"fmt"
 	"time"
 
 	"codeberg.org/gruf/go-cache/v3/result"
@@ -120,7 +121,7 @@ func (s *statusDB) getStatus(ctx context.Context, lookup string, dbQuery func(*g
 
 		if status.InReplyToID != "" {
 			// Also load in-reply-to status
-			status.InReplyTo = &gtsmodel.Status{}
+			status.InReplyTo = new(gtsmodel.Status)
 			err := s.conn.NewSelect().Model(status.InReplyTo).
 				Where("? = ?", bun.Ident("status.id"), status.InReplyToID).
 				Scan(ctx)
@@ -131,7 +132,7 @@ func (s *statusDB) getStatus(ctx context.Context, lookup string, dbQuery func(*g
 
 		if status.BoostOfID != "" {
 			// Also load original boosted status
-			status.BoostOf = &gtsmodel.Status{}
+			status.BoostOf = new(gtsmodel.Status)
 			err := s.conn.NewSelect().Model(status.BoostOf).
 				Where("? = ?", bun.Ident("status.id"), status.BoostOfID).
 				Scan(ctx)
@@ -150,14 +151,14 @@ func (s *statusDB) getStatus(ctx context.Context, lookup string, dbQuery func(*g
 	// Set the status author account
 	status.Account, err = s.accounts.GetAccountByID(ctx, status.AccountID)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error getting status account: %w", err)
 	}
 
 	if id := status.BoostOfAccountID; id != "" {
 		// Set boost of status' author account
 		status.BoostOfAccount, err = s.accounts.GetAccountByID(ctx, id)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error getting boosted status account: %w", err)
 		}
 	}
 
@@ -165,7 +166,7 @@ func (s *statusDB) getStatus(ctx context.Context, lookup string, dbQuery func(*g
 		// Set in-reply-to status' author account
 		status.InReplyToAccount, err = s.accounts.GetAccountByID(ctx, id)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error getting in reply to status account: %w", err)
 		}
 	}
 
@@ -173,7 +174,7 @@ func (s *statusDB) getStatus(ctx context.Context, lookup string, dbQuery func(*g
 		// Fetch status emojis
 		status.Emojis, err = s.emojis.emojisFromIDs(ctx, status.EmojiIDs)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error getting status emojis: %w", err)
 		}
 	}
 
@@ -181,7 +182,7 @@ func (s *statusDB) getStatus(ctx context.Context, lookup string, dbQuery func(*g
 		// Fetch status mentions
 		status.Mentions, err = s.mentions.GetMentions(ctx, status.MentionIDs)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("error getting status mentions: %w", err)
 		}
 	}