diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-12-07 13:31:39 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-12-07 13:31:39 +0100 |
| commit | 0884f89431cd26bcc9674b3b7ab628b090f5881e (patch) | |
| tree | cdd3b3f77f780a8b59d075dbcc3d4d013811e405 /internal/processing/federation/getwebfinger.go | |
| parent | Update dependencies (#333) (diff) | |
| download | gotosocial-0884f89431cd26bcc9674b3b7ab628b090f5881e.tar.xz | |
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
Diffstat (limited to 'internal/processing/federation/getwebfinger.go')
| -rw-r--r-- | internal/processing/federation/getwebfinger.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/internal/processing/federation/getwebfinger.go b/internal/processing/federation/getwebfinger.go index aaa7687be..e16b3e139 100644 --- a/internal/processing/federation/getwebfinger.go +++ b/internal/processing/federation/getwebfinger.go @@ -22,7 +22,9 @@ import ( "context" "fmt" + "github.com/spf13/viper" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/gtserror" ) @@ -41,9 +43,11 @@ func (p *processor) GetWebfingerAccount(ctx context.Context, requestedUsername s return nil, gtserror.NewErrorNotFound(fmt.Errorf("database error getting account with username %s: %s", requestedUsername, err)) } + accountDomain := viper.GetString(config.Keys.AccountDomain) + // return the webfinger representation return &apimodel.WellKnownResponse{ - Subject: fmt.Sprintf("%s:%s@%s", webfingerAccount, requestedAccount.Username, p.config.AccountDomain), + Subject: fmt.Sprintf("%s:%s@%s", webfingerAccount, requestedAccount.Username, accountDomain), Aliases: []string{ requestedAccount.URI, requestedAccount.URL, |