LamGC/ScalaBot
1
0
Fork 0
mirror of https://github.com/LamGC/ScalaBot.git synced 2025-04-30 06:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): 修复因正则表达式错误导致的 Token 检查失败.

Browse Source 
由于表达式中限定的 BotId 为 Int 范围, 而目前的 TelegramUserId 已经扩展到 Long 了, 所以新的 Bot 是无法通过检查的, 已修正表达式问题.
This commit is contained in:
LamGC 2022-07-04 16:26:01 +08:00
parent 43dd0e7bea
commit 3c54c33364
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scalabot-meta/src/main/kotlin/serializer/Serializer.kt
View File

@ -264,7 +264,7 @@ object BotConfigSerializer : JsonSerializer<BotConfig>, JsonDeserializer<BotConf
object BotAccountSerializer : JsonDeserializer<BotAccount> { object BotAccountSerializer : JsonDeserializer<BotAccount> {
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 { override fun deserialize(json: JsonElement?, typeOfT: Type?, context: JsonDeserializationContext?): BotAccount {
if (json == null || json.isJsonNull) { if (json == null || json.isJsonNull) {

4
scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt
View File

@ -757,7 +757,7 @@ internal class BotAccountSerializerTest {
val jsonObject = JsonObject().apply { val jsonObject = JsonObject().apply {
addProperty("name", "testUser") addProperty("name", "testUser")
addProperty("token", expectToken) addProperty("token", expectToken)
addProperty("creatorId", 1) addProperty("creatorId", 123456789123456789)
} }
val looksGoodAccount = BotAccountSerializer.deserialize(jsonObject, null, null) val looksGoodAccount = BotAccountSerializer.deserialize(jsonObject, null, null)
@ -765,7 +765,7 @@ internal class BotAccountSerializerTest {
assertNotNull(looksGoodAccount) assertNotNull(looksGoodAccount)
assertEquals("testUser", looksGoodAccount.name) assertEquals("testUser", looksGoodAccount.name)
assertEquals(expectToken, looksGoodAccount.token) assertEquals(expectToken, looksGoodAccount.token)
assertEquals(1, looksGoodAccount.creatorId) assertEquals(123456789123456789, looksGoodAccount.creatorId)
try { try {
BotAccountSerializer.deserialize(jsonObject.deepCopy().apply { BotAccountSerializer.deserialize(jsonObject.deepCopy().apply {