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

Correct handling of approval_required on V2 instances

Browse Source
This commit is contained in:
shannon 2025-03-26 09:21:25 -04:00
parent d911c5a076
commit d02fef490f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,4 +524,5 @@ extension Mastodon.Entity.V2.Instance: RegistrationInstance {
var minAge: Int? { return registrations?.minAge }
var isBeyondVersion1: Bool { return true }
var isOpenToNewRegistrations: Bool? { return registrations?.enabled }
var approvalRequired: Bool? { return registrations?.approvalRequired }
}

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

@ -19,7 +19,6 @@ extension Mastodon.Entity.V2 {
public let apiVersions: [String : Int]?
public let languages: [String]? // (ISO 639 Part 1-5 language codes)
public let registrations: Mastodon.Entity.V2.Instance.Registrations?
public let approvalRequired: Bool?
public let invitesEnabled: Bool?
public let urls: Mastodon.Entity.Instance.InstanceURL?
public let statistics: Mastodon.Entity.Instance.Statistics?
@ -41,7 +40,6 @@ extension Mastodon.Entity.V2 {
self.apiVersions = nil
self.languages = nil
self.registrations = nil
self.approvalRequired = approvalRequired
self.invitesEnabled = nil
self.urls = nil
self.statistics = nil
@ -59,7 +57,6 @@ extension Mastodon.Entity.V2 {
case apiVersions = "api_versions"
case languages
case registrations
case approvalRequired = "approval_required"
case invitesEnabled = "invites_enabled"
case urls
case statistics = "stats"
@ -93,10 +90,12 @@ extension Mastodon.Entity.V2.Instance {
public struct Registrations: Codable {
public let enabled: Bool
public let minAge: Int?
public let approvalRequired: Bool?
enum CodingKeys: String, CodingKey {
case enabled
case minAge = "min_age"
case approvalRequired = "approval_required"
}
}
}