SuperSeriousBusiness
/
GoToSocial
mirror of https://github.com/superseriousbusiness/gotosocial
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[bugfix] serialize instance terms via API (#2293)

This commit is contained in:
tobi 2023-10-24 14:23:22 +02:00 committed by GitHub
parent 30b53f352b
commit cc313f58cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/model/instancev1.go
View File

@ -90,6 +90,8 @@ type InstanceV1 struct {
MaxTootChars uint `json:"max_toot_chars"` MaxTootChars uint `json:"max_toot_chars"`
// An itemized list of rules for this instance. // An itemized list of rules for this instance.
Rules []InstanceRule `json:"rules"` Rules []InstanceRule `json:"rules"`
// Terms and conditions for accounts on this instance.
Terms string `json:"terms,omitempty"`
} }
// InstanceV1URLs models instance-relevant URLs for client application consumption. // InstanceV1URLs models instance-relevant URLs for client application consumption.

2
internal/api/model/instancev2.go
View File

@ -64,6 +64,8 @@ type InstanceV2 struct {
Contact InstanceV2Contact `json:"contact"` Contact InstanceV2Contact `json:"contact"`
// An itemized list of rules for this instance. // An itemized list of rules for this instance.
Rules []InstanceRule `json:"rules"` Rules []InstanceRule `json:"rules"`
// Terms and conditions for accounts on this instance.
Terms string `json:"terms,omitempty"`
} }
// Usage data for this instance. // Usage data for this instance.

2
internal/typeutils/internaltofrontend.go
View File

@ -805,6 +805,7 @@ func (c *Converter) InstanceToAPIV1Instance(ctx context.Context, i *gtsmodel.Ins
InvitesEnabled: false, // todo: not supported yet InvitesEnabled: false, // todo: not supported yet
MaxTootChars: uint(config.GetStatusesMaxChars()), MaxTootChars: uint(config.GetStatusesMaxChars()),
Rules: c.InstanceRulesToAPIRules(i.Rules), Rules: c.InstanceRulesToAPIRules(i.Rules),
Terms: i.Terms,
} }
if config.GetInstanceInjectMastodonVersion() { if config.GetInstanceInjectMastodonVersion() {
@ -909,6 +910,7 @@ func (c *Converter) InstanceToAPIV2Instance(ctx context.Context, i *gtsmodel.Ins
Usage: apimodel.InstanceV2Usage{}, // todo: not implemented Usage: apimodel.InstanceV2Usage{}, // todo: not implemented
Languages: []string{}, // todo: not implemented Languages: []string{}, // todo: not implemented
Rules: c.InstanceRulesToAPIRules(i.Rules), Rules: c.InstanceRulesToAPIRules(i.Rules),
Terms: i.Terms,
} }
if config.GetInstanceInjectMastodonVersion() { if config.GetInstanceInjectMastodonVersion() {