fix: temporary fix 500 (#37)

bbconfhq · Jan 9, 2024 · 36a055f · 36a055f
1 parent 0e7f301
commit 36a055f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/frontend/src/routes/[id]/+page.svelte b/frontend/src/routes/[id]/+page.svelte
@@ -51,14 +51,18 @@
     return html;
   };
 
-  if (payload.language !== 'auto') {
-    if (calorLanguages.includes(calorRemap(payload.language))) {
-      value = calorHighlighter(payload.content, calorRemap(payload.language));
+  if (payload?.language == null) {
+    value = calorHighlighter(payload.content);
+  } else {
+    if (payload.language !== 'auto') {
+      if (calorLanguages.includes(calorRemap(payload.language))) {
+        value = calorHighlighter(payload.content, calorRemap(payload.language));
+      } else {
+        value = hljs.highlight(payload.content, { language: payload.language }).value;
+      }
     } else {
-      value = hljs.highlight(payload.content, { language: payload.language }).value;
+      value = hljs.highlightAuto(payload.content).value;
     }
-  } else {
-    value = hljs.highlightAuto(payload.content).value;
   }
   const lines = value.split(/\r?\n/);
   const lineNumberWidth = 20 + lines.length.toString().length * 8;

diff --git a/server/handlers/code/code.go b/server/handlers/code/code.go
@@ -1,13 +1,15 @@
 package code
 
 import (
+	"log"
+	"net"
+	"time"
+
 	"github.com/bbconfhq/ohmycodes/models"
 	"github.com/bbconfhq/ohmycodes/repository"
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	gonanoid "github.com/matoous/go-nanoid/v2"
-	"net"
-	"time"
 )
 
 type Response struct {
@@ -26,6 +28,7 @@ func GetList(c *fiber.Ctx) error {
 	if err != nil {
 		status, errs = fiber.StatusInternalServerError, 1
 		result = nil
+		log.Printf("GetList error: %v", err)
 	}
 
 	return c.Status(status).JSON(Response{
@@ -42,6 +45,7 @@ func GetOne(c *fiber.Ctx) error {
 	if err != nil {
 		status, errs = fiber.StatusInternalServerError, 1
 		result = nil
+		log.Printf("GetOne error: %v", err)
 	}
 
 	return c.Status(status).JSON(Response{