Fix pipe - pico@c75173f

commit: c75173f
parent: ef1e410
author: Antonio Mika
date: 2025-02-27 00:45:14 -0500 EST

Fix pipe

2 files changed, +3, -3

M pipe/cli.go

M wish/logger.go

M pipe/cli.go

+1, -1

1@@ -160,7 +160,7 @@ func WishMiddleware(handler *CliHandler) wish.Middleware {
2 				isAdmin = handler.DBPool.HasFeatureForUser(user.ID, "admin")
3 
4 				userName = user.Name
5-				if user.PublicKey.Name != "" {
6+				if user.PublicKey != nil && user.PublicKey.Name != "" {
7 					userNameAddition = fmt.Sprintf("-%s", user.PublicKey.Name)
8 				}
9 			}

M wish/logger.go

+2, -2

 1@@ -14,7 +14,7 @@ type ctxLoggerKey struct{}
 2 type ctxUserKey struct{}
 3 
 4 type FindUserInterface interface {
 5-	FindUser(string) (*db.User, error)
 6+	FindUserByPubkey(string) (*db.User, error)
 7 }
 8 
 9 func LogMiddleware(defaultLogger *slog.Logger, db FindUserInterface) wish.Middleware {
10@@ -28,7 +28,7 @@ func LogMiddleware(defaultLogger *slog.Logger, db FindUserInterface) wish.Middle
11 
12 				user := GetUser(s)
13 				if user == nil {
14-					user, err := db.FindUser(s.Permissions().Extensions["user_id"])
15+					user, err := db.FindUserByPubkey(s.Permissions().Extensions["pubkey"])
16 					if err == nil && user != nil {
17 						logger = shared.LoggerWithUser(logger, user).With(
18 							"ip", s.RemoteAddr(),