diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2024-04-11 11:45:53 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-04-11 11:45:53 +0200 |
| commit | 9fb8a78f91adffd5f4d28df1270e407c25a7a16e (patch) | |
| tree | d68200744e28d07e75a52bb0c9f6593c86a38a91 /internal/typeutils | |
| parent | [performance] massively improved ActivityPub delivery worker efficiency (#2812) (diff) | |
| download | gotosocial-9fb8a78f91adffd5f4d28df1270e407c25a7a16e.tar.xz | |
[feature] New user sign-up via web page (#2796)
* [feature] User sign-up form and admin notifs
* add chosen + filtered languages to migration
* remove stray comment
* chosen languages schmosen schmanguages
* proper error on local account missing
Diffstat (limited to 'internal/typeutils')
| -rw-r--r-- | internal/typeutils/internaltofrontend.go | 12 | ||||
| -rw-r--r-- | internal/typeutils/internaltofrontend_test.go | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index daa3568a7..e3786a9ae 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -414,13 +414,13 @@ func (c *Converter) AccountToAdminAPIAccount(ctx context.Context, a *gtsmodel.Ac email = user.UnconfirmedEmail } - if i := user.CurrentSignInIP.String(); i != "<nil>" { + if i := user.SignUpIP.String(); i != "<nil>" { ip = &i } locale = user.Locale - if a.Settings.Reason != "" { - inviteRequest = &a.Settings.Reason + if user.Reason != "" { + inviteRequest = &user.Reason } if *user.Admin { @@ -1003,7 +1003,7 @@ func (c *Converter) InstanceToAPIV1Instance(ctx context.Context, i *gtsmodel.Ins Version: config.GetSoftwareVersion(), Languages: config.GetInstanceLanguages().TagStrs(), Registrations: config.GetAccountsRegistrationOpen(), - ApprovalRequired: config.GetAccountsApprovalRequired(), + ApprovalRequired: true, // approval always required InvitesEnabled: false, // todo: not supported yet MaxTootChars: uint(config.GetStatusesMaxChars()), Rules: c.InstanceRulesToAPIRules(i.Rules), @@ -1172,8 +1172,8 @@ func (c *Converter) InstanceToAPIV2Instance(ctx context.Context, i *gtsmodel.Ins // registrations instance.Registrations.Enabled = config.GetAccountsRegistrationOpen() - instance.Registrations.ApprovalRequired = config.GetAccountsApprovalRequired() - instance.Registrations.Message = nil // todo: not implemented + instance.Registrations.ApprovalRequired = true // always required + instance.Registrations.Message = nil // todo: not implemented // contact instance.Contact.Email = i.ContactEmail diff --git a/internal/typeutils/internaltofrontend_test.go b/internal/typeutils/internaltofrontend_test.go index 329d66425..77ea80fcc 100644 --- a/internal/typeutils/internaltofrontend_test.go +++ b/internal/typeutils/internaltofrontend_test.go @@ -1386,7 +1386,7 @@ func (suite *InternalToFrontendTestSuite) TestAdminReportToFrontend1() { "domain": null, "created_at": "2022-06-04T13:12:00.000Z", "email": "tortle.dude@example.org", - "ip": "118.44.18.196", + "ip": null, "ips": [], "locale": "en", "invite_request": null, @@ -1443,7 +1443,7 @@ func (suite *InternalToFrontendTestSuite) TestAdminReportToFrontend1() { "domain": null, "created_at": "2022-05-17T13:10:59.000Z", "email": "admin@example.org", - "ip": "89.122.255.1", + "ip": null, "ips": [], "locale": "en", "invite_request": null, @@ -1489,7 +1489,7 @@ func (suite *InternalToFrontendTestSuite) TestAdminReportToFrontend1() { "domain": null, "created_at": "2022-05-17T13:10:59.000Z", "email": "admin@example.org", - "ip": "89.122.255.1", + "ip": null, "ips": [], "locale": "en", "invite_request": null, @@ -1558,7 +1558,7 @@ func (suite *InternalToFrontendTestSuite) TestAdminReportToFrontend2() { "domain": null, "created_at": "2022-06-04T13:12:00.000Z", "email": "tortle.dude@example.org", - "ip": "118.44.18.196", + "ip": null, "ips": [], "locale": "en", "invite_request": null, @@ -1880,7 +1880,7 @@ func (suite *InternalToFrontendTestSuite) TestAdminReportToFrontendSuspendedLoca "domain": null, "created_at": "2022-05-17T13:10:59.000Z", "email": "admin@example.org", - "ip": "89.122.255.1", + "ip": null, "ips": [], "locale": "en", "invite_request": null, @@ -1926,7 +1926,7 @@ func (suite *InternalToFrontendTestSuite) TestAdminReportToFrontendSuspendedLoca "domain": null, "created_at": "2022-05-17T13:10:59.000Z", "email": "admin@example.org", - "ip": "89.122.255.1", + "ip": null, "ips": [], "locale": "en", "invite_request": null, |