From c614ce0a7c1ca3a5f9c917115a8005dcd15ff629 Mon Sep 17 00:00:00 2001
From: "Andriy Kushnir (Orhideous)" <me@orhideous.name>
Date: Sat, 14 May 2022 17:01:05 +0300
Subject: [PATCH] Add database pool to ShioriServer struct

---
 internal/api/server.go       | 12 +++++++++---
 internal/webserver/server.go |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/internal/api/server.go b/internal/api/server.go
index 5bd56998eb..9212fc3c87 100644
--- a/internal/api/server.go
+++ b/internal/api/server.go
@@ -1,9 +1,15 @@
 package api
 
+import "github.com/go-shiori/shiori/internal/database"
+
 // ShioriServer holds configuration and connection pools
-type ShioriServer struct{}
+type ShioriServer struct {
+	DB database.DB
+}
 
 // NewShioriServer creates new API server
-func NewShioriServer() *ShioriServer {
-	return &ShioriServer{}
+func NewShioriServer(db database.DB) *ShioriServer {
+	return &ShioriServer{
+		DB: db,
+	}
 }
diff --git a/internal/webserver/server.go b/internal/webserver/server.go
index 63b75328fc..f10b020261 100644
--- a/internal/webserver/server.go
+++ b/internal/webserver/server.go
@@ -242,7 +242,9 @@ func ServeApp(cfg Config) error {
 	swagger.Servers = nil
 
 	// Create server
-	shioriServer := api.NewShioriServer()
+	shioriServer := api.NewShioriServer(
+		cfg.DB,
+	)
 
 	// Leave all legacy API as-is
 	e.Any("/*", echo.WrapHandler(router))