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

studiokaiji · Oct 26, 2023 · baee59d · baee59d
1 parent c3c7dfa
commit baee59d
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 25 deletions.
diff --git a/.github/workflows/release.yml b/.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 }}
diff --git a/.gitignore b/.gitignore
@@ -1 +1,4 @@
-/nostr-rs-relay/data
+/nostr-rs-relay/data
+
+main
+dist/
diff --git a/hostr/.goreleaser.yaml → .goreleaser.yaml b/hostr/.goreleaser.yaml → .goreleaser.yaml
diff --git a/hostr/cmd/consts/consts.go → cmd/consts/consts.go b/hostr/cmd/consts/consts.go → cmd/consts/consts.go
diff --git a/hostr/cmd/deploy/deploy.go → cmd/deploy/deploy.go b/hostr/cmd/deploy/deploy.go → 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"
 )

diff --git a/hostr/cmd/deploy/media.go → cmd/deploy/media.go b/hostr/cmd/deploy/media.go → 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{

diff --git a/hostr/cmd/deploy/nostr.go → cmd/deploy/nostr.go b/hostr/cmd/deploy/nostr.go → 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

diff --git a/hostr/cmd/keystore/keystore.go → cmd/keystore/keystore.go b/hostr/cmd/keystore/keystore.go → 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"

diff --git a/hostr/cmd/paths/paths.go → cmd/paths/paths.go b/hostr/cmd/paths/paths.go → cmd/paths/paths.go
diff --git a/hostr/cmd/relays/relays.go → cmd/relays/relays.go b/hostr/cmd/relays/relays.go → 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"

diff --git a/hostr/cmd/server/server.go → cmd/server/server.go b/hostr/cmd/server/server.go → 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) {

diff --git a/hostr/cmd/tools/displayPercent.go → cmd/tools/displayPercent.go b/hostr/cmd/tools/displayPercent.go → cmd/tools/displayPercent.go
diff --git a/hostr/cmd/tools/getContentType.go → cmd/tools/getContentType.go b/hostr/cmd/tools/getContentType.go → 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) {

diff --git a/hostr/cmd/tools/resolvePubKey.go → cmd/tools/resolvePubKey.go b/hostr/cmd/tools/resolvePubKey.go → cmd/tools/resolvePubKey.go
diff --git a/hostr/cute-ostrich.txt → cute-ostrich.txt b/hostr/cute-ostrich.txt → cute-ostrich.txt
diff --git a/hostr/go.mod → go.mod b/hostr/go.mod → go.mod
@@ -1,4 +1,4 @@
-module github.com/studiokaiji/nostr-webhost/hostr
+module github.com/studiokaiji/nostr-webhost
 
 go 1.21
 

diff --git a/hostr/go.sum → go.sum b/hostr/go.sum → go.sum
diff --git a/hostr/.gitignore b/hostr/.gitignore
diff --git a/hostr/main.go → main.go b/hostr/main.go → 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"
 )