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/web/confirmemail.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'internal/web/confirmemail.go') diff --git a/internal/web/confirmemail.go b/internal/web/confirmemail.go index 97ed597d3..6eaa940c6 100644 --- a/internal/web/confirmemail.go +++ b/internal/web/confirmemail.go @@ -23,6 +23,8 @@ import ( "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" + "github.com/spf13/viper" + "github.com/superseriousbusiness/gotosocial/internal/config" ) func (m *Module) confirmEmailGETHandler(c *gin.Context) { @@ -43,7 +45,8 @@ func (m *Module) confirmEmailGETHandler(c *gin.Context) { return } - instance, err := m.processor.InstanceGet(ctx, m.config.Host) + host := viper.GetString(config.Keys.Host) + instance, err := m.processor.InstanceGet(ctx, host) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) return -- cgit v1.2.3