mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-11-16 21:37:29 -06:00
Merge branch 'main' into media_refactor
This commit is contained in:
commit
4c294a596a
78 changed files with 1853 additions and 794 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue