Backend Fixes

This commit is contained in:
2025-03-02 09:08:49 +01:00
parent 284c4acd4b
commit b0bd719627
3 changed files with 6 additions and 4 deletions
@@ -45,7 +45,7 @@ data class ResponseSchematicType(val name: String, val db: String)
@Serializable
data class ResponseUser(val name: String, val uuid: String, val prefix: String, val perms: List<String>) {
constructor(user: SteamwarUser) : this(user.userName, user.uuid.toString(), user.prefix().chatPrefix, user.perms().map { it.name }) {
constructor(user: SteamwarUser) : this(user.userName, user.uuid.toString(), user.prefix().chatPrefix, user.perms().filter { !it.name.startsWith("PREFIX_") }.map { it.name }) {
synchronized(cache) {
cache[user.id] = this
}
@@ -149,5 +149,6 @@ fun Route.configureDataRoutes() {
inline fun <T> catchException(yield: () -> T): T? = try {
yield()
} catch (e: Exception) {
e.printStackTrace()
null
}
@@ -215,7 +215,7 @@ fun Route.configureEventsRoute() {
}
}
event.update(eventName, deadline, start, end, schemType, maxTeamMembers, publicSchemsOnly)
call.respond(ResponseEvent(event))
call.respond(ResponseEvent(Event.get(event.eventID)))
}
delete {
val id = call.parameters["id"]?.toIntOrNull()
@@ -79,7 +79,7 @@ fun Route.configureUserPerms() {
call.respond(RespondUserPermsPrefix(RespondPrefix(prefix.name, prefixs.colorCode, prefixs.chatPrefix), perms))
}
put("/prefix/{prefix}") {
val (user, prefix) = call.receivePermission("prefix") ?: return@put
val (user, prefix) = call.receivePermission("prefix", isPrefix = true) ?: return@put
user.perms().filter { it.name.startsWith("PREFIX_") }.forEach {
UserPerm.removePerm(user, it)
@@ -121,7 +121,8 @@ suspend fun ApplicationCall.receivePermission(fieldName: String = "perm", isPref
val perm = parameters[fieldName]
val permission = UserPerm.entries.find { it.name == perm }
if (perm == null || perm.startsWith("PREFIX_") == isPrefix || permission == null) {
if (perm == null || perm.startsWith("PREFIX_") != isPrefix || permission == null) {
println(perm)
respond(HttpStatusCode.BadRequest)
return null
}