nostr/nak
1
0
Fork 0
mirror of https://github.com/fiatjaf/nak.git synced 2025-09-01 06:20:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

global bold/italic helpers.

Browse Source
This commit is contained in:
fiatjaf
2025-01-30 16:05:51 -03:00
parent 6e43a6b733
commit 81571c6952
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bunker.go
View File

@@ -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()

12
helpers.go
View File

@@ -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,
}

11
serve.go
View File

@@ -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
},