From 2922a0de25261fd025c7aef03e2331904a274dbf Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sun, 17 May 2026 17:10:29 -0300
Subject: [PATCH] git: support nostr://... URLs without requiring the <relay>
 component.

---
 git.go | 50 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/git.go b/git.go
index 1402889..25f91f5 100644
--- a/git.go
+++ b/git.go
@@ -369,7 +369,7 @@ aside from those, there is also:
 		{
 			Name:        "clone",
 			Usage:       "clone a NIP-34 repository from a nostr:// URI",
-			Description: `the <repository> parameter maybe in the form "<npub, hex, nprofile or nip05>/<identifier>", ngit-style like "nostr://<npub>/<relay>/<identifier>" or an "naddr1..." code.`,
+			Description: `the <repository> parameter maybe in the form "<npub, hex, nprofile or nip05>/<identifier>", ngit-style like "nostr://<npub>/<relay>/<identifier>" or "nostr://<npub>/<identifier>" or an "naddr1..." code.`,
 			ArgsUsage:   "<repository> [directory]",
 			Action: func(ctx context.Context, c *cli.Command) error {
 				args := c.Args()
@@ -2633,30 +2633,40 @@ func parseRepositoryAddress(
 	}
 
 	// format 2: nostr://<npub_or_nip05>/<relay_hostname>/<identifier> (ngit-style)
+	// format 2b: nostr://<npub_or_nip05>/<identifier> (without relay)
 	if strings.HasPrefix(address, "nostr://") {
 		parts := strings.Split(address, "/")
-		if len(parts) != 5 {
+		if len(parts) == 5 {
+			// nostr://<owner>/<relay>/<identifier>
+			owner, err = parsePubKey(parts[2])
+			if err != nil {
+				return nostr.PubKey{}, "", nil, fmt.Errorf("invalid owner in URL: %w", err)
+			}
+
+			relayHost := parts[3]
+			identifier = parts[4]
+
+			if strings.HasPrefix(relayHost, "wss:") || strings.HasPrefix(relayHost, "ws:") {
+				relayHints = []string{relayHost}
+			} else {
+				relayHints = []string{"wss://" + relayHost}
+			}
+
+			return owner, identifier, relayHints, nil
+		} else if len(parts) == 4 {
+			// nostr://<owner>/<identifier>
+			owner, err = parsePubKey(parts[2])
+			if err != nil {
+				return nostr.PubKey{}, "", nil, fmt.Errorf("invalid owner in URL: %w", err)
+			}
+
+			identifier = parts[3]
+			return owner, identifier, nil, nil
+		} else {
 			return nostr.PubKey{}, "", nil, fmt.Errorf(
-				"invalid nostr URL format, expected nostr://<npub|nip05>/<relay_hostname>/<identifier>, got: %s", address,
+				"invalid nostr URL format, expected nostr://<npub|nip05>/<identifier> or nostr://<npub|nip05>/<relay>/<identifier>, got: %s", address,
 			)
 		}
-
-		owner, err = parsePubKey(parts[2])
-		if err != nil {
-			return nostr.PubKey{}, "", nil, fmt.Errorf("invalid owner in URL: %w", err)
-		}
-
-		relayHost := parts[3]
-		identifier = parts[4]
-
-		// construct relay hint from hostname
-		if strings.HasPrefix(relayHost, "wss:") || strings.HasPrefix(relayHost, "ws:") {
-			relayHints = []string{relayHost}
-		} else {
-			relayHints = []string{"wss://" + relayHost}
-		}
-
-		return owner, identifier, relayHints, nil
 	}
 
 	// format 3: <npub, hex, nprofile or nip05>/<identifier>