diff --git a/build.gradle.kts b/build.gradle.kts index 547bd30..ff092fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,20 +27,20 @@ implementation("com.sun.mail:jakarta.mail:2.0.1") implementation("commons-cli:commons-cli:1.6.0") implementation("commons-codec:commons-codec:1.16.0") - implementation("commons-io:commons-io:2.15.0") + implementation("commons-io:commons-io:2.15.1") implementation("io.netty:netty-all:4.1.101.Final") implementation("jakarta.mail:jakarta.mail-api:2.1.2") implementation("net.dv8tion:JDA:5.0.0-beta.16") implementation("org.apache.commons:commons-compress:1.25.0") implementation("org.apache.commons:commons-dbcp2:2.11.0") implementation("org.apache.commons:commons-lang3:3.14.0") - implementation("org.apache.httpcomponents.client5:httpclient5:5.2.1") + implementation("org.apache.httpcomponents.client5:httpclient5:5.2.3") implementation("org.apache.logging.log4j:log4j-core:2.22.0") implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.22.0") implementation("org.jline:jline:3.24.1") implementation("org.jline:jline-terminal-jansi:3.24.1") - implementation("org.jsoup:jsoup:1.16.2") - implementation("org.mariadb.jdbc:mariadb-java-client:3.3.0") + implementation("org.jsoup:jsoup:1.17.1") + implementation("org.mariadb.jdbc:mariadb-java-client:3.3.1") implementation("org.python:jython-standalone:2.7.3") implementation("org.seleniumhq.selenium:selenium-edge-driver:4.15.0") implementation("org.seleniumhq.selenium:selenium-java:4.15.0") diff --git a/src/main/kotlin/net/taehui/twilight/BaseCompiler.kt b/src/main/kotlin/net/taehui/twilight/BaseCompiler.kt index 3469e37..d2c9f0b 100644 --- a/src/main/kotlin/net/taehui/twilight/BaseCompiler.kt +++ b/src/main/kotlin/net/taehui/twilight/BaseCompiler.kt @@ -146,7 +146,7 @@ companion object { fun handleCompile(noteFileData: ByteArray, dataID: Int): Array { val noteID512 = Utility.getID512(noteFileData) - val targetComputings = mutableListOf() + val targetComputingValues = mutableListOf() ByteArrayInputStream(noteFileData).use { val formatComputer = CharsetDetector() formatComputer.setText(it) @@ -158,14 +158,14 @@ targetCompiler = BMSONCompiler(noteFileData, format) targetCompiler.handleCompile(targetComputing) targetCompiler.onCompiled(targetComputing) - targetComputings.add(targetComputing) + targetComputingValues.add(targetComputing) } catch (e: JacksonException) { fun handleBMSCompile(dataID: Int): Computing { val targetComputing = Computing("$noteID512:$dataID") targetCompiler = BMSCompiler(noteFileData, format) targetCompiler.handleCompile(targetComputing) targetCompiler.onCompiled(targetComputing) - targetComputings.add(targetComputing) + targetComputingValues.add(targetComputing) return targetComputing } @@ -175,7 +175,7 @@ } Unit } - return targetComputings.toTypedArray() + return targetComputingValues.toTypedArray() } fun handleCompile(defaultComputer: DefaultCompute, noteFileData: ByteArray) { diff --git a/src/main/kotlin/net/taehui/twilight/system/DB.kt b/src/main/kotlin/net/taehui/twilight/system/DB.kt index 1f82c27..acab733 100644 --- a/src/main/kotlin/net/taehui/twilight/system/DB.kt +++ b/src/main/kotlin/net/taehui/twilight/system/DB.kt @@ -1017,8 +1017,8 @@ WHERE Name = ? AND Avatar = ? """.trimIndent() ).use { dbStatement -> - dbStatement.setString(1, avatarID) - dbStatement.setString(2, bundleName) + dbStatement.setString(1, bundleName) + dbStatement.setString(2, avatarID) dbStatement.executeQuery().use { rows -> if (rows.next()) { bundleVariety = BundleVariety.getBundleVariety(rows.getInt("Variety")) @@ -1035,8 +1035,8 @@ WHERE Name = ? AND Avatar = ? """.trimIndent() ).use { dbStatement -> - dbStatement.setString(1, avatarID) - dbStatement.setString(2, bundleName) + dbStatement.setString(1, bundleName) + dbStatement.setString(2, avatarID) dbStatement.execute() } } @@ -2563,7 +2563,7 @@ val avatarLevelVSCount = avatarLevelVSItems.size val targetLevelVSCount = targetLevelVSItems.size val avatarLevelVSItems = avatarLevelVSItems.sortedBy { it.levelVSStand }.take(10) - val targetLevelVSItems = targetLevelVSItems.sortedBy { it.levelVSStand }.take(10) + val targetLevelVSItems = targetLevelVSItems.sortedByDescending { it.levelVSStand }.take(10) } } } diff --git a/src/main/kotlin/net/taehui/twilight/system/IO.kt b/src/main/kotlin/net/taehui/twilight/system/IO.kt index eab3655..214a319 100644 --- a/src/main/kotlin/net/taehui/twilight/system/IO.kt +++ b/src/main/kotlin/net/taehui/twilight/system/IO.kt @@ -144,10 +144,10 @@ } "awilight" -> { - if (w.size > 2) { + if (w.size > 1) { when (w[1]) { "set" -> { - if (w.size > 3) { + if (w.size > 2) { val awilightCount = w[2].toInt() Configure.awilightCount = 0.coerceAtLeast(Configure.awilightCount + awilightCount)