From 6ce598d193e739000f57adf0501cd2d1edbca54d Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Tue, 9 May 2023 23:36:12 +0400 Subject: [PATCH] Instead of creating an instance get it as an argument. --- internal/http/handlers.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/internal/http/handlers.go b/internal/http/handlers.go index e06b824..4377634 100644 --- a/internal/http/handlers.go +++ b/internal/http/handlers.go @@ -13,7 +13,6 @@ import ( "git.arav.su/Arav/dwelling-home/web" "git.arav.su/Arav/justcaptcha/pkg/captcha/inmemdb" "git.arav.su/Arav/justcaptcha/pkg/dwcaptcha" - gbsqlite "git.arav.su/Arav/justguestbook/database/sqlite" "git.arav.su/Arav/justguestbook/guestbook" ) @@ -24,16 +23,9 @@ type Handlers struct { guestbookPageSize int64 } -func NewHandlers(captchaExpire time.Duration, dbPath, gbOwner string, gbPageSize int64) *Handlers { - gbdb, err := gbsqlite.New(dbPath + "/guestbook.sqlite") - if err != nil { - panic(err) - } - - inmemdb.SetExpiry(captchaExpire) - +func NewHandlers(captchaExpire time.Duration, gbOwner string, gbPageSize int64, db guestbook.Guestbook) *Handlers { return &Handlers{ - guestbookDB: gbdb, + guestbookDB: db, captchaExpire: captchaExpire, guestbookOwner: gbOwner, guestbookPageSize: gbPageSize}