From 0884f89431cd26bcc9674b3b7ab628b090f5881e Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Tue, 7 Dec 2021 13:31:39 +0100
Subject: Implement Cobra CLI tooling, Viper config tooling (#336)

* start pulling out + replacing urfave and config

* replace many many instances of config

* move more stuff => viper

* properly remove urfave

* move some flags to root command

* add testrig commands to root

* alias config file keys

* start adding cli parsing tests

* reorder viper init

* remove config path alias

* fmt

* change config file keys to non-nested

* we're more or less in business now

* tidy up the common func

* go fmt

* get tests passing again

* add note about the cliparsing tests

* reorganize

* update docs with changes

* structure cmd dir better

* rename + move some files around

* fix dangling comma
---
 internal/db/bundb/instance.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'internal/db/bundb/instance.go')

diff --git a/internal/db/bundb/instance.go b/internal/db/bundb/instance.go
index 006a76e24..4c47a96f4 100644
--- a/internal/db/bundb/instance.go
+++ b/internal/db/bundb/instance.go
@@ -20,7 +20,9 @@ package bundb
 
 import (
 	"context"
+
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
 
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -29,8 +31,7 @@ import (
 )
 
 type instanceDB struct {
-	config *config.Config
-	conn   *DBConn
+	conn *DBConn
 }
 
 func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int, db.Error) {
@@ -40,7 +41,8 @@ func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int
 		Where("username != ?", domain).
 		Where("? IS NULL", bun.Ident("suspended_at"))
 
-	if domain == i.config.Host {
+	host := viper.GetString(config.Keys.Host)
+	if domain == host {
 		// if the domain is *this* domain, just count where the domain field is null
 		q = q.WhereGroup(" AND ", whereEmptyOrNull("domain"))
 	} else {
@@ -59,7 +61,8 @@ func (i *instanceDB) CountInstanceStatuses(ctx context.Context, domain string) (
 		NewSelect().
 		Model(&[]*gtsmodel.Status{})
 
-	if domain == i.config.Host {
+	host := viper.GetString(config.Keys.Host)
+	if domain == host {
 		// if the domain is *this* domain, just count where local is true
 		q = q.Where("local = ?", true)
 	} else {
@@ -80,7 +83,8 @@ func (i *instanceDB) CountInstanceDomains(ctx context.Context, domain string) (i
 		NewSelect().
 		Model(&[]*gtsmodel.Instance{})
 
-	if domain == i.config.Host {
+	host := viper.GetString(config.Keys.Host)
+	if domain == host {
 		// if the domain is *this* domain, just count other instances it knows about
 		// exclude domains that are blocked
 		q = q.
-- 
cgit v1.2.3