From 81571c69529b875a1421e28c9b079b202854cb9b Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 30 Jan 2025 16:05:51 -0300
Subject: [PATCH] global bold/italic helpers.

---
 bunker.go  | 14 ++++++--------
 helpers.go | 12 ++++++++++++
 serve.go   | 11 ++++-------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/bunker.go b/bunker.go
index bc2b179..29eaa69 100644
--- a/bunker.go
+++ b/bunker.go
@@ -83,8 +83,6 @@ var bunker = &cli.Command{
 			return err
 		}
 		npub, _ := nip19.EncodePublicKey(pubkey)
-		bold := color.New(color.Bold).Sprint
-		italic := color.New(color.Italic).Sprint
 
 		// this function will be called every now and then
 		printBunkerInfo := func() {
@@ -93,12 +91,12 @@ var bunker = &cli.Command{
 
 			authorizedKeysStr := ""
 			if len(authorizedKeys) != 0 {
-				authorizedKeysStr = "\n  authorized keys:\n    - " + italic(strings.Join(authorizedKeys, "\n    - "))
+				authorizedKeysStr = "\n  authorized keys:\n    - " + colors.italic(strings.Join(authorizedKeys, "\n    - "))
 			}
 
 			authorizedSecretsStr := ""
 			if len(authorizedSecrets) != 0 {
-				authorizedSecretsStr = "\n  authorized secrets:\n    - " + italic(strings.Join(authorizedSecrets, "\n    - "))
+				authorizedSecretsStr = "\n  authorized secrets:\n    - " + colors.italic(strings.Join(authorizedSecrets, "\n    - "))
 			}
 
 			preauthorizedFlags := ""
@@ -130,13 +128,13 @@ var bunker = &cli.Command{
 			)
 
 			log("listening at %v:\n  pubkey: %s \n  npub: %s%s%s\n  to restart: %s\n  bunker: %s\n\n",
-				bold(relayURLs),
-				bold(pubkey),
-				bold(npub),
+				colors.bold(relayURLs),
+				colors.bold(pubkey),
+				colors.bold(npub),
 				authorizedKeysStr,
 				authorizedSecretsStr,
 				color.CyanString(restartCommand),
-				bold(bunkerURI),
+				colors.bold(bunkerURI),
 			)
 		}
 		printBunkerInfo()
diff --git a/helpers.go b/helpers.go
index e364d8a..38ab879 100644
--- a/helpers.go
+++ b/helpers.go
@@ -212,3 +212,15 @@ func randString(n int) string {
 func leftPadKey(k string) string {
 	return strings.Repeat("0", 64-len(k)) + k
 }
+
+var colors = struct {
+	italic  func(...any) string
+	italicf func(string, ...any) string
+	bold    func(...any) string
+	boldf   func(string, ...any) string
+}{
+	color.New(color.Italic).Sprint,
+	color.New(color.Italic).Sprintf,
+	color.New(color.Bold).Sprint,
+	color.New(color.Bold).Sprintf,
+}
diff --git a/serve.go b/serve.go
index c2a0a7c..b06f61c 100644
--- a/serve.go
+++ b/serve.go
@@ -81,24 +81,21 @@ var serve = &cli.Command{
 			exited <- err
 		}()
 
-		bold := color.New(color.Bold).Sprintf
-		italic := color.New(color.Italic).Sprint
-
 		var printStatus func()
 
 		// relay logging
 		rl.RejectFilter = append(rl.RejectFilter, func(ctx context.Context, filter nostr.Filter) (reject bool, msg string) {
-			log("    got %s %v\n", color.HiYellowString("request"), italic(filter))
+			log("    got %s %v\n", color.HiYellowString("request"), colors.italic(filter))
 			printStatus()
 			return false, ""
 		})
 		rl.RejectCountFilter = append(rl.RejectCountFilter, func(ctx context.Context, filter nostr.Filter) (reject bool, msg string) {
-			log("    got %s %v\n", color.HiCyanString("count request"), italic(filter))
+			log("    got %s %v\n", color.HiCyanString("count request"), colors.italic(filter))
 			printStatus()
 			return false, ""
 		})
 		rl.RejectEvent = append(rl.RejectEvent, func(ctx context.Context, event *nostr.Event) (reject bool, msg string) {
-			log("    got %s %v\n", color.BlueString("event"), italic(event))
+			log("    got %s %v\n", color.BlueString("event"), colors.italic(event))
 			printStatus()
 			return false, ""
 		})
@@ -118,7 +115,7 @@ var serve = &cli.Command{
 		}
 
 		<-started
-		log("%s relay running at %s\n", color.HiRedString(">"), bold("ws://%s:%d", hostname, port))
+		log("%s relay running at %s\n", color.HiRedString(">"), colors.boldf("ws://%s:%d", hostname, port))
 
 		return <-exited
 	},