diff --git a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt index 404d092..2d772c9 100644 --- a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt @@ -926,7 +926,7 @@ val text = String.format( avatar.translateLanguage("passNotify"), "${targetComputing.artist} - ${targetComputing.title}", - avatarID + avatarName ) val isUrgent = false val v = 3 diff --git a/src/main/kotlin/net/taehui/twilight/system/DB.kt b/src/main/kotlin/net/taehui/twilight/system/DB.kt index af6cd7d..fb4e37f 100644 --- a/src/main/kotlin/net/taehui/twilight/system/DB.kt +++ b/src/main/kotlin/net/taehui/twilight/system/DB.kt @@ -2237,8 +2237,9 @@ return pool.connection.use { it.prepareStatement( """ - SELECT Avatar + SELECT Avatar_Name FROM tw_comment + INNER JOIN tn_avatar ON tw_comment.Avatar = tn_avatar.Avatar_ID WHERE Note_ID = ? AND Avatar != ? AND ? <= Stand AND Stand < ? AND Is_Max = true """.trimIndent() ).use { dbStatement -> @@ -2247,11 +2248,11 @@ dbStatement.setInt(3, standBefore) dbStatement.setInt(4, stand) dbStatement.executeQuery().use { rows -> - val avatarIDs = mutableListOf() + val avatarNames = mutableListOf() while (rows.next()) { - avatarIDs.add(rows.getString("Avatar")) + avatarNames.add(rows.getString("Avatar_Name")) } - avatarIDs + avatarNames } } }