Skip to content

Commit ba76102

Browse files
committed
refactor: fromStringOrNull
1 parent c91c883 commit ba76102

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/main/kotlin/spp/protocol/platform/auth/RolePermission.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ enum class RolePermission(val manager: Boolean, val commandType: CommandType) {
9595
SHOW_QUICK_STATS(false, LIVE_VIEW);
9696

9797
companion object {
98-
fun fromString(s: String): RolePermission? {
98+
fun fromString(s: String): RolePermission {
99+
return fromStringOrNull(s) ?: RolePermission.valueOf(s)
100+
}
101+
102+
fun fromStringOrNull(s: String): RolePermission? {
99103
//todo: remove v0.8.0+
100104
if (s == "ADD_LIVE_VIEW_SUBSCRIPTION") {
101105
return ADD_LIVE_VIEW

src/main/kotlin/spp/protocol/platform/developer/SelfInfo.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ data class SelfInfo(
3333
constructor(json: JsonObject) : this(
3434
developer = Developer(json.getJsonObject("developer")),
3535
roles = json.getJsonArray("roles").map { DeveloperRole.fromString(it.toString()) },
36-
permissions = json.getJsonArray("permissions")
37-
.map { RolePermission.fromString(it.toString()) ?: error("Invalid permission: $it") },
36+
permissions = json.getJsonArray("permissions").map { RolePermission.fromString(it.toString()) },
3837
access = json.getJsonArray("access").map { AccessPermission(JsonObject.mapFrom(it)) }
3938
)
4039

0 commit comments

Comments
 (0)