tjh.dev
forked from
tangled.org/core
this repo has no description
blog: fail faster
fail on config load errors too
Signed-off-by: oppiliappan <me@oppi.li>
oppi.li
+7
-19
+5
-17
appview/pages/funcmap.go
+5
-17
appview/pages/funcmap.go
···
408
408
"placeholderAvatar": func(size string) template.HTML {
409
409
sizeClass := "size-6"
410
410
iconSize := "size-4"
411
-
if size == "tiny" {
411
+
switch size {
412
+
case "tiny":
412
413
sizeClass = "size-6"
413
414
iconSize = "size-4"
414
-
} else if size == "small" {
415
+
case "small":
415
416
sizeClass = "size-8"
416
417
iconSize = "size-5"
417
-
} else {
418
+
default:
418
419
sizeClass = "size-12"
419
420
iconSize = "size-8"
420
421
}
···
498
499
}
499
500
}
500
501
501
-
func (p *Pages) resolveDid(did string) string {
502
-
identity, err := p.resolver.ResolveIdent(context.Background(), did)
503
-
504
-
if err != nil {
505
-
return did
506
-
}
507
-
508
-
if identity.Handle.IsInvalidHandle() {
509
-
return "handle.invalid"
510
-
}
511
-
512
-
return identity.Handle.String()
513
-
}
514
-
515
502
func (p *Pages) AvatarUrl(actor, size string) string {
516
503
actor = strings.TrimPrefix(actor, "@")
517
504
···
555
542
if version != "" {
556
543
return fmt.Sprintf("%s?v=%s", baseUrl, version)
557
544
}
545
+
558
546
return baseUrl
559
547
}
560
548
+2
-2
cmd/blog/main.go
+2
-2
cmd/blog/main.go
···
60
60
func runBuild(ctx context.Context, logger *slog.Logger) error {
61
61
cfg, err := config.LoadConfig(ctx)
62
62
if err != nil {
63
-
cfg = &config.Config{}
63
+
return fmt.Errorf("failed to load config: %w", err)
64
64
}
65
65
66
66
p, err := makePages(ctx, cfg, logger)
···
142
142
func runServe(ctx context.Context, logger *slog.Logger, addr string) error {
143
143
cfg, err := config.LoadConfig(ctx)
144
144
if err != nil {
145
-
cfg = &config.Config{}
145
+
return fmt.Errorf("failed to load config: %w", err)
146
146
}
147
147
148
148
p, err := makePages(ctx, cfg, logger)