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

[bugfix] Use "comment" via /api/v1/instance

Browse source
This commit is contained in:
tobi 2025-04-04 17:29:15 +02:00
commit 3409e6414c
8 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/processing/admin/domainpermission.go
View file

@ -18,6 +18,7 @@
package admin
import (
"cmp"
"context"
"encoding/json"
"errors"
@ -239,7 +240,7 @@ func (p *Processor) importOrUpdateDomainPerm(
var (
domain = apiDomainPerm.Domain.Domain
obfuscate = apiDomainPerm.Obfuscate
publicComment = apiDomainPerm.PublicComment
publicComment = cmp.Or(apiDomainPerm.PublicComment, apiDomainPerm.Comment)
privateComment = apiDomainPerm.PrivateComment
subscriptionID = "" // No sub ID for imports.
)

6
internal/processing/instance.go
View file

@ -106,9 +106,9 @@ func (p *Processor) InstancePeersGet(ctx context.Context, includeSuspended bool,
}
domains = append(domains, &apimodel.Domain{
Domain: d,
SuspendedAt: util.FormatISO8601(domainBlock.CreatedAt),
PublicComment: &domainBlock.PublicComment,
Domain: d,
SuspendedAt: util.FormatISO8601(domainBlock.CreatedAt),
Comment: &domainBlock.PublicComment,
})
}
}