diff options
Diffstat (limited to 'internal/typeutils/internaltofrontend.go')
| -rw-r--r-- | internal/typeutils/internaltofrontend.go | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index 11bc73dc3..03b24fc9c 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -1523,9 +1523,15 @@ func (c *Converter) InstanceRuleToAdminAPIRule(r *gtsmodel.Rule) *apimodel.Admin // InstanceToAPIV1Instance converts a gts instance into its api equivalent for serving at /api/v1/instance func (c *Converter) InstanceToAPIV1Instance(ctx context.Context, i *gtsmodel.Instance) (*apimodel.InstanceV1, error) { + domain := i.Domain + accDomain := config.GetAccountDomain() + if accDomain != "" { + domain = accDomain + } + instance := &apimodel.InstanceV1{ - URI: i.URI, - AccountDomain: config.GetAccountDomain(), + URI: domain, + AccountDomain: accDomain, Title: i.Title, Description: i.Description, DescriptionText: i.DescriptionText, @@ -1642,9 +1648,15 @@ func (c *Converter) InstanceToAPIV1Instance(ctx context.Context, i *gtsmodel.Ins // InstanceToAPIV2Instance converts a gts instance into its api equivalent for serving at /api/v2/instance func (c *Converter) InstanceToAPIV2Instance(ctx context.Context, i *gtsmodel.Instance) (*apimodel.InstanceV2, error) { + domain := i.Domain + accDomain := config.GetAccountDomain() + if accDomain != "" { + domain = accDomain + } + instance := &apimodel.InstanceV2{ - Domain: i.Domain, - AccountDomain: config.GetAccountDomain(), + Domain: domain, + AccountDomain: accDomain, Title: i.Title, Version: config.GetSoftwareVersion(), SourceURL: instanceSourceURL, |