room lobby split to functions.

internal/api/lobby.go

@@ -1,22 +1,41 @@
 package api
 
 import (
-	"m1k1o/neko_rooms/internal/utils"
 	"net/http"
 	"strings"
 
 	"github.com/go-chi/chi"
+
+	"m1k1o/neko_rooms/internal/utils"
 )
 
 func (manager *ApiManagerCtx) RoomLobby(w http.ResponseWriter, r *http.Request) {
 	if !manager.conf.Lobby {
 		http.NotFound(w, r)
-		return
 	}
 
 	roomName := chi.URLParam(r, "roomName")
 	response, err := manager.rooms.FindByName(roomName)
+
 	if err != nil || response.Name != roomName {
+		manager.roomNotFound(w, r)
+		return
+	}
+
+	if !response.Running {
+		manager.roomNotRunning(w, r)
+		return
+	}
+
+	if strings.Contains(response.Status, "starting") {
+		manager.roomNotReady(w, r)
+		return
+	}
+
+	manager.roomReady(w, r)
+}
+
+func (manager *ApiManagerCtx) roomNotFound(w http.ResponseWriter, r *http.Request) {
 	utils.Swal2Response(w, `
 		<div class="swal2-header">
 			<div class="swal2-icon swal2-error">
@@ -28,10 +47,9 @@ func (manager *ApiManagerCtx) RoomLobby(w http.ResponseWriter, r *http.Request)
 			<div>The room you are trying to join does not exist.</div>
 		</div>
 	`)
-		return
 }
 
-	if !response.Running {
+func (manager *ApiManagerCtx) roomNotRunning(w http.ResponseWriter, r *http.Request) {
 	utils.Swal2Response(w, `
 		<div class="swal2-header">
 			<div class="swal2-icon swal2-warning">
@@ -43,10 +61,9 @@ func (manager *ApiManagerCtx) RoomLobby(w http.ResponseWriter, r *http.Request)
 			<div>The room you are trying to join is not running.</div>
 		</div>
 	`)
-		return
 }
 
-	if strings.Contains(response.Status, "starting") {
+func (manager *ApiManagerCtx) roomNotReady(w http.ResponseWriter, r *http.Request) {
 	utils.Swal2Response(w, `
 		<meta http-equiv="refresh" content="2">
 
@@ -64,9 +81,9 @@ func (manager *ApiManagerCtx) RoomLobby(w http.ResponseWriter, r *http.Request)
 			<button type="button" onclick="location = location" class="swal2-confirm swal2-styled" style="margin-top: 1.25em">Reload</button>
 		</div>
 	`)
-		return
 }
 
+func (manager *ApiManagerCtx) roomReady(w http.ResponseWriter, r *http.Request) {
 	utils.Swal2Response(w, `
 		<div class="swal2-header">
 			<div class="swal2-icon swal2-success swal2-icon-show" style="display: flex;">