mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2026-01-08 06:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

update instance v1 / v2 endpoints to set uri / domain correctly (i.e. account domain)

Browse source
This commit is contained in:
kim 2024-10-22 15:12:06 +01:00
commit 3f0b660d3a
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/typeutils/internaltofrontend.go
View file

@ -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 // 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) { 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{ instance := &apimodel.InstanceV1{
URI: i.URI, URI: domain,
AccountDomain: config.GetAccountDomain(), AccountDomain: accDomain,
Title: i.Title, Title: i.Title,
Description: i.Description, Description: i.Description,
DescriptionText: i.DescriptionText, 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 // 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) { 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{ instance := &apimodel.InstanceV2{
Domain: i.Domain, Domain: domain,
AccountDomain: config.GetAccountDomain(), AccountDomain: accDomain,
Title: i.Title, Title: i.Title,
Version: config.GetSoftwareVersion(), Version: config.GetSoftwareVersion(),
SourceURL: instanceSourceURL, SourceURL: instanceSourceURL,