Skip to content

Commit 2c2c963

Browse files
authored
fix: PlayerProfile.Property 会在值不为 base64 时 decode 失败 (#205)
1 parent fa9de3b commit 2c2c963

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

PCL.Mac.Core/Models/PlayerProfile.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public struct PlayerProfile: Codable {
1818
self.properties = properties
1919
}
2020

21-
public func property(forName name: String) -> Data? {
21+
public func property(forName name: String) -> String? {
2222
return properties.first(where: { $0.name == name })?.value
2323
}
2424

@@ -45,6 +45,6 @@ public struct PlayerProfile: Codable {
4545
public struct Property: Codable {
4646
public let name: String
4747
public let signature: String?
48-
public let value: Data
48+
public let value: String
4949
}
5050
}

PCL.Mac/ViewModels/AccountViewModel.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ class AccountViewModel: ObservableObject {
8585
public func skinData(for account: Account) async -> Data {
8686
let defaultSkin: Data = .init(base64Encoded: "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAAdVBMVEUAAAAKvLwAzMwmGgokGAgrHg0zJBE/KhW3g2uzeV5SPYn///+qclmbY0mQWT8Af38AaGhVVVWUYD52SzOBUzmPXj5JJRBCHQp3QjVqQDA0JRIoKCg3Nzc/Pz9KSko6MYlBNZtGOqUDenoFiIgElZUApKQAr6/wvakZAAAAAXRSTlMAQObYZgAAAolJREFUeNrt1l1rHucZReFrj/whu5hSCCQtlOTE/f+/Jz4q9Cu0YIhLcFVpVg+FsOCVehi8jmZgWOzZz33DM4CXlum3gH95GgeAzQZVeL4gTm6Cbp4vqFkD8HwBazPY8wWbMq9utu3mNZ5fotVezbzOE3kBEFbaZuc8kb00NTMUbWJp678Xf2GV7RRtx1TDQQ6XBNvsmL2+2vHq1TftmMPIyAWujtN2cl274ua2jpVpZneXEjjo7XW1q53V9ds4ODO5xIuhvGHvfLI3aixauig415uuO2+vl9+cncfsFw25zL650fXn687jqnXuP68/X3+eV3zE7y6u9eB73MlfAcfbTf3yR8CfAX+if8S/H5/EAbAxj5LN48tULvEBOh8V1AageMTXe2YHAOwHbZxrzPkSR3+ffr8TR2JDzE/4Fj8CDgEwDsW+q+9GsR07hhg2CsALBgMo2v5wNxXnQXMeGQVW7gUAyKI2m6KDsJ8Au3++F5RZO+kKNQjQcLLWgjwUjBXLltFgWWMUUlviocBgNoxNGgMjSxiYAA7zgLFo2hgIENiDU8gQCzDOmViGFAsEuBcQSDCothhpJaDRA8E5fHqH2nTbYm5fHLo1V0u3B7DAuheoeScRYabjjjuzs17cHVaTrTXmK78m9swP34d9oK/dfeXSIH2PW/MXwPvxN/bJlxw8zlYAcEyeI6gNgA/O8P8neN8xe1IHP2gTzegjvhUDfuRygmwEs2GE4mkCDIAzm2R4yAuPsIdR9k8AvMc+3L9+2UEjo4WP0FpgP19O0MzCsqxIoMsdDBvYcQyGmO0ZJRoYCKjLJWY0BAhYwGUBCgkh8MRdOKt+ruqMwAB2OcEX94U1TPbYJP0PkyyAI1S6cSIAAAAASUVORK5CYII=")!
8787
do {
88-
guard let textures: Data = account.profile.property(forName: "textures") else {
88+
guard let textures: Data = account.profile.property(forName: "textures")
89+
.flatMap({ Data(base64Encoded: $0) }) else {
8990
return defaultSkin
9091
}
9192
let json: JSON = try .init(data: textures)

0 commit comments

Comments
 (0)