diff --git a/build.gradle.kts b/build.gradle.kts index bb90ed1..32b0b9e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") version "1.9.23" apply false id("org.jetbrains.kotlinx.kover") version "0.7.5" apply false - id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.14.0" apply false + id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false } allprojects { diff --git a/scalabot-app/build.gradle.kts b/scalabot-app/build.gradle.kts index ac08bc2..e67db69 100644 --- a/scalabot-app/build.gradle.kts +++ b/scalabot-app/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { implementation("org.eclipse.aether:aether-transport-http:$aetherVersion") implementation("org.eclipse.aether:aether-connector-basic:$aetherVersion") implementation("org.apache.maven:maven-aether-provider:3.3.9") + implementation("org.codehaus.plexus:plexus-utils:3.5.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.23") @@ -29,8 +30,9 @@ dependencies { implementation("org.jdom:jdom2:2.0.6.1") - implementation("org.telegram:telegrambots-abilities:6.9.7.1") - implementation("org.telegram:telegrambots:6.9.7.1") + implementation("org.telegram:telegrambots-abilities:8.0.0") + implementation("org.telegram:telegrambots-longpolling:8.0.0") + implementation("org.telegram:telegrambots-client:8.0.0") implementation("io.prometheus:simpleclient:0.16.0") implementation("io.prometheus:simpleclient_httpserver:0.16.0") @@ -46,7 +48,7 @@ tasks.test { } tasks.withType { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "17" } application { diff --git a/scalabot-app/src/main/kotlin/AppConfigs.kt b/scalabot-app/src/main/kotlin/AppConfigs.kt index 0072141..545ae0d 100644 --- a/scalabot-app/src/main/kotlin/AppConfigs.kt +++ b/scalabot-app/src/main/kotlin/AppConfigs.kt @@ -13,7 +13,6 @@ import org.eclipse.aether.repository.Proxy import org.eclipse.aether.repository.RemoteRepository import org.eclipse.aether.repository.RepositoryPolicy import org.slf4j.event.Level -import org.telegram.telegrambots.bots.DefaultBotOptions import java.io.File import java.net.URL import java.nio.charset.StandardCharsets @@ -24,13 +23,13 @@ import kotlin.reflect.KProperty private val log = KotlinLogging.logger { } -internal fun ProxyType.toTelegramBotsType(): DefaultBotOptions.ProxyType { +internal fun ProxyType.toJavaProxyType(): java.net.Proxy.Type? { return when (this) { - ProxyType.NO_PROXY -> DefaultBotOptions.ProxyType.NO_PROXY - ProxyType.HTTP -> DefaultBotOptions.ProxyType.HTTP - ProxyType.HTTPS -> DefaultBotOptions.ProxyType.HTTP - ProxyType.SOCKS4 -> DefaultBotOptions.ProxyType.SOCKS4 - ProxyType.SOCKS5 -> DefaultBotOptions.ProxyType.SOCKS5 + ProxyType.NO_PROXY -> null + ProxyType.HTTP -> java.net.Proxy.Type.HTTP + ProxyType.HTTPS -> java.net.Proxy.Type.HTTP + ProxyType.SOCKS4 -> java.net.Proxy.Type.SOCKS + ProxyType.SOCKS5 -> java.net.Proxy.Type.SOCKS } } @@ -310,7 +309,7 @@ internal fun initialFiles(): Boolean { val configFilesNotInitialized = !AppPaths.CONFIG_APPLICATION.file.exists() && !AppPaths.CONFIG_BOT.file.exists() - for (path in AppPaths.values()) { + for (path in AppPaths.entries) { path.initial() } diff --git a/scalabot-app/src/main/kotlin/AppMain.kt b/scalabot-app/src/main/kotlin/AppMain.kt index addcb39..7172b32 100644 --- a/scalabot-app/src/main/kotlin/AppMain.kt +++ b/scalabot-app/src/main/kotlin/AppMain.kt @@ -6,15 +6,17 @@ import kotlinx.coroutines.runBlocking import mu.KotlinLogging import net.lamgc.scalabot.config.* import net.lamgc.scalabot.util.registerShutdownHook +import okhttp3.OkHttpClient import org.eclipse.aether.repository.LocalRepository -import org.telegram.telegrambots.bots.DefaultBotOptions -import org.telegram.telegrambots.meta.TelegramBotsApi +import org.telegram.telegrambots.client.okhttp.OkHttpTelegramClient +import org.telegram.telegrambots.longpolling.BotSession +import org.telegram.telegrambots.longpolling.TelegramBotsLongPollingApplication import org.telegram.telegrambots.meta.api.methods.GetMe import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException -import org.telegram.telegrambots.meta.generics.BotSession -import org.telegram.telegrambots.updatesreceivers.DefaultBotSession import java.io.File import java.io.IOException +import java.net.InetSocketAddress +import java.net.Proxy import java.nio.file.attribute.PosixFilePermission import java.nio.file.attribute.PosixFilePermissions import kotlin.io.path.createDirectories @@ -74,7 +76,7 @@ internal class Launcher( private val log = KotlinLogging.logger { } } - private val botApi = TelegramBotsApi(DefaultBotSession::class.java) + private val botApi = TelegramBotsLongPollingApplication() private val botSessionMap = mutableMapOf() private val mavenLocalRepository = getMavenLocalRepository() @@ -144,6 +146,10 @@ internal class Launcher( } } } + + botApi.start() + botApi.registerShutdownHook() + return if (launchedCounts != 0) { log.info { "已启动 $launchedCounts 个机器人." } true @@ -171,17 +177,17 @@ internal class Launcher( ProxyConfig(type = ProxyType.NO_PROXY) } - val botOption = DefaultBotOptions().apply { - if (proxyConfig.type != ProxyType.NO_PROXY) { - proxyType = proxyConfig.type.toTelegramBotsType() - proxyHost = config.proxy.host - proxyPort = config.proxy.port - log.debug { "机器人 `${botConfig.account.name}` 已启用代理配置: $proxyConfig" } - } + val okhttpClientBuilder = OkHttpClient.Builder() - baseUrl = botConfig.baseApiUrl + if (proxyConfig.type != ProxyType.NO_PROXY) { + val proxyType = proxyConfig.type.toJavaProxyType() + val proxyAddress = InetSocketAddress.createUnresolved(proxyConfig.host, proxyConfig.port) + okhttpClientBuilder.proxy(Proxy(proxyType, proxyAddress)) } + val account = botConfig.account + val telegramClient = + OkHttpTelegramClient(okhttpClientBuilder.build(), account.token, botConfig.getBaseApiTelegramUrl()) val remoteRepositories = config.mavenRepositories .map { it.toRemoteRepository(proxyConfig) } @@ -203,15 +209,15 @@ internal class Launcher( val bot = ScalaBot( BotDBMaker.getBotDbInstance(account), - botOption, + telegramClient, extensionPackageFinders, botConfig ) - val botUser = bot.execute(GetMe()) + val botUser = bot.telegramClient.execute(GetMe()) log.debug { "已验证 Bot Token 有效性, Bot Username: ${botUser.userName}" } - botSessionMap[bot] = botApi.registerBot(bot) + botSessionMap[bot] = botApi.registerBot(botConfig.account.token, bot) log.info { "机器人 `${bot.botUsername}` 已启动." } if (botConfig.autoUpdateCommandList) { diff --git a/scalabot-app/src/main/kotlin/BotDBMaker.kt b/scalabot-app/src/main/kotlin/BotDBMaker.kt index e8832e4..d459a39 100644 --- a/scalabot-app/src/main/kotlin/BotDBMaker.kt +++ b/scalabot-app/src/main/kotlin/BotDBMaker.kt @@ -7,8 +7,8 @@ import net.lamgc.scalabot.util.toHexString import org.mapdb.DB import org.mapdb.DBException import org.mapdb.DBMaker -import org.telegram.abilitybots.api.db.DBContext -import org.telegram.abilitybots.api.db.MapDBContext +import org.telegram.telegrambots.abilitybots.api.db.DBContext +import org.telegram.telegrambots.abilitybots.api.db.MapDBContext import java.io.File import java.nio.charset.StandardCharsets import java.security.MessageDigest @@ -157,7 +157,6 @@ private abstract class FileDbAdapter( val oldFile = oldDbAdapter.getBotDbFile(botAccount) val newFile = getBotDbFile(botAccount) try { - @Suppress("UnstableApiUsage") Files.copy(oldFile, newFile) } catch (e: Exception) { if (newFile.exists()) { @@ -190,4 +189,4 @@ private object BotTokenDbAdapter : FileDbAdapter("BotToken_v0.1.0", { botAccount val digest: MessageDigest = MessageDigest.getInstance("SHA-256") val digestBytes = digest.digest(botAccount.token.toByteArray(StandardCharsets.UTF_8)) File(AppPaths.DATA_DB.file, "${digestBytes.toHexString()}.db") -}) \ No newline at end of file +}) diff --git a/scalabot-app/src/main/kotlin/ExtensionComponents.kt b/scalabot-app/src/main/kotlin/ExtensionComponents.kt index 55f1f6c..2dcb31c 100644 --- a/scalabot-app/src/main/kotlin/ExtensionComponents.kt +++ b/scalabot-app/src/main/kotlin/ExtensionComponents.kt @@ -5,7 +5,7 @@ import net.lamgc.scalabot.extension.BotExtensionCreateOptions import net.lamgc.scalabot.extension.BotExtensionFactory import net.lamgc.scalabot.util.getPriority import org.eclipse.aether.artifact.Artifact -import org.telegram.abilitybots.api.util.AbilityExtension +import org.telegram.telegrambots.abilitybots.api.util.AbilityExtension import java.io.File import java.io.FileNotFoundException import java.net.URL @@ -126,6 +126,7 @@ internal class ExtensionLoader( factory.createExtensionInstance( bot, getExtensionDataFolder(extensionArtifact), BotExtensionCreateOptions( + bot.accountId, bot.botConfig.proxy.copy() ) ) @@ -158,7 +159,7 @@ internal class ExtensionLoader( * 搜索指定构件坐标的依赖包. * * 搜索扩展包将根据搜索器优先级从高到低依次搜索, 当某一个优先级的搜索器搜到扩展包后将停止搜索. - * 可以根据不同优先级的搜索器, 配置扩展包的主用与备用文件. + * 可以根据不同优先级的搜索器, 配置扩展包的主用和备用文件. * * @return 返回各个搜索器返回的搜索结果. */ diff --git a/scalabot-app/src/main/kotlin/ScalaBot.kt b/scalabot-app/src/main/kotlin/ScalaBot.kt index e283f14..401991f 100644 --- a/scalabot-app/src/main/kotlin/ScalaBot.kt +++ b/scalabot-app/src/main/kotlin/ScalaBot.kt @@ -6,43 +6,42 @@ import io.prometheus.client.Summary import mu.KotlinLogging import net.lamgc.scalabot.config.BotConfig import org.eclipse.aether.artifact.Artifact -import org.telegram.abilitybots.api.bot.AbilityBot -import org.telegram.abilitybots.api.db.DBContext -import org.telegram.abilitybots.api.objects.Ability -import org.telegram.abilitybots.api.toggle.BareboneToggle -import org.telegram.abilitybots.api.toggle.DefaultToggle -import org.telegram.telegrambots.bots.DefaultBotOptions +import org.telegram.telegrambots.abilitybots.api.bot.AbilityBot +import org.telegram.telegrambots.abilitybots.api.db.DBContext +import org.telegram.telegrambots.abilitybots.api.objects.Ability +import org.telegram.telegrambots.abilitybots.api.toggle.BareboneToggle +import org.telegram.telegrambots.abilitybots.api.toggle.DefaultToggle import org.telegram.telegrambots.meta.api.methods.commands.DeleteMyCommands import org.telegram.telegrambots.meta.api.methods.commands.SetMyCommands import org.telegram.telegrambots.meta.api.objects.Update import org.telegram.telegrambots.meta.api.objects.commands.BotCommand +import org.telegram.telegrambots.meta.generics.TelegramClient /** * 可扩展 Bot. - * @property creatorId 机器人所有人的 Telegram 用户 Id. 可通过联系部分机器人来获取该信息. + * @property creatorId 机器人所有人的 Telegram 用户 ID. 可通过联系部分机器人来获取该信息. * (e.g. [@userinfobot](http://t.me/userinfobot)) * @param db 机器人数据库对象. 用于状态机等用途. - * @param options AbilityBot 设置对象. * @property extensions 扩展坐标集合. */ +@Suppress("CanBeParameter", "MemberVisibilityCanBePrivate") internal class ScalaBot( db: DBContext, - options: DefaultBotOptions, + client: TelegramClient, extensionFinders: Set, val botConfig: BotConfig, - private val creatorId: Long = botConfig.account.creatorId, val accountId: Long = botConfig.account.id, + private val creatorId: Long = botConfig.account.creatorId, val extensions: Set = botConfig.extensions ) : AbilityBot( - botConfig.account.token, + client, botConfig.account.name, db, if (botConfig.disableBuiltInAbility) BareboneToggle() else - DefaultToggle(), - options + DefaultToggle() ) { private val extensionLoader = ExtensionLoader( @@ -67,13 +66,13 @@ internal class ScalaBot( override fun creatorId(): Long = creatorId - override fun onUpdateReceived(update: Update?) { + override fun consume(update: Update?) { botUpdateCounter.labels(botUsername, accountIdString).inc() botUpdateGauge.labels(botUsername, accountIdString).inc() val timer = updateProcessTime.labels(botUsername, accountIdString).startTimer() try { - super.onUpdateReceived(update) + super.consume(update) } catch (e: Exception) { exceptionHandlingCounter.labels(botUsername, accountIdString).inc() throw e @@ -92,11 +91,11 @@ internal class ScalaBot( * @return 更新成功返回 `true`. */ fun updateCommandList(): Boolean { - if (abilities() == null) { + if (abilities == null) { throw IllegalStateException("Abilities has not been initialized.") } - val botCommands = abilities().values.map { + val botCommands = abilities.values.map { val abilityInfo = if (it.info() == null || it.info().trim().isEmpty()) { log.warn { "[Bot $botUsername] Ability `${it.name()}` 没有说明信息." } "(The command has no description)" @@ -112,9 +111,10 @@ internal class ScalaBot( return true } - val setMyCommands = SetMyCommands() - setMyCommands.commands = botCommands - return execute(DeleteMyCommands()) && execute(setMyCommands) + val setMyCommands = SetMyCommands.builder() + .commands(botCommands) + .build() + return telegramClient.execute(DeleteMyCommands()) && telegramClient.execute(setMyCommands) } override fun onRegister() { @@ -122,10 +122,6 @@ internal class ScalaBot( onlineBotGauge.inc() } - override fun onClosing() { - onlineBotGauge.dec() - } - companion object { @JvmStatic private val log = KotlinLogging.logger { } diff --git a/scalabot-app/src/main/kotlin/util/TelegramBotAccounts.kt b/scalabot-app/src/main/kotlin/util/TelegramBotAccounts.kt new file mode 100644 index 0000000..cdd52f3 --- /dev/null +++ b/scalabot-app/src/main/kotlin/util/TelegramBotAccounts.kt @@ -0,0 +1,29 @@ +package net.lamgc.scalabot.util + +import java.util.regex.Matcher +import java.util.regex.Pattern + +object TelegramBotAccounts { + + private val botTokenPattern: Pattern = Pattern.compile("([1-9]\\d+):([A-Za-z\\d_-]{35,})") + + /** + * 获取 AbilityBot 的账户 Id. + * + * + * 账户 Id 来自于 botToken 中, token 的格式为 "{AccountId}:{Secret}". + * + * 账户 Id 的真实性与 botToken 的有效性有关, 本方法并不会确保 botToken 的有效性, 一般情况下也无需考虑 Id 的有效性, + * 如果有需要, 可尝试通过调用 [org.telegram.telegrambots.meta.api.methods.GetMe] 来确保 botToken 的有效性. + * + * @param botToken 要获取账户 Id 的 botToken 字符串. + * @return 返回 AbilityBot 的账户 Id. + * @throws IllegalArgumentException 当 AbilityBot 的 botToken 格式错误时抛出该异常. + */ + fun getBotAccountId(botToken: String): Long { + val matcher: Matcher = botTokenPattern.matcher(botToken) + require(matcher.matches()) { "Invalid token format." } + return matcher.group(1).toLong() + } + +} diff --git a/scalabot-app/src/test/kotlin/AppConfigTest.kt b/scalabot-app/src/test/kotlin/AppConfigTest.kt index fd9325b..e3b89cf 100644 --- a/scalabot-app/src/test/kotlin/AppConfigTest.kt +++ b/scalabot-app/src/test/kotlin/AppConfigTest.kt @@ -10,9 +10,9 @@ import net.lamgc.scalabot.config.ProxyConfig import net.lamgc.scalabot.config.ProxyType import org.junit.jupiter.api.assertThrows import org.junit.jupiter.api.io.TempDir -import org.telegram.telegrambots.bots.DefaultBotOptions import java.io.File import java.io.IOException +import java.net.Proxy import java.net.URL import java.nio.file.Files import java.nio.file.Path @@ -23,7 +23,7 @@ internal class AppPathsTest { @Test fun `Consistency check`() { - for (path in AppPaths.values()) { + for (path in AppPaths.entries) { assertEquals( File(path.path).canonicalPath, path.file.canonicalPath, @@ -226,17 +226,17 @@ internal class AppPathsTest { @Test fun `ProxyType_toTelegramBotsType test`() { val expectTypeMapping = mapOf( - ProxyType.NO_PROXY to DefaultBotOptions.ProxyType.NO_PROXY, - ProxyType.SOCKS5 to DefaultBotOptions.ProxyType.SOCKS5, - ProxyType.SOCKS4 to DefaultBotOptions.ProxyType.SOCKS4, - ProxyType.HTTP to DefaultBotOptions.ProxyType.HTTP, - ProxyType.HTTPS to DefaultBotOptions.ProxyType.HTTP + ProxyType.NO_PROXY to null, + ProxyType.SOCKS5 to Proxy.Type.SOCKS, + ProxyType.SOCKS4 to Proxy.Type.SOCKS, + ProxyType.HTTP to Proxy.Type.HTTP, + ProxyType.HTTPS to Proxy.Type.HTTP ) - for (proxyType in ProxyType.values()) { + for (proxyType in ProxyType.entries) { assertEquals( expectTypeMapping[proxyType], - proxyType.toTelegramBotsType(), + proxyType.toJavaProxyType(), "ProxyType 转换失败." ) } @@ -251,7 +251,7 @@ internal class AppPathsTest { ProxyType.HTTP, ProxyType.HTTPS ) - for (proxyType in ProxyType.values()) { + for (proxyType in ProxyType.entries) { val proxyConfig = ProxyConfig(proxyType, host, port) val aetherProxy = proxyConfig.toAetherProxy() if (expectNotNullProxyType.contains(proxyType)) { @@ -337,7 +337,7 @@ internal class AppPathsTest { assertTrue(initialFiles(), "方法未能提醒用户编辑初始配置文件.") - for (path in AppPaths.values()) { + for (path in AppPaths.entries) { assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}") if (path.file.isFile) { assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}") @@ -347,7 +347,7 @@ internal class AppPathsTest { assertFalse(initialFiles(), "方法试图在配置已初始化的情况下提醒用户编辑初始配置文件.") - for (path in AppPaths.values()) { + for (path in AppPaths.entries) { assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}") if (path.file.isFile) { assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}") @@ -358,7 +358,7 @@ internal class AppPathsTest { assertTrue(AppPaths.CONFIG_APPLICATION.file.delete(), "config.json 删除失败.") assertFalse(initialFiles(), "方法试图在部分配置已初始化的情况下提醒用户编辑初始配置文件.") - for (path in AppPaths.values()) { + for (path in AppPaths.entries) { assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}") if (path.file.isFile) { assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}") @@ -369,7 +369,7 @@ internal class AppPathsTest { assertTrue(AppPaths.CONFIG_BOT.file.delete(), "bot.json 删除失败.") assertFalse(initialFiles(), "方法试图在部分配置已初始化的情况下提醒用户编辑初始配置文件.") - for (path in AppPaths.values()) { + for (path in AppPaths.entries) { assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}") if (path.file.isFile) { assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}") @@ -384,7 +384,7 @@ internal class AppPathsTest { "在主要配置文件(config.json 和 bot.json)不存在的情况下初始化文件后, 方法未能提醒用户编辑初始配置文件." ) - for (path in AppPaths.values()) { + for (path in AppPaths.entries) { assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}") if (path.file.isFile) { assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}") diff --git a/scalabot-app/src/test/kotlin/util/TelegramBotAccountsTest.kt b/scalabot-app/src/test/kotlin/util/TelegramBotAccountsTest.kt new file mode 100644 index 0000000..5880f02 --- /dev/null +++ b/scalabot-app/src/test/kotlin/util/TelegramBotAccountsTest.kt @@ -0,0 +1,27 @@ +package util + +import net.lamgc.scalabot.util.TelegramBotAccounts +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test + +class TelegramBotAccountsTest { + + @Test + fun getBotAccountIdTest() { + val expectToken = "1234567890:AAHXcNDBRZTKfyPED5Gi3PZDIKPOM6xhxwo" + val actual: Long = TelegramBotAccounts.getBotAccountId(expectToken) + assertEquals(1234567890, actual) + + val badTokenA = "12c34d56a7890:AAHXcNDBRZTKfyPED5Gi3PZDIKPOM6xhxwo" + assertThrows( + IllegalArgumentException::class.java + ) { TelegramBotAccounts.getBotAccountId(badTokenA) } + + val badTokenB = "12c34d56a7890AAHXcNDBRZTKfyPED5Gi3PZDIKPOM6xhxwo" + assertThrows( + IllegalArgumentException::class.java + ) { TelegramBotAccounts.getBotAccountId(badTokenB) } + } + +} diff --git a/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SayHelloExtension.java b/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SayHelloExtension.java index b175f0c..8f83fe4 100644 --- a/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SayHelloExtension.java +++ b/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SayHelloExtension.java @@ -1,8 +1,8 @@ package net.lamgc.scalabot.simple; -import org.telegram.abilitybots.api.bot.BaseAbilityBot; -import org.telegram.abilitybots.api.objects.*; -import org.telegram.abilitybots.api.util.AbilityExtension; +import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot; +import org.telegram.telegrambots.abilitybots.api.objects.*; +import org.telegram.telegrambots.abilitybots.api.util.AbilityExtension; public class SayHelloExtension implements AbilityExtension { @@ -27,7 +27,7 @@ public class SayHelloExtension implements AbilityExtension { String msg = "Hello! " + ctx.user().getUserName() + " ( " + ctx.user().getId() + " ) [ " + ctx.user().getLanguageCode() + " ]" + "\n" + "Current Chat ID: " + ctx.chatId(); - ctx.bot().silent().send(msg, ctx.chatId()); + ctx.bot().getSilent().send(msg, ctx.chatId()); }) .build(); } @@ -36,13 +36,13 @@ public class SayHelloExtension implements AbilityExtension { * 更具特色的 `Say hello`. */ public Ability test() { - ReplyFlow botHello = ReplyFlow.builder(bot.db()) + ReplyFlow botHello = ReplyFlow.builder(bot.getDb()) .enableStats("say_hello") - .action((bot, upd) -> bot.silent().send("What is u name?", upd.getMessage().getChatId())) + .action((bot, upd) -> bot.getSilent().send("What is u name?", upd.getMessage().getChatId())) .onlyIf(update -> update.hasMessage() && update.getMessage().hasText() && "hello".equalsIgnoreCase(update.getMessage().getText())) - .next(Reply.of((bot, upd) -> bot.silent() + .next(Reply.of((bot, upd) -> bot.getSilent() .send("OK! You name is " + upd.getMessage().getText().substring("my name is ".length()), upd.getMessage().getChatId()), upd -> upd.hasMessage() && upd.getMessage().hasText() @@ -55,7 +55,7 @@ public class SayHelloExtension implements AbilityExtension { .locality(Locality.ALL) .privacy(Privacy.PUBLIC) .enableStats() - .action(ctx -> ctx.bot().silent().send("Hello!", ctx.chatId())) + .action(ctx -> ctx.bot().getSilent().send("Hello!", ctx.chatId())) .reply(botHello) .build(); } diff --git a/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SimpleExtensionFactory.java b/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SimpleExtensionFactory.java index 5558843..7ca9dfa 100644 --- a/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SimpleExtensionFactory.java +++ b/scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SimpleExtensionFactory.java @@ -2,8 +2,8 @@ package net.lamgc.scalabot.simple; import net.lamgc.scalabot.extension.BotExtensionCreateOptions; import net.lamgc.scalabot.extension.BotExtensionFactory; -import org.telegram.abilitybots.api.bot.BaseAbilityBot; -import org.telegram.abilitybots.api.util.AbilityExtension; +import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot; +import org.telegram.telegrambots.abilitybots.api.util.AbilityExtension; import java.io.File; diff --git a/scalabot-extension/api/scalabot-extension.api b/scalabot-extension/api/scalabot-extension.api deleted file mode 100644 index 1720928..0000000 --- a/scalabot-extension/api/scalabot-extension.api +++ /dev/null @@ -1,9 +0,0 @@ -public abstract interface class net/lamgc/scalabot/extension/BotExtensionFactory { - public abstract fun createExtensionInstance (Lorg/telegram/abilitybots/api/bot/BaseAbilityBot;Ljava/io/File;)Lorg/telegram/abilitybots/api/util/AbilityExtension; -} - -public class net/lamgc/scalabot/extension/util/AbilityBots { - public static fun cancelReplyState (Lorg/telegram/abilitybots/api/bot/BaseAbilityBot;J)Z - public static fun getBotAccountId (Lorg/telegram/abilitybots/api/bot/BaseAbilityBot;)J -} - diff --git a/scalabot-extension/build.gradle.kts b/scalabot-extension/build.gradle.kts index 2bef3d9..cdfa3b3 100644 --- a/scalabot-extension/build.gradle.kts +++ b/scalabot-extension/build.gradle.kts @@ -3,16 +3,16 @@ plugins { jacoco `maven-publish` signing - id("org.jetbrains.kotlinx.binary-compatibility-validator") } dependencies { implementation("commons-codec:commons-codec:1.16.1") - api("org.telegram:telegrambots-abilities:6.9.7.1") + api("org.telegram:telegrambots-abilities:8.0.0") api(project(":scalabot-meta")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1") testImplementation("org.mockito:mockito-core:5.11.0") + testImplementation("org.telegram:telegrambots-client:8.0.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") } @@ -25,8 +25,8 @@ tasks.withType { java { withJavadocJar() withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.test { diff --git a/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionCreateOptions.java b/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionCreateOptions.java index 46ac359..39dc2e3 100644 --- a/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionCreateOptions.java +++ b/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionCreateOptions.java @@ -10,13 +10,29 @@ import net.lamgc.scalabot.config.ProxyConfig; @SuppressWarnings("unused") public class BotExtensionCreateOptions { + private final long botAccountId; private final ProxyConfig proxy; - public BotExtensionCreateOptions(ProxyConfig proxy) { + public BotExtensionCreateOptions(long botAccountId, ProxyConfig proxy) { + this.botAccountId = botAccountId; this.proxy = proxy; } + /** + * 获取 Bot 使用的代理信息. + * + * @return 返回 Bot 中 TelegramClient 所使用的代理配置. + */ public ProxyConfig getProxy() { return proxy; } + + /** + * 获取 Bot 的账户 Id. + * + * @return 返回 Bot 的账户 Id. + */ + public long getBotAccountId() { + return botAccountId; + } } diff --git a/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionFactory.java b/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionFactory.java index 842d2af..4fbdf88 100644 --- a/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionFactory.java +++ b/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionFactory.java @@ -1,7 +1,8 @@ package net.lamgc.scalabot.extension; -import org.telegram.abilitybots.api.bot.BaseAbilityBot; -import org.telegram.abilitybots.api.util.AbilityExtension; +import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot; +import org.telegram.telegrambots.abilitybots.api.db.DBContext; +import org.telegram.telegrambots.abilitybots.api.util.AbilityExtension; import java.io.File; @@ -9,7 +10,7 @@ import java.io.File; * 该接口用于为指定的 {@link BaseAbilityBot} 创建扩展. * *

由于 AbilityExtension 无法直接获取 {@link BaseAbilityBot} 的 - * 数据库对象 {@link org.telegram.abilitybots.api.db.DBContext}, + * 数据库对象 {@link DBContext}, * 所以将通过该接口工厂来创建扩展对象. * * @author LamGC @@ -20,30 +21,7 @@ public interface BotExtensionFactory { /** * 为给定的 {@link BaseAbilityBot} 对象创建扩展. * - *

如扩展无使用 {@link org.telegram.abilitybots.api.db.DBContext} 的话, - * 也可以返回扩展单例, 因为 AbilityBot 本身并不禁止多个机器人共用一个扩展对象 - * (AbilityBot 只是调用了扩展中的方法来创建 Ability 对象). - * - * @param bot 机器人对象. - * @param shareDataFolder ScalaBot App 为扩展提供的共享数据目录. - *

路径格式为: - * 

 $DATA_ROOT/data/extensions/{GroupId}/{ArtifactId}
- * 同一个扩展包的 Factory 接收到的共享数据目录都是一样的, - * 建议将数据存储在数据目录中, 便于数据的存储管理. - * @return 返回为该 Bot 对象创建的扩展对象, 如果不希望为该机器人提供扩展, 可返回 {@code null}. - * @deprecated 请使用 {@link #createExtensionInstance(BaseAbilityBot, File, BotExtensionCreateOptions)}, - * 该方法最迟在 1.0.0 正式版中移除. - * @since 0.0.1 - */ - @Deprecated(since = "0.7.0", forRemoval = true) - default AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder) { - throw new UnsupportedOperationException("The method has not been implemented."); - } - - /** - * 为给定的 {@link BaseAbilityBot} 对象创建扩展. - * - *

如扩展无使用 {@link org.telegram.abilitybots.api.db.DBContext} 的话, + *

如扩展无使用 {@link DBContext} 的话, * 也可以返回扩展单例, 因为 AbilityBot 本身并不禁止多个机器人共用一个扩展对象 * (AbilityBot 只是调用了扩展中的方法来创建 Ability 对象). * @@ -57,8 +35,6 @@ public interface BotExtensionFactory { * @return 返回为该 Bot 对象创建的扩展对象, 如果不希望为该机器人提供扩展, 可返回 {@code null}. * @since 0.7.0 */ - default AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder, BotExtensionCreateOptions options) { - return createExtensionInstance(bot, shareDataFolder); - } + AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder, BotExtensionCreateOptions options); } diff --git a/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/util/AbilityBots.java b/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/util/AbilityBots.java index 6348a57..d843f93 100644 --- a/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/util/AbilityBots.java +++ b/scalabot-extension/src/main/java/net/lamgc/scalabot/extension/util/AbilityBots.java @@ -1,40 +1,14 @@ package net.lamgc.scalabot.extension.util; -import org.telegram.abilitybots.api.bot.BaseAbilityBot; +import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -public class AbilityBots { - - private final static Pattern botTokenPattern = Pattern.compile("([1-9]\\d+):([A-Za-z\\d_-]{35,})"); +public final class AbilityBots { private AbilityBots() { } - /** - * 获取 AbilityBot 的账户 Id. - * - *

账户 Id 来自于 botToken 中, token 的格式为 "[AccountId]:[Secret]". - *

账户 Id 的真实性与 botToken 的有效性有关, 本方法并不会确保 botToken 的有效性, 一般情况下也无需考虑 Id 的有效性, - * 如果有需要, 可尝试通过调用 {@link org.telegram.telegrambots.meta.api.methods.GetMe} 来确保 botToken 的有效性. - * - * @param bot 要获取账户 Id 的 AbilityBot 对象. - * @return 返回 AbilityBot 的账户 Id. - * @throws IllegalArgumentException 当 AbilityBot 的 botToken 格式错误时抛出该异常. - */ - @SuppressWarnings("deprecation") - public static long getBotAccountId(BaseAbilityBot bot) { - // 根据文档说明, 弃用仅针对重写方法, 使用该方法并无大碍. - String botToken = bot.getBotToken(); - Matcher matcher = botTokenPattern.matcher(botToken); - if (!matcher.matches()) { - throw new IllegalArgumentException("Invalid token format."); - } - return Long.parseLong(matcher.group(1)); - } - /** * 取消某一对话的状态机. * @@ -43,7 +17,7 @@ public class AbilityBots { * @return 如果状态机存在, 则删除后返回 true, 不存在(未开启任何状态机, 即没有触发任何 Reply)则返回 false. */ public static boolean cancelReplyState(BaseAbilityBot bot, long chatId) { - Map stateMap = bot.db().getMap("user_state_replies"); + Map stateMap = bot.getDb().getMap("user_state_replies"); if (!stateMap.containsKey(chatId)) { return false; } diff --git a/scalabot-extension/src/test/java/net/lamgc/scalabot/extension/util/AbilityBotsTest.java b/scalabot-extension/src/test/java/net/lamgc/scalabot/extension/util/AbilityBotsTest.java index 938f6b3..ebc2f0e 100644 --- a/scalabot-extension/src/test/java/net/lamgc/scalabot/extension/util/AbilityBotsTest.java +++ b/scalabot-extension/src/test/java/net/lamgc/scalabot/extension/util/AbilityBotsTest.java @@ -2,22 +2,35 @@ package net.lamgc.scalabot.extension.util; import org.junit.jupiter.api.Test; import org.mapdb.DBMaker; -import org.telegram.abilitybots.api.bot.AbilityBot; -import org.telegram.abilitybots.api.bot.BaseAbilityBot; -import org.telegram.abilitybots.api.db.MapDBContext; -import org.telegram.abilitybots.api.objects.*; -import org.telegram.abilitybots.api.sender.SilentSender; -import org.telegram.telegrambots.meta.api.objects.Message; +import org.telegram.telegrambots.abilitybots.api.bot.AbilityBot; +import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot; +import org.telegram.telegrambots.abilitybots.api.db.MapDBContext; +import org.telegram.telegrambots.abilitybots.api.objects.*; +import org.telegram.telegrambots.abilitybots.api.sender.SilentSender; import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.meta.api.objects.User; +import org.telegram.telegrambots.meta.api.objects.message.Message; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; public class AbilityBotsTest { - public static final User USER = new User(1L, "first", false, "last", "username", null, false, false, false, false, false); - public static final User CREATOR = new User(1337L, "creatorFirst", false, "creatorLast", "creatorUsername", null, false, false, false, false, false); + public static final User USER = User.builder() + .userName("username") + .id(1L) + .firstName("first") + .lastName("last") + .isBot(false) + .build(); + public static final User CREATOR = User.builder() + .userName("creatorUsername") + .id(1337L) + .firstName("creatorFirst") + .lastName("creatorLast") + .isBot(false) + .build(); static Update mockFullUpdate(BaseAbilityBot bot, User user, String args) { bot.users().put(USER.getId(), USER); @@ -39,58 +52,51 @@ public class AbilityBotsTest { return update; } - @Test - void getBotAccountIdTest() { - String expectToken = "1234567890:AAHXcNDBRZTKfyPED5Gi3PZDIKPOM6xhxwo"; - long actual = AbilityBots.getBotAccountId(new TestingAbilityBot(expectToken, "test")); - assertEquals(1234567890, actual); - - String badTokenA = "12c34d56a7890:AAHXcNDBRZTKfyPED5Gi3PZDIKPOM6xhxwo"; - assertThrows(IllegalArgumentException.class, () -> - AbilityBots.getBotAccountId(new TestingAbilityBot(badTokenA, "test"))); - - String badTokenB = "12c34d56a7890AAHXcNDBRZTKfyPED5Gi3PZDIKPOM6xhxwo"; - assertThrows(IllegalArgumentException.class, () -> - AbilityBots.getBotAccountId(new TestingAbilityBot(badTokenB, "test"))); - } - @Test void cancelReplyStateTest() { - User userA = new User(10001L, "first", false, "last", "username", null, false, false, false, false, false); - User userB = new User(10101L, "first", false, "last", "username", null, false, false, false, false, false); + User userA = User.builder() + .id(10001L) + .firstName("first") + .lastName("last") + .userName("username") + .isBot(false) + .build(); + User userB = User.builder() + .id(10101L) + .firstName("first") + .lastName("last") + .userName("username") + .isBot(false) + .build(); SilentSender silent = mock(SilentSender.class); - BaseAbilityBot bot = new TestingAbilityBot("", "", silent); + BaseAbilityBot bot = new TestingAbilityBot("", silent); bot.onRegister(); - bot.onUpdateReceived(mockFullUpdate(bot, userA, "/set_reply")); + bot.consume(mockFullUpdate(bot, userA, "/set_reply")); verify(silent, times(1)).send("Reply set!", userA.getId()); - bot.onUpdateReceived(mockFullUpdate(bot, userA, "reply_01")); + bot.consume(mockFullUpdate(bot, userA, "reply_01")); verify(silent, times(1)).send("Reply 01", userA.getId()); assertTrue(AbilityBots.cancelReplyState(bot, userA.getId())); - bot.onUpdateReceived(mockFullUpdate(bot, userA, "reply_02")); + bot.consume(mockFullUpdate(bot, userA, "reply_02")); verify(silent, never()).send("Reply 02", userA.getId()); assertFalse(AbilityBots.cancelReplyState(bot, userB.getId())); silent = mock(SilentSender.class); - bot = new TestingAbilityBot("", "", silent); + bot = new TestingAbilityBot("", silent); bot.onRegister(); - bot.onUpdateReceived(mockFullUpdate(bot, userA, "/set_reply")); + bot.consume(mockFullUpdate(bot, userA, "/set_reply")); verify(silent, times(1)).send("Reply set!", userA.getId()); - bot.onUpdateReceived(mockFullUpdate(bot, userA, "reply_01")); + bot.consume(mockFullUpdate(bot, userA, "reply_01")); verify(silent, times(1)).send("Reply 01", userA.getId()); - bot.onUpdateReceived(mockFullUpdate(bot, userA, "reply_02")); + bot.consume(mockFullUpdate(bot, userA, "reply_02")); verify(silent, times(1)).send("Reply 02", userA.getId()); } public static class TestingAbilityBot extends AbilityBot { - public TestingAbilityBot(String botToken, String botUsername) { - super(botToken, botUsername, new MapDBContext(DBMaker.heapDB().make())); - } - - public TestingAbilityBot(String botToken, String botUsername, SilentSender silentSender) { - super(botToken, botUsername, new MapDBContext(DBMaker.heapDB().make())); + public TestingAbilityBot(String botUsername, SilentSender silentSender) { + super(new NoOpTelegramClient(), botUsername, new MapDBContext(DBMaker.heapDB().make())); this.silent = silentSender; } @@ -101,12 +107,12 @@ public class AbilityBotsTest { .enableStats() .locality(Locality.ALL) .privacy(Privacy.PUBLIC) - .action(ctx -> ctx.bot().silent().send("Reply set!", ctx.chatId())) - .reply(ReplyFlow.builder(db()) - .action((bot, upd) -> bot.silent().send("Reply 01", upd.getMessage().getChatId())) + .action(ctx -> ctx.bot().getSilent().send("Reply set!", ctx.chatId())) + .reply(ReplyFlow.builder(getDb()) + .action((bot, upd) -> bot.getSilent().send("Reply 01", upd.getMessage().getChatId())) .onlyIf(upd -> upd.hasMessage() && upd.getMessage().getText().equals("reply_01")) .next(Reply.of((bot, upd) -> - bot.silent().send("Reply 02", upd.getMessage().getChatId()), + bot.getSilent().send("Reply 02", upd.getMessage().getChatId()), upd -> upd.hasMessage() && upd.getMessage().getText().equals("reply_02"))) .build() ) diff --git a/scalabot-extension/src/test/java/net/lamgc/scalabot/extension/util/NoOpTelegramClient.java b/scalabot-extension/src/test/java/net/lamgc/scalabot/extension/util/NoOpTelegramClient.java new file mode 100644 index 0000000..8e726d2 --- /dev/null +++ b/scalabot-extension/src/test/java/net/lamgc/scalabot/extension/util/NoOpTelegramClient.java @@ -0,0 +1,229 @@ +package net.lamgc.scalabot.extension.util; + +import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.groupadministration.SetChatPhoto; +import org.telegram.telegrambots.meta.api.methods.send.*; +import org.telegram.telegrambots.meta.api.methods.stickers.*; +import org.telegram.telegrambots.meta.api.methods.updates.SetWebhook; +import org.telegram.telegrambots.meta.api.methods.updatingmessages.EditMessageMedia; +import org.telegram.telegrambots.meta.api.objects.File; +import org.telegram.telegrambots.meta.api.objects.message.Message; +import org.telegram.telegrambots.meta.generics.TelegramClient; + +import java.io.InputStream; +import java.io.Serializable; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +class NoOpTelegramClient implements TelegramClient { + + @Override + public > CompletableFuture executeAsync(Method method) { + return null; + } + + @Override + public > T execute(Method method) { + return null; + } + + @Override + public Message execute(SendDocument sendDocument) { + return null; + } + + @Override + public Message execute(SendPhoto sendPhoto) { + return null; + } + + @Override + public Boolean execute(SetWebhook setWebhook) { + return null; + } + + @Override + public Message execute(SendVideo sendVideo) { + return null; + } + + @Override + public Message execute(SendVideoNote sendVideoNote) { + return null; + } + + @Override + public Message execute(SendSticker sendSticker) { + return null; + } + + @Override + public Message execute(SendAudio sendAudio) { + return null; + } + + @Override + public Message execute(SendVoice sendVoice) { + return null; + } + + @Override + public List execute(SendMediaGroup sendMediaGroup) { + return List.of(); + } + + @Override + public List execute(SendPaidMedia sendPaidMedia) { + return List.of(); + } + + @Override + public Boolean execute(SetChatPhoto setChatPhoto) { + return null; + } + + @Override + public Boolean execute(AddStickerToSet addStickerToSet) { + return null; + } + + @Override + public Boolean execute(ReplaceStickerInSet replaceStickerInSet) { + return null; + } + + @Override + public Boolean execute(SetStickerSetThumbnail setStickerSetThumbnail) { + return null; + } + + @Override + public Boolean execute(CreateNewStickerSet createNewStickerSet) { + return null; + } + + @Override + public File execute(UploadStickerFile uploadStickerFile) { + return null; + } + + @Override + public Serializable execute(EditMessageMedia editMessageMedia) { + return null; + } + + @Override + public java.io.File downloadFile(File file) { + return null; + } + + @Override + public InputStream downloadFileAsStream(File file) { + return null; + } + + @Override + public Message execute(SendAnimation sendAnimation) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendDocument sendDocument) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendPhoto sendPhoto) { + return null; + } + + @Override + public CompletableFuture executeAsync(SetWebhook setWebhook) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendVideo sendVideo) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendVideoNote sendVideoNote) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendSticker sendSticker) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendAudio sendAudio) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendVoice sendVoice) { + return null; + } + + @Override + public CompletableFuture> executeAsync(SendMediaGroup sendMediaGroup) { + return null; + } + + @Override + public CompletableFuture> executeAsync(SendPaidMedia sendPaidMedia) { + return null; + } + + @Override + public CompletableFuture executeAsync(SetChatPhoto setChatPhoto) { + return null; + } + + @Override + public CompletableFuture executeAsync(AddStickerToSet addStickerToSet) { + return null; + } + + @Override + public CompletableFuture executeAsync(ReplaceStickerInSet replaceStickerInSet) { + return null; + } + + @Override + public CompletableFuture executeAsync(SetStickerSetThumbnail setStickerSetThumbnail) { + return null; + } + + @Override + public CompletableFuture executeAsync(CreateNewStickerSet createNewStickerSet) { + return null; + } + + @Override + public CompletableFuture executeAsync(UploadStickerFile uploadStickerFile) { + return null; + } + + @Override + public CompletableFuture executeAsync(EditMessageMedia editMessageMedia) { + return null; + } + + @Override + public CompletableFuture executeAsync(SendAnimation sendAnimation) { + return null; + } + + @Override + public CompletableFuture downloadFileAsync(File file) { + return null; + } + + @Override + public CompletableFuture downloadFileAsStreamAsync(File file) { + return null; + } +} diff --git a/scalabot-meta/api/scalabot-meta.api b/scalabot-meta/api/scalabot-meta.api index e1e9d33..283c551 100644 --- a/scalabot-meta/api/scalabot-meta.api +++ b/scalabot-meta/api/scalabot-meta.api @@ -48,6 +48,7 @@ public final class net/lamgc/scalabot/config/BotConfig { public fun equals (Ljava/lang/Object;)Z public final fun getAccount ()Lnet/lamgc/scalabot/config/BotAccount; public final fun getAutoUpdateCommandList ()Z + public final fun getBaseApiTelegramUrl ()Lorg/telegram/telegrambots/meta/TelegramUrl; public final fun getBaseApiUrl ()Ljava/lang/String; public final fun getDisableBuiltInAbility ()Z public final fun getEnabled ()Z @@ -57,6 +58,10 @@ public final class net/lamgc/scalabot/config/BotConfig { public fun toString ()Ljava/lang/String; } +public final class net/lamgc/scalabot/config/ConfigsKt { + public static final fun getDefaultTelegramApiUrl ()Ljava/lang/String; +} + public final class net/lamgc/scalabot/config/MavenRepositoryConfig { public fun (Ljava/lang/String;Ljava/net/URL;Lorg/eclipse/aether/repository/Proxy;Ljava/lang/String;ZZLorg/eclipse/aether/repository/Authentication;)V public synthetic fun (Ljava/lang/String;Ljava/net/URL;Lorg/eclipse/aether/repository/Proxy;Ljava/lang/String;ZZLorg/eclipse/aether/repository/Authentication;ILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/scalabot-meta/build.gradle.kts b/scalabot-meta/build.gradle.kts index 41766ca..379b6bb 100644 --- a/scalabot-meta/build.gradle.kts +++ b/scalabot-meta/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { api("org.eclipse.aether:aether-api:$aetherVersion") implementation("org.eclipse.aether:aether-util:$aetherVersion") - implementation("org.telegram:telegrambots-meta:6.9.7.1") + implementation("org.telegram:telegrambots-meta:8.0.0") api("com.google.code.gson:gson:2.10.1") @@ -26,15 +26,15 @@ dependencies { tasks.withType().configureEach { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } java { withJavadocJar() withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType().configureEach { diff --git a/scalabot-meta/src/main/kotlin/Configs.kt b/scalabot-meta/src/main/kotlin/Configs.kt index 9fb078b..0540af4 100644 --- a/scalabot-meta/src/main/kotlin/Configs.kt +++ b/scalabot-meta/src/main/kotlin/Configs.kt @@ -3,7 +3,8 @@ package net.lamgc.scalabot.config import org.eclipse.aether.artifact.Artifact import org.eclipse.aether.repository.Authentication import org.eclipse.aether.repository.Proxy -import org.telegram.telegrambots.meta.ApiConstants +import org.telegram.telegrambots.meta.TelegramUrl +import java.net.URI import java.net.URL /** @@ -26,6 +27,13 @@ data class BotAccount( get() = token.substringBefore(":").toLong() } +val defaultTelegramApiUrl: String = URL( + TelegramUrl.DEFAULT_URL.schema, + TelegramUrl.DEFAULT_URL.host, + TelegramUrl.DEFAULT_URL.port, + "/" +).toExternalForm() + /** * 机器人配置. * @@ -56,8 +64,22 @@ data class BotConfig( */ val extensions: Set = emptySet(), val proxy: ProxyConfig = ProxyConfig(type = ProxyType.NO_PROXY), - val baseApiUrl: String = ApiConstants.BASE_URL -) + val baseApiUrl: String = defaultTelegramApiUrl +) { + fun getBaseApiTelegramUrl(): TelegramUrl { + if (this.baseApiUrl == defaultTelegramApiUrl) { + return TelegramUrl.DEFAULT_URL + } else { + URI.create(baseApiUrl).let { + return TelegramUrl.builder() + .host(it.host) + .port(it.port) + .schema(it.scheme) + .build() + } + } + } +} /** * 代理类型. diff --git a/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt b/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt index e460cbb..d08bb96 100644 --- a/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt +++ b/scalabot-meta/src/test/kotlin/serializer/SerializeUtilsTest.kt @@ -53,7 +53,7 @@ internal class ProxyTypeSerializerTest { @Test fun `serialize test`() { - for (type in ProxyType.values()) { + for (type in ProxyType.entries) { assertEquals( JsonPrimitive(type.name), ProxyTypeSerializer.serialize(type, null, null), "ProxyType 序列化结果与预期不符." @@ -79,7 +79,7 @@ internal class ProxyTypeSerializerTest { ProxyTypeSerializer.deserialize(JsonNull.INSTANCE, null, null) ) - for (type in ProxyType.values()) { + for (type in ProxyType.entries) { assertEquals( type, ProxyTypeSerializer.deserialize(JsonPrimitive(type.name), null, null), "ProxyType 反序列化结果与预期不符."