From 186a9e267815e7caa62391fdc7b8cbd842922610 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Tue, 9 Sep 2025 23:38:41 +0100 Subject: Pass config to api and fix bad join --- api/router.go | 2 +- main.go | 2 ++ pkg/database/query/entries.sql | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/router.go b/api/router.go index 9ea7ac0..ec7ac4d 100644 --- a/api/router.go +++ b/api/router.go @@ -14,7 +14,7 @@ type ApiServices struct { EntiresService entries.Service HtmlService html.Service - Config config.Config + Config *config.Config } func NewServer(api ApiServices) *http.ServeMux { diff --git a/main.go b/main.go index 556fd35..4250a24 100644 --- a/main.go +++ b/main.go @@ -43,6 +43,8 @@ func run() error { api := api.NewServer(api.ApiServices{ EntiresService: entriesService, HtmlService: htmlService, + + Config: c, }) slog.Info("starting HTTP server", "host", c.Server.Host, "port", c.Server.Port) diff --git a/pkg/database/query/entries.sql b/pkg/database/query/entries.sql index 1927468..1f39016 100644 --- a/pkg/database/query/entries.sql +++ b/pkg/database/query/entries.sql @@ -7,5 +7,5 @@ RETURNING *; -- name: GetEntries :many SELECT title, url, description, timestamp, kinds.name as kind_name, kinds.emoji as kind_emoji FROM entries -JOIN kinds ON entries.id == kinds.id +JOIN kinds ON entries.kind == kinds.id ORDER BY timestamp DESC; -- cgit v1.2.3-70-g09d2