diff --git a/src/main/kotlin/net/taehui/twilight/trust/TrustAvatar.kt b/src/main/kotlin/net/taehui/twilight/trust/TrustAvatar.kt index f8442ae..0e8cb73 100644 --- a/src/main/kotlin/net/taehui/twilight/trust/TrustAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/trust/TrustAvatar.kt @@ -55,55 +55,45 @@ } HttpMethod.PATCH -> when (path) { - "/date/AMD64" -> { - val data = ByteBufUtil.getBytes(msg.content()) - logFuture { - Files.write( - Configure.path.wwwPath.resolve(getQwilightDate().titleAMD64), - data - ) - send204(ctx) - } + "/date/AMD64" -> logFuture { + Files.write( + Configure.path.wwwPath.resolve(getQwilightDate().titleAMD64), + ByteBufUtil.getBytes(msg.content()) + ) + send204(ctx) } - "/date/ARM64" -> { - val data = ByteBufUtil.getBytes(msg.content()) - logFuture { - Files.write( - Configure.path.wwwPath.resolve(getQwilightDate().titleARM64), - data - ) - send204(ctx) - } + "/date/ARM64" -> logFuture { + Files.write( + Configure.path.wwwPath.resolve(getQwilightDate().titleARM64), + ByteBufUtil.getBytes(msg.content()) + ) + send204(ctx) } - "/date" -> { + "/date" -> logFuture { val data = msg.content().toString(StandardCharsets.UTF_8).split(" ".toRegex()) var date = data[0] val hashAMD64 = data[1] val hashARM64 = data[2] - CompletableFuture.allOf(logFuture { - if (date.contains("!")) { - Configure.hash.clear() - date = date.replace("!", "") - } - Configure.hash.add(hashAMD64) - Configure.hash.add(hashARM64) - Configure.saveConfigure() - }, logFuture { - val jm = ObjectMapper() - val qwilightDateFilePath = Configure.path.wwwPath.resolve(Configure.path.datePath) - val qwilightDate = - jm.readValue(Files.readString(qwilightDateFilePath), QwilightDate::class.java) - qwilightDate.date = date - qwilightDate.hashAMD64 = hashAMD64 - qwilightDate.hashARM64 = hashARM64 - Files.newBufferedWriter(qwilightDateFilePath).use { - jm.writerWithDefaultPrettyPrinter().writeValue(it, qwilightDate) - } - }).thenRun { - send204(ctx) + if (date.contains("!")) { + Configure.hash.clear() + date = date.replace("!", "") } + Configure.hash.add(hashAMD64) + Configure.hash.add(hashARM64) + Configure.saveConfigure() + val jm = ObjectMapper() + val qwilightDateFilePath = Configure.path.wwwPath.resolve(Configure.path.datePath) + val qwilightDate = + jm.readValue(Files.readString(qwilightDateFilePath), QwilightDate::class.java) + qwilightDate.date = date + qwilightDate.hashAMD64 = hashAMD64 + qwilightDate.hashARM64 = hashARM64 + Files.newBufferedWriter(qwilightDateFilePath).use { + jm.writerWithDefaultPrettyPrinter().writeValue(it, qwilightDate) + } + send204(ctx) } "/drawing" -> {