zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Add reason_required handling to new account registrations

Browse Source
This commit is contained in:
shannon 2025-03-26 10:34:01 -04:00
parent d02fef490f
commit 491cbd09c3
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift
View File

@ -109,7 +109,7 @@ struct MastodonRegisterView: View {
.padding(.bottom, 22)
// Reason
if viewModel.approvalRequired {
if viewModel.reasonRequired {
VStack(alignment: .leading, spacing: 11) {
TextField(L10n.Scene.Register.Input.Invite.registrationUserInviteRequest.localizedCapitalized, text: $viewModel.reason)
.modifier(FormTextFieldModifier(validateState: viewModel.reasonValidateState))

11
Mastodon/Scene/Onboarding/Register/MastodonRegisterViewModel.swift
View File

@ -57,6 +57,7 @@ final class MastodonRegisterViewModel: ObservableObject {
// output
var diffableDataSource: UITableViewDiffableDataSource<RegisterSection, RegisterItem>?
let approvalRequired: Bool
let reasonRequired: Bool
let minAge: Int?
let applicationAuthorization: Mastodon.API.OAuth.Authorization
@ -94,6 +95,7 @@ final class MastodonRegisterViewModel: ObservableObject {
self.instance = instance
self.applicationToken = applicationToken
self.approvalRequired = instance.approvalRequired ?? false
self.reasonRequired = instance.reasonRequired
self.minAge = instance.minAge
self.applicationAuthorization = Mastodon.API.OAuth.Authorization(accessToken: applicationToken.accessToken)
self.submitValidatedUserRegistration = submitValidatedUserRegistration
@ -323,7 +325,7 @@ final class MastodonRegisterViewModel: ObservableObject {
)
.map { [weak self] reasonValidateState, dobValidateState, passwordConfirmationValidateState -> Bool in
guard let self else { return false }
let reasonOK = !self.approvalRequired || reasonValidateState == .valid
let reasonOK = !self.reasonRequired || reasonValidateState == .valid
let dobOK = (self.minAge == nil) || dobValidateState == .valid
let passwordConfirmationCorrect = passwordConfirmationValidateState == .valid
return reasonOK && dobOK && passwordConfirmationCorrect
@ -506,6 +508,7 @@ extension MastodonRegisterViewModel {
protocol RegistrationInstance {
var approvalRequired: Bool? { get }
var reasonRequired: Bool { get }
var minAge: Int? { get }
var isBeyondVersion1: Bool { get }
var isOpenToNewRegistrations: Bool? { get }
@ -518,6 +521,9 @@ extension Mastodon.Entity.Instance: RegistrationInstance {
return version?.majorServerVersion(greaterThanOrEquals: 4) ?? false
}
var isOpenToNewRegistrations: Bool? { return registrations }
var reasonRequired: Bool {
return approvalRequired ?? false
}
}
extension Mastodon.Entity.V2.Instance: RegistrationInstance {
@ -525,4 +531,7 @@ extension Mastodon.Entity.V2.Instance: RegistrationInstance {
var isBeyondVersion1: Bool { return true }
var isOpenToNewRegistrations: Bool? { return registrations?.enabled }
var approvalRequired: Bool? { return registrations?.approvalRequired }
var reasonRequired: Bool {
return registrations?.reasonRequired ?? approvalRequired ?? false
}
}

2
MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+InstanceV2.swift
View File

@ -91,11 +91,13 @@ extension Mastodon.Entity.V2.Instance {
public let enabled: Bool
public let minAge: Int?
public let approvalRequired: Bool?
public let reasonRequired: Bool?
enum CodingKeys: String, CodingKey {
case enabled
case minAge = "min_age"
case approvalRequired = "approval_required"
case reasonRequired = "reason_required"
}
}
}