[bugfix] fix double firing bun.DB query hooks (#2124)

* improve bun.DB wrapping readability + comments, fix double-firing query hooks

* fix incorrect code comment placement

* fix linter issues

* Update internal/db/basic.go

* do as the linter commmands ...

---------

Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: Daenney <daenney@users.noreply.github.com>

4 files changed, 5 insertions, 5 deletions

diff --git a/cmd/gotosocial/action/admin/media/prune/all.go b/cmd/gotosocial/action/admin/media/prune/all.go
index 90c08c7db..b334feb6d 100644
--- a/cmd/gotosocial/action/admin/media/prune/all.go
+++ b/cmd/gotosocial/action/admin/media/prune/all.go
@@ -36,7 +36,7 @@ var All action.GTSAction = func(ctx context.Context) error {
 
 	defer func() {
 		// Ensure pruner gets shutdown on exit.
-		if err := prune.shutdown(ctx); err != nil {
+		if err := prune.shutdown(); err != nil {
 			log.Error(ctx, err)
 		}
 	}()
diff --git a/cmd/gotosocial/action/admin/media/prune/common.go b/cmd/gotosocial/action/admin/media/prune/common.go
index ad721675e..ed272984b 100644
--- a/cmd/gotosocial/action/admin/media/prune/common.go
+++ b/cmd/gotosocial/action/admin/media/prune/common.go
@@ -74,14 +74,14 @@ func setupPrune(ctx context.Context) (*prune, error) {
 	}, nil
 }
 
-func (p *prune) shutdown(ctx context.Context) error {
+func (p *prune) shutdown() error {
 	errs := gtserror.NewMultiError(2)
 
 	if err := p.storage.Close(); err != nil {
 		errs.Appendf("error closing storage backend: %w", err)
 	}
 
-	if err := p.dbService.Stop(ctx); err != nil {
+	if err := p.dbService.Close(); err != nil {
 		errs.Appendf("error stopping database: %w", err)
 	}
 
diff --git a/cmd/gotosocial/action/admin/media/prune/orphaned.go b/cmd/gotosocial/action/admin/media/prune/orphaned.go
index a94c84422..e9cb27256 100644
--- a/cmd/gotosocial/action/admin/media/prune/orphaned.go
+++ b/cmd/gotosocial/action/admin/media/prune/orphaned.go
@@ -36,7 +36,7 @@ var Orphaned action.GTSAction = func(ctx context.Context) error {
 
 	defer func() {
 		// Ensure pruner gets shutdown on exit.
-		if err := prune.shutdown(ctx); err != nil {
+		if err := prune.shutdown(); err != nil {
 			log.Error(ctx, err)
 		}
 	}()
diff --git a/cmd/gotosocial/action/admin/media/prune/remote.go b/cmd/gotosocial/action/admin/media/prune/remote.go
index ed521cfe8..5efa5602a 100644
--- a/cmd/gotosocial/action/admin/media/prune/remote.go
+++ b/cmd/gotosocial/action/admin/media/prune/remote.go
@@ -37,7 +37,7 @@ var Remote action.GTSAction = func(ctx context.Context) error {
 
 	defer func() {
 		// Ensure pruner gets shutdown on exit.
-		if err := prune.shutdown(ctx); err != nil {
+		if err := prune.shutdown(); err != nil {
 			log.Error(ctx, err)
 		}
 	}()