diff --git a/socketserver/internal/server/backend.go b/socketserver/internal/server/backend.go index b966b354..72d74b22 100644 --- a/socketserver/internal/server/backend.go +++ b/socketserver/internal/server/backend.go @@ -181,7 +181,26 @@ func FetchBacklogData(chatSubs []string) ([]ClientMessage, error) { func GenerateKeys(outputFile, serverId, theirPublicStr string) { var err error - output := ConfigFile{} + output := ConfigFile{ + ListenAddr: "0.0.0.0:8001", + SocketOrigin: "localhost:8001", + BackendUrl: "http://localhost:8002/ffz", + BannerHTML: ` + +CatBag + +
+
+
+
+
+
+ A FrankerFaceZ Service + — CatBag by Wolsk +
+
+`, + } output.ServerId, err = strconv.Atoi(serverId) if err != nil { @@ -203,7 +222,6 @@ func GenerateKeys(outputFile, serverId, theirPublicStr string) { output.BackendPublicKey = theirPublic } - fmt.Println(ourPublic, ourPrivate) bytes, err := json.MarshalIndent(output, "", "\t") if err != nil { log.Fatal(err) diff --git a/socketserver/internal/server/handlecore.go b/socketserver/internal/server/handlecore.go index 7ff9db07..f227db8b 100644 --- a/socketserver/internal/server/handlecore.go +++ b/socketserver/internal/server/handlecore.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "golang.org/x/net/websocket" - "html/template" "log" "net/http" "strconv" @@ -112,37 +111,18 @@ func SetupServerAndHandle(config *ConfigFile, tlsConfig *tls.Config, serveMux *h serveMux = http.DefaultServeMux } serveMux.HandleFunc("/", ServeWebsocketOrCatbag(sockServer.ServeHTTP)) - serveMux.Handle("/assets", http.FileServer(nil)) // TODO serveMux.HandleFunc("/pub_msg", HBackendPublishRequest) serveMux.HandleFunc("/dump_backlog", HBackendDumpBacklog) serveMux.HandleFunc("/update_and_pub", HBackendUpdateAndPublish) } -var Memes = template.Must(template.New("catbag").Parse(` - -CatBag - -
-
-
-
-
-
- A FrankerFaceZ Service - — CatBag by Wolsk -
- This socket server hosted by {{.}} -
-
-`)) - func ServeWebsocketOrCatbag(sockfunc func(http.ResponseWriter, *http.Request)) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { if r.Header.Get("Connection") == "Upgrade" { sockfunc(w, r) return } else { - Memes.Execute(w, "Todo Add Feature") + w.Write([]byte(gconfig.BannerHTML)) } } }