use xhex everywhere.

This commit is contained in:
fiatjaf
2025-11-21 21:16:34 -03:00
parent 61b9717c5c
commit 55a43e46b7
46 changed files with 185 additions and 177 deletions

View File

@@ -2,7 +2,6 @@ package blossom
import (
"crypto/sha256"
"encoding/hex"
"encoding/json"
"io"
"mime"
@@ -128,7 +127,7 @@ func (bs BlossomServer) handleUpload(w http.ResponseWriter, r *http.Request) {
}
hash := sha256.Sum256(b)
hhash := hex.EncodeToString(hash[:])
hhash := nostr.HexEncodeToString(hash[:])
mimeType := mime.TypeByExtension(ext)
if mimeType == "" {
mimeType = "application/octet-stream"
@@ -443,7 +442,7 @@ func (bs BlossomServer) handleMirror(w http.ResponseWriter, r *http.Request) {
// calculate sha256
hash := sha256.Sum256(body)
hhash := hex.EncodeToString(hash[:])
hhash := nostr.HexEncodeToString(hash[:])
// verify hash against x tag
if auth.Tags.FindWithValue("x", hhash) == nil {

View File

@@ -3,7 +3,6 @@ package khatru
import (
"context"
"crypto/rand"
"encoding/hex"
"errors"
"net/http"
"slices"
@@ -76,7 +75,7 @@ func (rl *Relay) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
ws := &WebSocket{
conn: conn,
Request: r,
Challenge: rl.ChallengePrefix + hex.EncodeToString(challenge),
Challenge: rl.ChallengePrefix + nostr.HexEncodeToString(challenge),
AuthedPublicKeys: make([]nostr.PubKey, 0),
negentropySessions: xsync.NewMapOf[string, *NegentropySession](),
}

View File

@@ -4,7 +4,6 @@ import (
"context"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"encoding/json"
"fmt"
"io"
@@ -99,7 +98,7 @@ func (rl *Relay) HandleNIP86(w http.ResponseWriter, r *http.Request) {
goto respond
}
if pht := evt.Tags.FindWithValue("payload", hex.EncodeToString(payloadHash[:])); pht == nil {
if pht := evt.Tags.FindWithValue("payload", nostr.HexEncodeToString(payloadHash[:])); pht == nil {
resp.Error = "invalid auth event payload hash"
goto respond
}