rename major package folers web->app, relay->server

app/app.go

@@ -1,4 +1,4 @@
-package web
+package app
 
 import (
 	"context"

app/relay_metadata.go

@@ -1,4 +1,4 @@
-package web
+package app
 
 import (
 	"encoding/json"
@@ -19,7 +19,7 @@ type RelayMetadata struct {
 var relayMetadata RelayMetadata
 
 func LoadRelayMetadataJSON() error {
-	return LoadRelayMetadata("relay_metadata.json")
+	return LoadRelayMetadata("app/relay_metadata.json")
 }
 
 func LoadRelayMetadata(filename string) error {

main.go

@@ -2,12 +2,12 @@ package main
 
 import (
 	"fmt"
+	"grain/app"
 	"grain/config"
 	configTypes "grain/config/types"
-	"grain/relay"
+	relay "grain/server"
-	"grain/relay/db"
+	"grain/server/db"
-	"grain/relay/utils"
+	"grain/server/utils"
-	"grain/web"
 
 	"log"
 	"net/http"
@@ -17,7 +17,7 @@ import (
 
 func main() {
 	utils.EnsureFileExists("config.yml", "config/config.example.yml")
-	utils.EnsureFileExists("relay_metadata.json", "web/relay_metadata.example.json")
+	utils.EnsureFileExists("app/relay_metadata.json", "app/relay_metadata.example.json")
 
 	cfg, err := config.LoadConfig("config.yml")
 	if err != nil {
@@ -33,7 +33,7 @@ func main() {
 	config.SetupRateLimiter(cfg)
 	config.SetupSizeLimiter(cfg)
 
-	err = web.LoadRelayMetadataJSON()
+	err = app.LoadRelayMetadataJSON()
 	if err != nil {
 		log.Fatal("Failed to load relay metadata: ", err)
 	}
@@ -67,8 +67,8 @@ func ListenAndServe(w http.ResponseWriter, r *http.Request) {
 			relay.WebSocketHandler(ws)
 		}).ServeHTTP(w, r)
 	} else if r.Header.Get("Accept") == "application/nostr+json" {
-		web.RelayInfoHandler(w, r)
+		app.RelayInfoHandler(w, r)
 	} else {
-		web.RootHandler(w, r)
+		app.RootHandler(w, r)
 	}
 }

server/handlers/event.go

@@ -5,12 +5,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"grain/config"
-	"grain/relay/db"
+	"grain/server/db"
-	"grain/relay/handlers/kinds"
+	"grain/server/handlers/kinds"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	"grain/relay/utils"
+	"grain/server/utils"
 
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"golang.org/x/net/websocket"
 )

server/handlers/kinds/kind0.go

@@ -3,8 +3,8 @@ package kinds
 import (
 	"context"
 	"fmt"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"

server/handlers/kinds/kind1.go

@@ -4,8 +4,8 @@ package kinds
 import (
 	"context"
 	"fmt"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"go.mongodb.org/mongo-driver/mongo"
 	"golang.org/x/net/websocket"

server/handlers/kinds/kind2.go

@@ -2,8 +2,8 @@ package kinds
 
 import (
 	"context"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"golang.org/x/net/websocket"
 )

server/handlers/kinds/kind5.go

@@ -3,8 +3,8 @@ package kinds
 import (
 	"context"
 	"fmt"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 	"strings"
 
 	"go.mongodb.org/mongo-driver/bson"

server/handlers/kinds/regular.go

@@ -3,8 +3,8 @@ package kinds
 import (
 	"context"
 	"fmt"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"go.mongodb.org/mongo-driver/mongo"
 	"golang.org/x/net/websocket"

server/handlers/kinds/replaceable.go

@@ -3,8 +3,8 @@ package kinds
 import (
 	"context"
 	"fmt"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"

server/handlers/kinds/replaceableParameters.go

@@ -3,8 +3,8 @@ package kinds
 import (
 	"context"
 	"fmt"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"

server/handlers/kinds/unknown.go

@@ -2,8 +2,8 @@ package kinds
 
 import (
 	"context"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"go.mongodb.org/mongo-driver/mongo"
 	"golang.org/x/net/websocket"

server/handlers/req.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"grain/relay/db"
+	"grain/server/db"
-	"grain/relay/handlers/response"
+	"grain/server/handlers/response"
-	relay "grain/relay/types"
+	relay "grain/server/types"
-	"grain/relay/utils"
+	"grain/server/utils"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"

server/relay.go

@@ -3,7 +3,7 @@ package relay
 import (
 	"encoding/json"
 	"fmt"
-	"grain/relay/handlers"
+	"grain/server/handlers"
 
 	"grain/config"
 

server/utils/checkSig.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"log"
 
-	relay "grain/relay/types"
+	relay "grain/server/types"
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"