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

Merge branch 'main' into relax_account_uri_uniqueness

Browse source
This commit is contained in:
tobi 2025-04-06 11:00:08 +02:00
commit 39339dc832
71 changed files with 1735 additions and 910 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/typeutils/internaltofrontend.go
View file

@ -2181,7 +2181,7 @@ func (c *Converter) DomainPermToAPIDomainPerm(
domainPerm := &apimodel.DomainPermission{
Domain: apimodel.Domain{
Domain: domain,
PublicComment: d.GetPublicComment(),
PublicComment: util.Ptr(d.GetPublicComment()),
},
}
@ -2192,8 +2192,8 @@ func (c *Converter) DomainPermToAPIDomainPerm(
}
domainPerm.ID = d.GetID()
domainPerm.Obfuscate = util.PtrOrZero(d.GetObfuscate())
domainPerm.PrivateComment = d.GetPrivateComment()
domainPerm.Obfuscate = d.GetObfuscate()
domainPerm.PrivateComment = util.Ptr(d.GetPrivateComment())
domainPerm.SubscriptionID = d.GetSubscriptionID()
domainPerm.CreatedBy = d.GetCreatedByAccountID()
if createdAt := d.GetCreatedAt(); !createdAt.IsZero() {