hostrディレクトリの内容をトップレベルに移動

.github/workflows/release.yml

@@ -25,7 +25,5 @@ jobs:
       - uses: goreleaser/goreleaser-action@v4
         with:
           args: release --clean
-          workdir: ./hostr
-          version: latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1 +1,4 @@
-/nostr-rs-relay/data
+/nostr-rs-relay/data
+
+main
+dist/

cmd/deploy/deploy.go

@@ -11,9 +11,9 @@ import (
 
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/consts"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/keystore"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/relays"
+	"github.com/studiokaiji/nostr-webhost/cmd/consts"
+	"github.com/studiokaiji/nostr-webhost/cmd/keystore"
+	"github.com/studiokaiji/nostr-webhost/cmd/relays"
 	"golang.org/x/exp/slices"
 	"golang.org/x/net/html"
 )

cmd/deploy/media.go

@@ -14,7 +14,7 @@ import (
 	"sync"
 
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/tools"
+	"github.com/studiokaiji/nostr-webhost/cmd/tools"
 )
 
 var availableContentTypes = []string{

cmd/deploy/nostr.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/consts"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/tools"
+	"github.com/studiokaiji/nostr-webhost/cmd/consts"
+	"github.com/studiokaiji/nostr-webhost/cmd/tools"
 )
 
 var allRelays []string

cmd/keystore/keystore.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/paths"
+	"github.com/studiokaiji/nostr-webhost/cmd/paths"
 )
 
 const PATH = ".nostr_account_secret"

cmd/relays/relays.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/paths"
+	"github.com/studiokaiji/nostr-webhost/cmd/paths"
 )
 
 const PATH = ".nostr_relays"

cmd/server/server.go

@@ -8,9 +8,9 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/consts"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/relays"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/tools"
+	"github.com/studiokaiji/nostr-webhost/cmd/consts"
+	"github.com/studiokaiji/nostr-webhost/cmd/relays"
+	"github.com/studiokaiji/nostr-webhost/cmd/tools"
 )
 
 func Start(port string, mode string) {

cmd/tools/getContentType.go

@@ -3,7 +3,7 @@ package tools
 import (
 	"fmt"
 
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/consts"
+	"github.com/studiokaiji/nostr-webhost/cmd/consts"
 )
 
 func GetContentType(kind int) (string, error) {

go.mod

@@ -1,4 +1,4 @@
-module github.com/studiokaiji/nostr-webhost/hostr
+module github.com/studiokaiji/nostr-webhost
 
 go 1.21
 

hostr/.gitignore

@@ -1,5 +0,0 @@
-main
-dist/
-
-.nostr_account_secret
-.nostr_relays

main.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/nbd-wtf/go-nostr"
 	"github.com/nbd-wtf/go-nostr/nip19"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/deploy"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/keystore"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/relays"
-	"github.com/studiokaiji/nostr-webhost/hostr/cmd/server"
+	"github.com/studiokaiji/nostr-webhost/cmd/deploy"
+	"github.com/studiokaiji/nostr-webhost/cmd/keystore"
+	"github.com/studiokaiji/nostr-webhost/cmd/relays"
+	"github.com/studiokaiji/nostr-webhost/cmd/server"
 	"github.com/urfave/cli/v2"
 )