Fixing the branch so it works again

Making sure that the images point to the new
updated image directory. Also, fixed the error
reporting for the image GET endpoint where the
image isn't on the DB.

app/app.go

@@ -58,7 +58,7 @@ func addCachableHandler(e *gin.Engine, method string, endpoint string, generator
 		if err != nil {
 			log.Error().Msgf("could not generate html: %v", err)
 			// TODO : Need a proper error page
-			c.JSON(http.StatusInternalServerError, common.ErrorRes("could not render HTML", err))
+			// c.JSON(http.StatusInternalServerError, common.ErrorRes("could not render HTML", err))
 			return
 		}
 

app/post.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"bytes"
+	"fmt"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -37,7 +38,7 @@ func postHandler(c *gin.Context, app_settings common.AppSettings, database datab
 	if err != nil || post_binding.Id < 0 {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid post ID"})
 
-		return nil, err
+		return nil, fmt.Errorf("invalid post id")
 	}
 
 	// Get the post with the ID

common/app_settings.go

@@ -20,14 +20,14 @@ type Shortcode struct {
 }
 
 type AppSettings struct {
-	DatabaseAddress  string `toml:"database_address"`
-	DatabasePort     int    `toml:"database_port"`
-	DatabaseUser     string `toml:"database_user"`
-	DatabasePassword string `toml:"database_password"`
-	DatabaseName     string `toml:"database_name"`
-	WebserverPort    int    `toml:"webserver_port"`
-	ImageDirectory   string `toml:"image_dir"`
-	AppNavbar        Navbar `toml:"navbar"`
+	DatabaseAddress  string      `toml:"database_address"`
+	DatabasePort     int         `toml:"database_port"`
+	DatabaseUser     string      `toml:"database_user"`
+	DatabasePassword string      `toml:"database_password"`
+	DatabaseName     string      `toml:"database_name"`
+	WebserverPort    int         `toml:"webserver_port"`
+	ImageDirectory   string      `toml:"image_dir"`
+	AppNavbar        Navbar      `toml:"navbar"`
 	Shortcodes       []Shortcode `toml:"shortcodes"`
 }
 

database/database.go

@@ -184,7 +184,7 @@ func (db SqlDatabase) GetImage(image_id string) (image common.Image, err error)
 		return common.Image{}, err
 	}
 	defer func() {
-		err = errors.Join(rows.Close())
+		err = errors.Join(err, rows.Close())
 	}()
 
 	rows.Next()

plugins/image_shortcode.lua

@@ -1,9 +1,9 @@
 function HandleShortcode(arguments)
     if #arguments == 1 then
-        local image_src = string.format("/media/%s", arguments[1])
+        local image_src = string.format("/data/images/%s", arguments[1])
         return string.format("![image](%s)", image_src)
     elseif #arguments == 2 then
-        local image_src = string.format("/media/%s", arguments[1])
+        local image_src = string.format("/data/images/%s", arguments[1])
         return string.format("![%s](%s)", arguments[2], image_src)
     else
         return ""

tests/app_tests/app_settings/app_settings_test.go

@@ -45,7 +45,7 @@ func TestCorrectToml(t *testing.T) {
 				{Name: "Contact", Href: "/contact", Title: "Contacts page"},
 			},
 		},
-		Shortcodes:       []Shortcode{},
+		Shortcodes: []common.Shortcode{},
 	}
 	bytes, err := toml.Marshal(expected)
 	assert.Nil(t, err)
@@ -61,19 +61,19 @@ func TestCorrectToml(t *testing.T) {
 func TestMissingDatabaseAddress(t *testing.T) {
 
 	missing_database_address := struct {
-		DatabaseUser     string      `toml:"database_user"`
-		DatabasePassword string      `toml:"database_password"`
-		DatabaseName     string      `toml:"database_name"`
-		WebserverPort    string      `toml:"webserver_port"`
-		DatabasePort     string      `toml:"database_port"`
-		Shortcodes       []Shortcode `toml:"shortcodes"`
+		DatabaseUser     string             `toml:"database_user"`
+		DatabasePassword string             `toml:"database_password"`
+		DatabaseName     string             `toml:"database_name"`
+		WebserverPort    string             `toml:"webserver_port"`
+		DatabasePort     string             `toml:"database_port"`
+		Shortcodes       []common.Shortcode `toml:"shortcodes"`
 	}{
 		DatabaseUser:     "test_database_user",
 		DatabasePassword: "test_database_password",
 		DatabaseName:     "test_database_name",
 		WebserverPort:    "99999",
 		DatabasePort:     "666",
-		Shortcodes:       []Shortcode{},
+		Shortcodes:       []common.Shortcode{},
 	}
 
 	bytes, err := toml.Marshal(missing_database_address)

tests/app_tests/endpoint_tests/posts_test.go

@@ -95,6 +95,8 @@ func TestPostFailurePostDoesntExist(t *testing.T) {
 
 	router.ServeHTTP(responseRecorder, request)
 
+	fmt.Printf("Value for the request: %d", responseRecorder.Code)
+
 	require.Equal(t, http.StatusNotFound, responseRecorder.Code)
 }
 

urchin_config.toml

@@ -2,10 +2,10 @@
 database_address = "localhost"
 
 # User to access datbaase
-database_user = "urchin"
+database_user = "root"
 
 # Password for the database user
-database_password = "urchinpw"
+database_password = "root"
 
 # port
 database_port = 3306