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/account.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/internal/db/bundb/account.go b/internal/db/bundb/account.go
index 9c9dcfc6a..ab6ec2b7c 100644
--- a/internal/db/bundb/account.go
+++ b/internal/db/bundb/account.go
@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/gotosocial/internal/cache"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
@@ -32,9 +33,8 @@ import (
 )
 
 type accountDB struct {
-	config *config.Config
-	conn   *DBConn
-	cache  *cache.AccountCache
+	conn  *DBConn
+	cache *cache.AccountCache
 }
 
 func (a *accountDB) newAccountQ(account *gtsmodel.Account) *bun.SelectQuery {
@@ -132,8 +132,9 @@ func (a *accountDB) GetInstanceAccount(ctx context.Context, domain string) (*gts
 			Where("account.username = ?", domain).
 			Where("account.domain = ?", domain)
 	} else {
+		host := viper.GetString(config.Keys.Host)
 		q = q.
-			Where("account.username = ?", a.config.Host).
+			Where("account.username = ?", host).
 			WhereGroup(" AND ", whereEmptyOrNull("domain"))
 	}
 
-- 
cgit v1.2.3