Fix messy / broken Homescript functions in API

Author: MikMuellerDev

server/api/homescript.go

@@ -148,23 +148,23 @@ func LintHomescriptId(w http.ResponseWriter, r *http.Request) {
 	hmsData, found, err := database.GetUserHomescriptById(request.Id, username)
 	if err != nil {
 		w.WriteHeader(http.StatusServiceUnavailable)
-		Res(w, Response{Success: false, Message: "could not retrieve Homescript from database", Error: "database failure"})
+		Res(w, Response{Success: false, Message: "Could not retrieve Homescript from database", Error: "database failure"})
 		return
 	}
 	if !found {
 		w.WriteHeader(http.StatusUnprocessableEntity)
 		Res(w, Response{Success: false, Message: "Homescript not found", Error: "no data associated with id"})
 		return
 	}
-	// Run the Homescript
-	output, exitCode, hmsErrors := homescript.Run(username, request.Id, hmsData.Data.Code, false, args)
+	// Lint the Homescript
+	output, exitCode, hmsErrors := homescript.Run(username, request.Id, hmsData.Data.Code, true, args)
 	if len(hmsErrors) > 0 {
 		w.WriteHeader(http.StatusInternalServerError)
 		if err := json.NewEncoder(w).Encode(
 			HomescriptResponse{
 				Success:  false,
 				Exitcode: exitCode,
-				Message:  "Homescript terminated abnormally",
+				Message:  "Linting discovered errors",
 				Output:   output,
 				Errors:   hmsErrors,
 			}); err != nil {
@@ -179,7 +179,7 @@ func LintHomescriptId(w http.ResponseWriter, r *http.Request) {
 			HomescriptResponse{
 				Success:  false,
 				Exitcode: exitCode,
-				Message:  "Homescript exited with a non-0 status code",
+				Message:  "Linting exited with non-0 status code but ran successfully",
 				Output:   output,
 				Errors:   hmsErrors,
 			}); err != nil {
@@ -191,7 +191,7 @@ func LintHomescriptId(w http.ResponseWriter, r *http.Request) {
 	if err := json.NewEncoder(w).Encode(
 		HomescriptResponse{
 			Success:  true,
-			Message:  "Homescript ran successfully",
+			Message:  "Linting discovered no errors",
 			Output:   output,
 			Exitcode: exitCode,
 			Errors:   hmsErrors,
@@ -210,7 +210,7 @@ func RunHomescriptString(w http.ResponseWriter, r *http.Request) {
 	}
 	decoder := json.NewDecoder(r.Body)
 	decoder.DisallowUnknownFields()
-	var request HomescriptIdRunRequest
+	var request HomescriptLiveRunRequest
 	if err := decoder.Decode(&request); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
 		Res(w, Response{Success: false, Message: "bad request", Error: "invalid request body"})
@@ -221,26 +221,15 @@ func RunHomescriptString(w http.ResponseWriter, r *http.Request) {
 	for _, arg := range request.Args {
 		args[arg.Key] = arg.Value
 	}
-	hmsData, found, err := database.GetUserHomescriptById(request.Id, username)
-	if err != nil {
-		w.WriteHeader(http.StatusServiceUnavailable)
-		Res(w, Response{Success: false, Message: "could not retrieve Homescript from database", Error: "database failure"})
-		return
-	}
-	if !found {
-		w.WriteHeader(http.StatusUnprocessableEntity)
-		Res(w, Response{Success: false, Message: "Homescript not found", Error: "no data associated with id"})
-		return
-	}
-	// Lint the Homescript
-	output, exitCode, hmsErrors := homescript.Run(username, request.Id, hmsData.Data.Code, true, args)
+	// Run the Homescript
+	output, exitCode, hmsErrors := homescript.Run(username, "live", request.Code, false, args)
 	if len(hmsErrors) > 0 {
 		w.WriteHeader(http.StatusInternalServerError)
 		if err := json.NewEncoder(w).Encode(
 			HomescriptResponse{
 				Success:  false,
 				Exitcode: exitCode,
-				Message:  "Linting discovered errors",
+				Message:  "Homescript terminated abnormally",
 				Output:   output,
 				Errors:   hmsErrors,
 			}); err != nil {
@@ -255,7 +244,7 @@ func RunHomescriptString(w http.ResponseWriter, r *http.Request) {
 			HomescriptResponse{
 				Success:  false,
 				Exitcode: exitCode,
-				Message:  "Linting exited with non-0 status code but ran successfully",
+				Message:  "Homescript exited with a non-0 status code",
 				Output:   output,
 				Errors:   hmsErrors,
 			}); err != nil {
@@ -267,7 +256,7 @@ func RunHomescriptString(w http.ResponseWriter, r *http.Request) {
 	if err := json.NewEncoder(w).Encode(
 		HomescriptResponse{
 			Success:  true,
-			Message:  "Linting discovered no errors",
+			Message:  "Homescript ran successfully",
 			Output:   output,
 			Exitcode: exitCode,
 			Errors:   hmsErrors,