diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 567c2be..abf8908 100644 --- 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 index c647029..7c9cf79 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -/nostr-rs-relay/data \ No newline at end of file +/nostr-rs-relay/data + +main +dist/ diff --git a/hostr/.goreleaser.yaml b/.goreleaser.yaml similarity index 100% rename from hostr/.goreleaser.yaml rename to .goreleaser.yaml diff --git a/hostr/cmd/consts/consts.go b/cmd/consts/consts.go similarity index 100% rename from hostr/cmd/consts/consts.go rename to cmd/consts/consts.go diff --git a/hostr/cmd/deploy/deploy.go b/cmd/deploy/deploy.go similarity index 97% rename from hostr/cmd/deploy/deploy.go rename to cmd/deploy/deploy.go index d84beed..8ee987e 100644 --- a/hostr/cmd/deploy/deploy.go +++ b/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 b/cmd/deploy/media.go similarity index 99% rename from hostr/cmd/deploy/media.go rename to cmd/deploy/media.go index 6713b54..c783dc3 100644 --- a/hostr/cmd/deploy/media.go +++ b/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 b/cmd/deploy/nostr.go similarity index 96% rename from hostr/cmd/deploy/nostr.go rename to cmd/deploy/nostr.go index 1730d52..d59c132 100644 --- a/hostr/cmd/deploy/nostr.go +++ b/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 b/cmd/keystore/keystore.go similarity index 95% rename from hostr/cmd/keystore/keystore.go rename to cmd/keystore/keystore.go index 680d9e6..c95f8b0 100644 --- a/hostr/cmd/keystore/keystore.go +++ b/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 b/cmd/paths/paths.go similarity index 100% rename from hostr/cmd/paths/paths.go rename to cmd/paths/paths.go diff --git a/hostr/cmd/relays/relays.go b/cmd/relays/relays.go similarity index 96% rename from hostr/cmd/relays/relays.go rename to cmd/relays/relays.go index 5c60b56..3936c59 100644 --- a/hostr/cmd/relays/relays.go +++ b/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 b/cmd/server/server.go similarity index 96% rename from hostr/cmd/server/server.go rename to cmd/server/server.go index 61043d6..ce067dc 100644 --- a/hostr/cmd/server/server.go +++ b/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 b/cmd/tools/displayPercent.go similarity index 100% rename from hostr/cmd/tools/displayPercent.go rename to cmd/tools/displayPercent.go diff --git a/hostr/cmd/tools/getContentType.go b/cmd/tools/getContentType.go similarity index 90% rename from hostr/cmd/tools/getContentType.go rename to cmd/tools/getContentType.go index 4d25943..c033f2f 100644 --- a/hostr/cmd/tools/getContentType.go +++ b/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 b/cmd/tools/resolvePubKey.go similarity index 100% rename from hostr/cmd/tools/resolvePubKey.go rename to cmd/tools/resolvePubKey.go diff --git a/hostr/cute-ostrich.txt b/cute-ostrich.txt similarity index 100% rename from hostr/cute-ostrich.txt rename to cute-ostrich.txt diff --git a/hostr/go.mod b/go.mod similarity index 98% rename from hostr/go.mod rename to go.mod index 8258e25..ea1e9de 100644 --- a/hostr/go.mod +++ b/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 b/go.sum similarity index 100% rename from hostr/go.sum rename to go.sum diff --git a/hostr/.gitignore b/hostr/.gitignore deleted file mode 100644 index 8d670f3..0000000 --- a/hostr/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -main -dist/ - -.nostr_account_secret -.nostr_relays \ No newline at end of file diff --git a/hostr/main.go b/main.go similarity index 95% rename from hostr/main.go rename to main.go index 4107dc3..5fee998 100644 --- a/hostr/main.go +++ b/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" )