diff --git a/bskyweb/cmd/bskyweb/invitepass.go b/bskyweb/cmd/bskyweb/invitepass.go index 7d146fb558..371208a78e 100644 --- a/bskyweb/cmd/bskyweb/invitepass.go +++ b/bskyweb/cmd/bskyweb/invitepass.go @@ -12,7 +12,6 @@ import ( _ "image/png" "io" "io/fs" - "log/slog" "net/http" "strings" "time" @@ -199,19 +198,17 @@ func (srv *Server) buildPassAssets(theme, handle string, avatarBytes []byte) ([] logo2, _ := readFS(srv.cfg.InvitePass.StripFS, "passes/logo@2x.png") logo3, _ := readFS(srv.cfg.InvitePass.StripFS, "passes/logo@3x.png") - avatarImg, _ := decodeImage(avatarBytes) - strip1Bytes, err := buildStripAtDensity(srv.cfg.InvitePass.StripFS, theme, 1, avatarImg, handle, srv.cfg.InvitePass.FontFace) + // Strip is just the per-theme gradient PNG, served as-is. The pass's + // storeCard primaryFields render the handle below the strip, so painting + // it again on the image would be redundant. avatarBytes is currently + // unused; reserved for a future composite that draws the user's avatar. + _ = avatarBytes + strip1Bytes, err := readFS(srv.cfg.InvitePass.StripFS, "passes/strip-"+theme+".png") if err != nil { return nil, fmt.Errorf("strip@1x: %w", err) } - strip2Bytes, err := buildStripAtDensity(srv.cfg.InvitePass.StripFS, theme, 2, avatarImg, handle, srv.cfg.InvitePass.FontFace) - if err != nil { - slog.Debug("invite pass: strip composite failed", "scale", 2, "err", err) - } - strip3Bytes, err := buildStripAtDensity(srv.cfg.InvitePass.StripFS, theme, 3, avatarImg, handle, srv.cfg.InvitePass.FontFace) - if err != nil { - slog.Debug("invite pass: strip composite failed", "scale", 3, "err", err) - } + strip2Bytes, _ := readFS(srv.cfg.InvitePass.StripFS, "passes/strip-"+theme+"@2x.png") + strip3Bytes, _ := readFS(srv.cfg.InvitePass.StripFS, "passes/strip-"+theme+"@3x.png") assets := []PassAsset{ {Name: "icon.png", Data: icon1}, diff --git a/bskyweb/static/passes/dawn/icon.png b/bskyweb/static/passes/dawn/icon.png index 514ad0b488..31ffd98588 100644 Binary files a/bskyweb/static/passes/dawn/icon.png and b/bskyweb/static/passes/dawn/icon.png differ diff --git a/bskyweb/static/passes/dawn/icon@2x.png b/bskyweb/static/passes/dawn/icon@2x.png index b4b0c97fae..a98c1e3458 100644 Binary files a/bskyweb/static/passes/dawn/icon@2x.png and b/bskyweb/static/passes/dawn/icon@2x.png differ diff --git a/bskyweb/static/passes/dawn/icon@3x.png b/bskyweb/static/passes/dawn/icon@3x.png index d00ae9042c..5392662b22 100644 Binary files a/bskyweb/static/passes/dawn/icon@3x.png and b/bskyweb/static/passes/dawn/icon@3x.png differ diff --git a/bskyweb/static/passes/day/icon.png b/bskyweb/static/passes/day/icon.png index d464733a2b..03f8ff3175 100644 Binary files a/bskyweb/static/passes/day/icon.png and b/bskyweb/static/passes/day/icon.png differ diff --git a/bskyweb/static/passes/day/icon@2x.png b/bskyweb/static/passes/day/icon@2x.png index 173dd631f4..9eaf4f4e0c 100644 Binary files a/bskyweb/static/passes/day/icon@2x.png and b/bskyweb/static/passes/day/icon@2x.png differ diff --git a/bskyweb/static/passes/day/icon@3x.png b/bskyweb/static/passes/day/icon@3x.png index 2f2f899e93..8e85669a38 100644 Binary files a/bskyweb/static/passes/day/icon@3x.png and b/bskyweb/static/passes/day/icon@3x.png differ diff --git a/bskyweb/static/passes/dusk/icon.png b/bskyweb/static/passes/dusk/icon.png index 99afa39d44..7d8494a80a 100644 Binary files a/bskyweb/static/passes/dusk/icon.png and b/bskyweb/static/passes/dusk/icon.png differ diff --git a/bskyweb/static/passes/dusk/icon@2x.png b/bskyweb/static/passes/dusk/icon@2x.png index 47e1537857..4b03089fff 100644 Binary files a/bskyweb/static/passes/dusk/icon@2x.png and b/bskyweb/static/passes/dusk/icon@2x.png differ diff --git a/bskyweb/static/passes/dusk/icon@3x.png b/bskyweb/static/passes/dusk/icon@3x.png index 7f18f2c7bb..572fd97432 100644 Binary files a/bskyweb/static/passes/dusk/icon@3x.png and b/bskyweb/static/passes/dusk/icon@3x.png differ diff --git a/bskyweb/static/passes/logo.png b/bskyweb/static/passes/logo.png index 50f7c84c7d..6aa2b64c5d 100644 Binary files a/bskyweb/static/passes/logo.png and b/bskyweb/static/passes/logo.png differ diff --git a/bskyweb/static/passes/logo@2x.png b/bskyweb/static/passes/logo@2x.png index 6f0b86abe9..874b81db8e 100644 Binary files a/bskyweb/static/passes/logo@2x.png and b/bskyweb/static/passes/logo@2x.png differ diff --git a/bskyweb/static/passes/logo@3x.png b/bskyweb/static/passes/logo@3x.png index 09f721c084..acfed19e5f 100644 Binary files a/bskyweb/static/passes/logo@3x.png and b/bskyweb/static/passes/logo@3x.png differ diff --git a/bskyweb/static/passes/night/icon.png b/bskyweb/static/passes/night/icon.png index d980ddef49..67b374edc7 100644 Binary files a/bskyweb/static/passes/night/icon.png and b/bskyweb/static/passes/night/icon.png differ diff --git a/bskyweb/static/passes/night/icon@2x.png b/bskyweb/static/passes/night/icon@2x.png index 26d91b8894..2953316ebf 100644 Binary files a/bskyweb/static/passes/night/icon@2x.png and b/bskyweb/static/passes/night/icon@2x.png differ diff --git a/bskyweb/static/passes/night/icon@3x.png b/bskyweb/static/passes/night/icon@3x.png index 69ea9ac996..fa75f42234 100644 Binary files a/bskyweb/static/passes/night/icon@3x.png and b/bskyweb/static/passes/night/icon@3x.png differ