From 3c54c33364de347fa1add16139c2f5817912af58 Mon Sep 17 00:00:00 2001 From: LamGC Date: Mon, 4 Jul 2022 16:26:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(config):=20=E4=BF=AE=E5=A4=8D=E5=9B=A0?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=20Token=20=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 由于表达式中限定的 BotId 为 Int 范围, 而目前的 TelegramUserId 已经扩展到 Long 了, 所以新的 Bot 是无法通过检查的, 已修正表达式问题. --- scalabot-meta/src/main/kotlin/serializer/Serializer.kt | 2 +- .../src/test/kotlin/serializer/SerializeUtilsTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scalabot-meta/src/main/kotlin/serializer/Serializer.kt b/scalabot-meta/src/main/kotlin/serializer/Serializer.kt index af67722..6ac29b6 100644 --- a/scalabot-meta/src/main/kotlin/serializer/Serializer.kt +++ b/scalabot-meta/src/main/kotlin/serializer/Serializer.kt @@ -264,7 +264,7 @@ object BotConfigSerializer : JsonSerializer, JsonDeserializer { - private val tokenCheckRegex = Pattern.compile("\\d{9}:[a-zA-Z\\d_-]{35}") + private val tokenCheckRegex = Pattern.compile("\\d+:[a-zA-Z\\d_-]{35}") override fun deserialize(json: JsonElement?, typeOfT: Type?, context: JsonDeserializationContext?): BotAccount { if (json == null || json.isJsonNull) { diff --git a/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt b/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt index 90c3b89..e460cbb 100644 --- a/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt +++ b/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt @@ -757,7 +757,7 @@ internal class BotAccountSerializerTest { val jsonObject = JsonObject().apply { addProperty("name", "testUser") addProperty("token", expectToken) - addProperty("creatorId", 1) + addProperty("creatorId", 123456789123456789) } val looksGoodAccount = BotAccountSerializer.deserialize(jsonObject, null, null) @@ -765,7 +765,7 @@ internal class BotAccountSerializerTest { assertNotNull(looksGoodAccount) assertEquals("testUser", looksGoodAccount.name) assertEquals(expectToken, looksGoodAccount.token) - assertEquals(1, looksGoodAccount.creatorId) + assertEquals(123456789123456789, looksGoodAccount.creatorId) try { BotAccountSerializer.deserialize(jsonObject.deepCopy().apply {