diff --git a/src/main/kotlin/net/taehui/twilight/Avatar.kt b/src/main/kotlin/net/taehui/twilight/Avatar.kt index d682468..a0875fe 100644 --- a/src/main/kotlin/net/taehui/twilight/Avatar.kt +++ b/src/main/kotlin/net/taehui/twilight/Avatar.kt @@ -196,7 +196,7 @@ } fun putSite(siteData: JSON.QwilightNewSite) { - if (siteData.siteName.isNotEmpty() && !siteData.siteName.startsWith("@")) { + if (siteData.siteName.isNotEmpty() && !siteData.siteName.startsWith('@')) { val siteID = UUID.randomUUID() if (siteData.isNetSite) { SiteHandler.putNetSite(this, siteID, siteData) @@ -239,7 +239,7 @@ } fun setSiteName(siteID: String, siteName: String) { - if (siteName.isNotEmpty() && !siteName.startsWith("@")) { + if (siteName.isNotEmpty() && !siteName.startsWith('@')) { SiteHandler.setSiteName(this, UUID.fromString(siteID), siteName) } else { send(EventOuterClass.Event.EventID.WARNING, translateLanguage("siteNameNotValid")) diff --git a/src/main/kotlin/net/taehui/twilight/BMSCompiler.kt b/src/main/kotlin/net/taehui/twilight/BMSCompiler.kt index d19ea88..a80794e 100644 --- a/src/main/kotlin/net/taehui/twilight/BMSCompiler.kt +++ b/src/main/kotlin/net/taehui/twilight/BMSCompiler.kt @@ -48,7 +48,7 @@ var lastBin = 0 var isValidStatement = true for (line in it.lines()) { - if (line.startsWith("#")) { + if (line.startsWith('#')) { val lintAt1 = line.substring(1) val delimited = lintAt1.split(":", " ", ".", ";", limit = 2).toTypedArray() val property = delimited[0] diff --git a/src/main/kotlin/net/taehui/twilight/Site.kt b/src/main/kotlin/net/taehui/twilight/Site.kt index 82b4a76..aa78b60 100644 --- a/src/main/kotlin/net/taehui/twilight/Site.kt +++ b/src/main/kotlin/net/taehui/twilight/Site.kt @@ -1120,7 +1120,7 @@ val data = data }) data.filter { - !it.avatarName.startsWith("@") + !it.avatarName.startsWith('@') }.filter { it.translate }.forEach { Translator.translate(avatar.language, it.siteYell, avatar).thenAccept { siteYell -> avatar.send(EventOuterClass.Event.EventID.MODIFY_SITE_YELL, object { diff --git a/src/main/kotlin/net/taehui/twilight/Utility.kt b/src/main/kotlin/net/taehui/twilight/Utility.kt index 5d8c3ae..293143e 100644 --- a/src/main/kotlin/net/taehui/twilight/Utility.kt +++ b/src/main/kotlin/net/taehui/twilight/Utility.kt @@ -38,8 +38,8 @@ } fun getDefaultAvatarID(avatarID: String): String { - val platformID = avatarID.substring(avatarID.indexOf("@") + 1) - return PlatformIDSystem.getAvatarID(platformID) ?: platformID + val platformID = avatarID.substring(avatarID.indexOf('@') + 1) + return PlatformIDSystem.getAvatarID(avatarID.substring(avatarID.indexOf('$') + 1)) ?: platformID } fun getFaultText(e: Throwable): String { @@ -118,7 +118,7 @@ ): Boolean { return autoMode == Component.DEFAULT_AUTO_MODE && (judgmentMode == Component.DEFAULT_JUDGMENT_MODE || judgmentMode == Component.HIGHER_JUDGMENT_MODE || judgmentMode == Component.HIGHEST_JUDGMENT_MODE) && - (hitPointsMode == Component.DEFAULT_HIT_POINTS_MODE || hitPointsMode == Component.HIGHER_HIT_POINTS_MODE || hitPointsMode == Component.HIGHEST_HIT_POINTS_MODE || hitPointsMode == Component.FAILED_HIT_POINTS_MODE|| hitPointsMode == Component.YELL_HIT_POINTS_MODE) && + (hitPointsMode == Component.DEFAULT_HIT_POINTS_MODE || hitPointsMode == Component.HIGHER_HIT_POINTS_MODE || hitPointsMode == Component.HIGHEST_HIT_POINTS_MODE || hitPointsMode == Component.FAILED_HIT_POINTS_MODE || hitPointsMode == Component.YELL_HIT_POINTS_MODE) && longNoteMode == Component.DEFAULT_LONG_NOTE_MODE && inputFavorMode == Component.DEFAULT_INPUT_FAVOR_MODE && noteModifyMode == Component.DEFAULT_NOTE_MODIFY_MODE && diff --git a/src/main/kotlin/net/taehui/twilight/awilight/AwilightSite.kt b/src/main/kotlin/net/taehui/twilight/awilight/AwilightSite.kt index b9a0fd4..7b2323c 100644 --- a/src/main/kotlin/net/taehui/twilight/awilight/AwilightSite.kt +++ b/src/main/kotlin/net/taehui/twilight/awilight/AwilightSite.kt @@ -23,7 +23,7 @@ } fun setNetAllowed(data: Array, avatarID: String) { - val availableAvatars = data.filter { it.avatarID != avatarID && !it.avatarID.startsWith("@") } + val availableAvatars = data.filter { it.avatarID != avatarID && !it.avatarID.startsWith('@') } isNetAllowed = if (isSiteHand) availableAvatars.isNotEmpty() && availableAvatars.all { it.avatarConfigure == AVATAR_CONFIGURE_LEVYING } else avatarConfigure == AVATAR_CONFIGURE_DEFAULT } diff --git a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt index 354bd82..507044f 100644 --- a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt @@ -920,9 +920,9 @@ ) ) } - } - PlatformSystem.setAbilityName(avatarID) + PlatformSystem.setAbilityName(avatarID) + } } DB.saveHandled( diff --git a/src/main/kotlin/net/taehui/twilight/system/AbilitySystem.kt b/src/main/kotlin/net/taehui/twilight/system/AbilitySystem.kt index ff50aa3..091ca13 100644 --- a/src/main/kotlin/net/taehui/twilight/system/AbilitySystem.kt +++ b/src/main/kotlin/net/taehui/twilight/system/AbilitySystem.kt @@ -126,7 +126,7 @@ abilityNameAbilityIDsMap.clear() abilityNameAbilityIDNoteIDCountMap.clear() Files.list(TwilightComponent.ABILITY_ENTRY_PATH).use { abilityFilePaths -> - abilityFilePaths.filter { it.fileName.toString().startsWith("#") }.sorted( + abilityFilePaths.filter { it.fileName.toString().startsWith('#') }.sorted( Comparator.comparingInt { abilityFilePath -> defaultAbility.abilityFiles.indexOfFirst { it.fileName == abilityFilePath.fileName.toString() diff --git a/src/main/kotlin/net/taehui/twilight/system/DB.kt b/src/main/kotlin/net/taehui/twilight/system/DB.kt index c1f78d6..2513a31 100644 --- a/src/main/kotlin/net/taehui/twilight/system/DB.kt +++ b/src/main/kotlin/net/taehui/twilight/system/DB.kt @@ -2836,7 +2836,7 @@ val wantAvatars = mutableListOf() pool.connection.use { - if (want.startsWith("!")) { + if (want.startsWith('!')) { it.prepareStatement( """ SELECT Avatar_ID diff --git a/src/main/kotlin/net/taehui/twilight/system/PlatformIDSystem.kt b/src/main/kotlin/net/taehui/twilight/system/PlatformIDSystem.kt index 4ae0ebb..c3c037f 100644 --- a/src/main/kotlin/net/taehui/twilight/system/PlatformIDSystem.kt +++ b/src/main/kotlin/net/taehui/twilight/system/PlatformIDSystem.kt @@ -32,22 +32,19 @@ } } - fun putPlatformID(rawPlatformID: String, avatarID: String) { - val platformID = if (rawPlatformID.startsWith("$")) rawPlatformID else "$$rawPlatformID" + fun putPlatformID(platformID: String, avatarID: String) { platformIDAvatarIDMap[platformID] = avatarID avatarIDPlatformIDMap[avatarID] = platformID } - fun wipePlatformID(rawPlatformID: String) { - val platformID = if (rawPlatformID.startsWith("$")) rawPlatformID else "$$rawPlatformID" + fun wipePlatformID(platformID: String) { val avatarID = platformIDAvatarIDMap.remove(platformID) if (avatarID != null) { avatarIDPlatformIDMap.remove(avatarID) } } - fun getAvatarID(rawPlatformID: String): String? { - val platformID = if (rawPlatformID.startsWith("$")) rawPlatformID else "$$rawPlatformID" + fun getAvatarID(platformID: String): String? { return platformIDAvatarIDMap[platformID] } @@ -55,8 +52,7 @@ return avatarIDPlatformIDMap[avatarID] } - fun hasPlatformID(rawPlatformID: String): Boolean { - val platformID = if (rawPlatformID.startsWith("$")) rawPlatformID else "$$rawPlatformID" + fun hasPlatformID(platformID: String): Boolean { return platformIDAvatarIDMap.containsKey(platformID) } } \ No newline at end of file diff --git a/src/main/kotlin/net/taehui/twilight/system/PlatformSystem.kt b/src/main/kotlin/net/taehui/twilight/system/PlatformSystem.kt index dcf4bb0..f7f0d91 100644 --- a/src/main/kotlin/net/taehui/twilight/system/PlatformSystem.kt +++ b/src/main/kotlin/net/taehui/twilight/system/PlatformSystem.kt @@ -210,8 +210,12 @@ qwilightPlatform = platform?.getGuildById(platformClient.qwilight) - qwilightPlatform?.upsertCommand("role", "Set role to Qwilight tier")?.queue() - qwilightPlatform?.upsertCommand("login", "Log in to Qwilight Channel")?.queue() + qwilightPlatform?.retrieveCommands()?.queue { data -> + data.forEach { + qwilightPlatform?.deleteCommandById(it.idLong)?.queue() + } + qwilightPlatform?.upsertCommand("login", "Log in to Qwilight Channel")?.queue() + } doCallPlatformAvatars() diff --git a/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt b/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt index 6782f05..38fd072 100644 --- a/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt @@ -554,15 +554,15 @@ } } - if (avatarID.startsWith("*")) { + if (avatarID.startsWith('*')) { val avatarDrawing = ValveSystem.getDrawing(Utility.getDefaultAvatarID(avatarID)) if (avatarDrawing != null) { send(ctx, avatarDrawing) } else { sendAvatarDrawing(avatarID) } - } else if (avatarID.startsWith("$")) { - if (PlatformIDSystem.hasPlatformID(avatarID)) { + } else if (avatarID.startsWith('$')) { + if (PlatformIDSystem.hasPlatformID(avatarID.substring(avatarID.indexOf('$')))) { sendAvatarDrawing(avatarID) } else { val avatarDrawing = PlatformSystem.getDrawing(avatarID)