Improve Bool initializer init?(_: String?)

F1248 · Dec 30, 2024 · 819f1de · 819f1de
1 parent 1be55ac
commit 819f1de
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/Genius/Extensions/Swift/Bool.swift b/Genius/Extensions/Swift/Bool.swift
@@ -19,21 +19,23 @@ extension Bool: DataInitializable {
 	}
 
 	init?(_ string: String?) {
-		guard let string = string?.lowercased() else { return nil }
+		guard
+			let string = string.map({ $0[($0.range(of: ":", options: .backwards)?.upperBound ?? $0.startIndex)...] })?.lowercased()
+		else { return nil }
 		if string.contains(any: [
-			"no",
-			"off",
-			"false",
-			"disabled",
-		]) {
-			self = false
-		} else if string.contains(any: [
 			"yes",
 			"on",
 			"true",
 			"enabled",
 		]) {
 			self = true
+		} else if string.contains(any: [
+			"no",
+			"off",
+			"false",
+			"disabled",
+		]) {
+			self = false
 		} else { return nil }
 	}
 }