Merge branch 'main' into media_refactor

This commit is contained in:
tsmethurst
2022-02-08 12:17:18 +01:00
78 changed files with 1853 additions and 794 deletions

View File

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