SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

if accountDomain isn't set, use Host value instead (#380)

This commit is contained in:
tobi 2022-02-06 14:07:38 +01:00 committed by GitHub
parent 1b36e85840
commit 85b4f96263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/processing/federation/getwebfinger.go
View File

@ -44,6 +44,9 @@ func (p *processor) GetWebfingerAccount(ctx context.Context, requestedUsername s
} }
accountDomain := viper.GetString(config.Keys.AccountDomain) accountDomain := viper.GetString(config.Keys.AccountDomain)
if accountDomain == "" {
accountDomain = viper.GetString(config.Keys.Host)
}
// return the webfinger representation // return the webfinger representation
return &apimodel.WellKnownResponse{ return &apimodel.WellKnownResponse{

3
internal/typeutils/internaltoas.go
View File

@ -623,6 +623,9 @@ func (c *converter) MentionToAS(ctx context.Context, m *gtsmodel.Mention) (vocab
var domain string var domain string
if m.TargetAccount.Domain == "" { if m.TargetAccount.Domain == "" {
accountDomain := viper.GetString(config.Keys.AccountDomain) accountDomain := viper.GetString(config.Keys.AccountDomain)
if accountDomain == "" {
accountDomain = viper.GetString(config.Keys.Host)
}
domain = accountDomain domain = accountDomain
} else { } else {
domain = m.TargetAccount.Domain domain = m.TargetAccount.Domain