From e9e17ed263699d9dfba7f803f8967395c7370ddd Mon Sep 17 00:00:00 2001
From: Niko Abeler <niko@rerere.org>
Date: Sat, 8 Jul 2023 14:32:20 +0200
Subject: [PATCH] first image \o/

---
 web/app.go                                |  4 ++--
 web/media_handler.go                      | 13 +++++++++----
 web/templates/views/entry/ImageEntry.tmpl |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/web/app.go b/web/app.go
index b6d2fa9..583683e 100644
--- a/web/app.go
+++ b/web/app.go
@@ -26,7 +26,7 @@ func NewWebApp(
 	indexHandler := NewIndexHandler(entryService)
 	listHandler := NewListHandler(entryService)
 	entryHandler := NewEntryHandler(entryService, typeRegistry)
-	mediaHandler := NewMediaHandler(entryService)
+	mediaHandler := NewMediaHandler(binService)
 	rssHandler := NewRSSHandler(entryService)
 	loginHandler := NewLoginHandler(authorService)
 	editorListHandler := NewEditorListHandler(typeRegistry)
@@ -47,7 +47,7 @@ func NewWebApp(
 	app.Get("/", indexHandler.Handle)
 	app.Get("/lists/:list/", listHandler.Handle)
 	// Media
-	app.Get("/media/*filepath", mediaHandler.Handle)
+	app.Get("/media/:id", mediaHandler.Handle)
 	// RSS
 	app.Get("/index.xml", rssHandler.Handle)
 	// Posts
diff --git a/web/media_handler.go b/web/media_handler.go
index f0a7743..7fb7e5f 100644
--- a/web/media_handler.go
+++ b/web/media_handler.go
@@ -7,13 +7,18 @@ import (
 )
 
 type MediaHandler struct {
-	entrySvc *app.EntryService
+	binaryService *app.BinaryService
 }
 
-func NewMediaHandler(entryService *app.EntryService) *MediaHandler {
-	return &MediaHandler{entrySvc: entryService}
+func NewMediaHandler(binaryService *app.BinaryService) *MediaHandler {
+	return &MediaHandler{binaryService: binaryService}
 }
 
 func (h *MediaHandler) Handle(c *fiber.Ctx) error {
-	return c.SendString("Hello, Media!")
+	id := c.Params("id")
+	binary, err := h.binaryService.FindById(id)
+	if err != nil {
+		return err
+	}
+	return c.Send(binary.Data)
 }
diff --git a/web/templates/views/entry/ImageEntry.tmpl b/web/templates/views/entry/ImageEntry.tmpl
index aee8544..71521c8 100644
--- a/web/templates/views/entry/ImageEntry.tmpl
+++ b/web/templates/views/entry/ImageEntry.tmpl
@@ -2,7 +2,7 @@
 
 {{define "main"}}
 
-{{.MetaData.ImageId}}
+<img src="/media/{{.MetaData.ImageId}}">
 
 <p>
 {{.Content}}