refact: refactoring trust rank model

makinosp · Nov 13, 2024 · 041ff7e · 041ff7e
1 parent 6f568ff
commit 041ff7e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/Sources/VRCKit/Models/Tag/SystemTagModel.swift b/Sources/VRCKit/Models/Tag/SystemTagModel.swift
@@ -31,6 +31,15 @@ public enum SystemTag: String, Hashable, Codable, Sendable {
     case systemWorldAccess = "system_world_access"
 }
 
+extension SystemTag {
+    static let rankTags: Set<Self> = [
+        .systemTrustVeteran,
+        .systemTrustTrusted,
+        .systemTrustKnown,
+        .systemTrustBasic
+    ]
+}
+
 extension SystemTag: Identifiable {
     public var id: String { rawValue }
 }
diff --git a/Sources/VRCKit/Models/Tag/TrustRankModel.swift b/Sources/VRCKit/Models/Tag/TrustRankModel.swift
@@ -10,20 +10,16 @@ public enum TrustRank: Equatable, Sendable {
 }
 
 public extension ProfileElementRepresentable {
+    var systemTag: SystemTag? {
+        SystemTag.rankTags.first { tags.systemTags.contains($0) }
+    }
     var trustRank: TrustRank {
-        let rankTags: [SystemTag] = [
-            .systemTrustVeteran,
-            .systemTrustTrusted,
-            .systemTrustKnown,
-            .systemTrustBasic
-        ]
-        let rankTag = rankTags.first { tags.systemTags.contains($0) }
-        guard let rankTag = rankTag else { return .visitor }
-        return switch rankTag {
+        switch systemTag {
         case .systemTrustVeteran: .trusted
         case .systemTrustTrusted: .known
         case .systemTrustKnown: .user
         case .systemTrustBasic: .newUser
+        case nil: .visitor
         default: .unknown
         }
     }