build(deps): bump org.jetbrains.dokka:javadoc-plugin (#187)

Bumps [org.jetbrains.dokka:javadoc-plugin](https://github.com/Kotlin/dokka) from 1.9.10 to 2.0.0.
- [Release notes](https://github.com/Kotlin/dokka/releases)
- [Commits](https://github.com/Kotlin/dokka/compare/v1.9.10...v2.0.0)

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -8,12 +8,12 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
 
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
 
 #  - package-ecosystem: "gradle"
 #    directory: "/scalabot-app"

.github/workflows/binary-compatibility-verification.yml

@@ -19,18 +19,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt-hotspot'
-          cache: 'gradle'
-      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build and run binary compatibility verification
-        uses: gradle/gradle-build-action@v2.4.0
-        with:
-          gradle-version: 'wrapper'
-          arguments: apiCheck
+        run: ./gradlew apiCheck

.github/workflows/build-and-test.yml

@@ -18,18 +18,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt-hotspot'
-          cache: 'gradle'
-      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build and test
-        uses: gradle/gradle-build-action@v2.4.0
-        with:
-          gradle-version: 'wrapper'
-          arguments: test
+        run: ./gradlew clean test

.github/workflows/create-release.yml

@@ -19,18 +19,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       # 创建更新日志.
       - name: 'Get Previous tag'
         id: previous-tag
-        uses: younited/get-previous-tag-action@v1.0.0
+        uses: younited/get-previous-tag-action@v1.1.0
         with:
           match: "v*.*.*"
       - name: Set up Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install Commitizen
@@ -39,24 +39,21 @@ jobs:
         run: cz ch --start-rev ${{ steps.previous-tag.outputs.previous-tag }} --file-name ${{ github.workspace }}/CURRENT_CHANGELOG.md
 
       # 开始构建项目.
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt-hotspot'
-          cache: 'gradle'
-      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build and test
-        uses: gradle/gradle-build-action@v2.4.0
-        with:
-          gradle-version: 'wrapper'
-          arguments: clean test assembleDist
+        run: ./gradlew clean test assembleDist
 
       # 创建新的发行版本
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           draft: true
           body_path: ${{ github.workspace }}/CURRENT_CHANGELOG.md

.github/workflows/publish-artifacts.yml

@@ -14,32 +14,29 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt-hotspot'
-          cache: 'gradle'
-      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build and test
-        uses: gradle/gradle-build-action@v2.4.0
-        with:
-          gradle-version: 'wrapper'
-          arguments: clean test installDist
+        run: ./gradlew clean test installDist
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push container image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

.github/workflows/release-dev-container-image.yml

@@ -14,32 +14,29 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt-hotspot'
-          cache: 'gradle'
-      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build project and install Distribution package
-        uses: gradle/gradle-build-action@v2.4.0
-        with:
-          gradle-version: 'wrapper'
-          arguments: installDist
+        run: ./gradlew clean test installDist
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push container image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:18
+FROM eclipse-temurin:21-jdk-alpine
 
 ENV BOT_DATA_PATH /scalabot/data/
 WORKDIR /scalabot/run/

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    kotlin("jvm") version "1.8.10" apply false
-    id("org.jetbrains.kotlinx.kover") version "0.6.1" apply false
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.0" apply false
+    kotlin("jvm") version "2.1.0" apply false
+    id("org.jetbrains.kotlinx.kover") version "0.8.3" apply false
+    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false
 }
 
 allprojects {
@@ -13,5 +13,5 @@ allprojects {
 
     }
     group = "net.lamgc"
-    version = "0.6.0"
+    version = "0.8.0-1"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright ? 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions ?$var?, ?${var}?, ?${var:-default}?, ?${var+SET}?,
-#           ?${var#prefix}?, ?${var%suffix}?, and ?$( cmd )?;
-#         * compound commands having a testable exit status, especially ?case?;
-#         * various built-in commands including ?command?, ?set?, and ?ulimit?.
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

scalabot-app/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -10,9 +11,9 @@ dependencies {
     implementation(project(":scalabot-meta"))
     implementation(project(":scalabot-extension"))
 
-    implementation("org.slf4j:slf4j-api:2.0.6")
+    implementation("org.slf4j:slf4j-api:2.0.11")
     implementation("io.github.microutils:kotlin-logging:3.0.5")
-    implementation("ch.qos.logback:logback-classic:1.4.5")
+    implementation("ch.qos.logback:logback-classic:1.5.12")
 
     val aetherVersion = "1.1.0"
     implementation("org.eclipse.aether:aether-api:$aetherVersion")
@@ -22,31 +23,35 @@ 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.6.4")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.10")
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:2.1.0")
+    implementation("com.google.code.gson:gson:2.11.0")
 
     implementation("org.jdom:jdom2:2.0.6.1")
 
-    implementation("org.telegram:telegrambots-abilities:6.5.0")
-    implementation("org.telegram:telegrambots:6.5.0")
+    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")
 
     testImplementation(kotlin("test"))
-    testImplementation("io.mockk:mockk:1.13.4")
+    testImplementation("io.mockk:mockk:1.13.13")
     testImplementation("com.github.stefanbirkner:system-lambda:1.2.1")
 }
 
 tasks.test {
     useJUnitPlatform()
-
+    jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED")
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
 }
 
 application {

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
     }
 }
 
@@ -48,6 +47,10 @@ internal fun MavenRepositoryConfig.toRemoteRepository(proxyConfig: ProxyConfig?
         val generatedRepoId = createDefaultRepositoryId()
         log.debug { "仓库 Url `$url` 未设置仓库 Id, 已分配缺省 Id: $generatedRepoId" }
         generatedRepoId
+    } else if ("local".contentEquals(id, ignoreCase = true)) {
+        val generatedRepoId = createDefaultRepositoryId()
+        log.debug { "仓库 Url `$url` 不允许使用 `local` 作为仓库 Id, 已分配缺省 Id: $generatedRepoId" }
+        generatedRepoId
     } else {
         id
     }
@@ -306,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()
     }
 

scalabot-app/src/main/kotlin/AppMain.kt

@@ -6,13 +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.meta.generics.BotSession
-import org.telegram.telegrambots.updatesreceivers.DefaultBotSession
+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 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
@@ -72,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<ScalaBot, BotSession>()
     private val mavenLocalRepository = getMavenLocalRepository()
 
@@ -135,9 +139,17 @@ internal class Launcher(
                 launchBot(botConfig)
                 launchedCounts++
             } catch (e: Exception) {
+                if (e is TelegramApiRequestException && e.errorCode == 401) {
+                    log.error { "机器人 `${botConfig.account.name}` 的 Bot Token 无效, 请检查配置: [${e.errorCode}] ${e.apiResponse}" }
+                } else {
                     log.error(e) { "机器人 `${botConfig.account.name}` 启动时发生错误." }
                 }
             }
+        }
+
+        botApi.start()
+        botApi.registerShutdownHook()
+
         return if (launchedCounts != 0) {
             log.info { "已启动 $launchedCounts 个机器人." }
             true
@@ -165,17 +177,17 @@ internal class Launcher(
                 ProxyConfig(type = ProxyType.NO_PROXY)
             }
 
-        val botOption = DefaultBotOptions().apply {
+        val okhttpClientBuilder = OkHttpClient.Builder()
+
         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 proxyType = proxyConfig.type.toJavaProxyType()
+            val proxyAddress = InetSocketAddress.createUnresolved(proxyConfig.host, proxyConfig.port)
+            okhttpClientBuilder.proxy(Proxy(proxyType, proxyAddress))
         }
 
-            baseUrl = botConfig.baseApiUrl
-        }
         val account = botConfig.account
+        val telegramClient =
+            OkHttpTelegramClient(okhttpClientBuilder.build(), account.token, botConfig.getBaseApiTelegramUrl())
 
         val remoteRepositories = config.mavenRepositories
             .map { it.toRemoteRepository(proxyConfig) }
@@ -197,11 +209,15 @@ internal class Launcher(
 
         val bot = ScalaBot(
             BotDBMaker.getBotDbInstance(account),
-            botOption,
+            telegramClient,
             extensionPackageFinders,
             botConfig
         )
-        botSessionMap[bot] = botApi.registerBot(bot)
+
+        val botUser = bot.telegramClient.execute(GetMe())
+        log.debug { "已验证 Bot Token 有效性, Bot Username: ${botUser.userName}" }
+
+        botSessionMap[bot] = botApi.registerBot(botConfig.account.token, bot)
         log.info { "机器人 `${bot.botUsername}` 已启动." }
 
         if (botConfig.autoUpdateCommandList) {

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()) {

scalabot-app/src/main/kotlin/ExtensionComponents.kt

@@ -1,10 +1,11 @@
 package net.lamgc.scalabot
 
 import mu.KotlinLogging
+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
@@ -122,7 +123,13 @@ internal class ExtensionLoader(
         for (factory in extClassLoader.serviceLoader) {
             try {
                 val extension =
-                    factory.createExtensionInstance(bot, getExtensionDataFolder(extensionArtifact))
+                    factory.createExtensionInstance(
+                        bot, getExtensionDataFolder(extensionArtifact),
+                        BotExtensionCreateOptions(
+                            bot.accountId,
+                            bot.botConfig.proxy.copy()
+                        )
+                    )
                 if (extension == null) {
                     log.debug { "Factory ${factory::class.java} 创建插件时返回了 null, 已跳过. (BotName: ${bot.botUsername})" }
                     continue
@@ -152,7 +159,7 @@ internal class ExtensionLoader(
      * 搜索指定构件坐标的依赖包.
      *
      * 搜索扩展包将根据搜索器优先级从高到低依次搜索, 当某一个优先级的搜索器搜到扩展包后将停止搜索.
-     * 可以根据不同优先级的搜索器, 配置扩展包的主用与备用文件.
+     * 可以根据不同优先级的搜索器, 配置扩展包的主用和备用文件.
      *
      * @return 返回各个搜索器返回的搜索结果.
      */

scalabot-app/src/main/kotlin/ExtensionFinders.kt

@@ -26,6 +26,7 @@ import org.jdom2.input.SAXBuilder
 import org.jdom2.xpath.XPathFactory
 import java.io.File
 import java.io.InputStream
+import java.net.URI
 import java.net.URL
 import java.net.URLClassLoader
 import java.util.*
@@ -396,7 +397,6 @@ internal class MavenRepositoryExtensionFinder(
         /**
          * Maven 中央仓库 Url.
          */
-        @Suppress("MemberVisibilityCanBePrivate")
         const val MAVEN_CENTRAL_URL = "https://repo1.maven.org/maven2/"
 
         /**
@@ -466,17 +466,19 @@ internal class MavenRepositoryExtensionFinder(
                     throw IllegalArgumentException("Unsupported FoundExtensionPackage type: $foundExtensionPackage")
                 }
 
-                val urls = mutableSetOf<URL>()
+                val urls = mutableSetOf<URI>()
                 for (dependency in foundExtensionPackage.dependencies) {
                     val dependencyFile = dependency.file ?: continue
-                    urls.add(dependencyFile.toURI().toURL())
+                    urls.add(dependencyFile.toURI())
                 }
 
                 // 将依赖的 ClassLoader 与 ExtensionPackage 的 ClassLoader 分开
                 // 这么做可以防范依赖中隐藏的 SPI 注册, 避免安全隐患.
 
                 val dependenciesUrlArray = urls.toTypedArray()
-                val dependenciesClassLoader = URLClassLoader(dependenciesUrlArray)
+                val dependenciesClassLoader = URLClassLoader(
+                    dependenciesUrlArray.map { it.toURL() }.toTypedArray()
+                )
 
                 return ExtensionClassLoader(
                     arrayOf(foundExtensionPackage.getPackageFile().toURI().toURL()),

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<ExtensionPackageFinder>,
-    botConfig: BotConfig,
-    private val creatorId: Long = botConfig.account.creatorId,
+    val botConfig: BotConfig,
     val accountId: Long = botConfig.account.id,
+    private val creatorId: Long = botConfig.account.creatorId,
     val extensions: Set<Artifact> = 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 { }

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()
+    }
+
+}

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}")

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) }
+    }
+
+}

scalabot-ext-example/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 dependencies {
     compileOnly(project(":scalabot-extension"))
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 

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();
     }

scalabot-ext-example/src/main/java/net/lamgc/scalabot/simple/SimpleExtensionFactory.java

@@ -1,15 +1,16 @@
 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;
 
 public class SimpleExtensionFactory implements BotExtensionFactory {
 
     @Override
-    public AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder) {
+    public AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder, BotExtensionCreateOptions options) {
         return new SayHelloExtension(bot);
     }
 

scalabot-extension/api/scalabot-extension.api

@@ -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
-}
-

scalabot-extension/build.gradle.kts

@@ -1,19 +1,18 @@
 plugins {
-    kotlin("jvm")
-    java
+    `java-library`
     jacoco
     `maven-publish`
     signing
-    id("org.jetbrains.kotlinx.binary-compatibility-validator")
 }
 
 dependencies {
-    implementation("commons-codec:commons-codec:1.15")
-    api("org.telegram:telegrambots-abilities:6.5.0")
-    api("org.slf4j:slf4j-api:2.0.3")
+    implementation("commons-codec:commons-codec:1.16.1")
+    api("org.telegram:telegrambots-abilities:8.0.0")
+    api(project(":scalabot-meta"))
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
-    testImplementation("org.mockito:mockito-core:5.1.1")
+    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")
 }
 
@@ -26,8 +25,8 @@ tasks.withType<Javadoc> {
 java {
     withJavadocJar()
     withSourcesJar()
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.test {
@@ -46,19 +45,10 @@ tasks.withType<AbstractArchiveTask>().configureEach {
 
 publishing {
     repositories {
-        if (project.version.toString().endsWith("-SNAPSHOT")) {
-            maven("https://nexus.kuku.me/repository/maven-snapshots/") {
+        maven("https://git.lamgc.me/api/packages/LamGC/maven") {
             credentials {
-                    username = project.properties["repo.credentials.private.username"].toString()
-                    password = project.properties["repo.credentials.private.password"].toString()
-                }
-            }
-        } else {
-            maven("https://nexus.kuku.me/repository/maven-releases/") {
-                credentials {
-                    username = project.properties["repo.credentials.private.username"].toString()
-                    password = project.properties["repo.credentials.private.password"].toString()
-                }
+                username = project.properties["repo.credentials.self-git.username"].toString()
+                password = project.properties["repo.credentials.self-git.password"].toString()
             }
         }
     }

scalabot-extension/src/main/java/net/lamgc/scalabot/extension/BotExtensionCreateOptions.java

@@ -0,0 +1,44 @@
+package net.lamgc.scalabot.extension;
+
+import net.lamgc.scalabot.config.ProxyConfig;
+
+/**
+ * BotExtension 创建参数.
+ * <p>
+ * 通过该类可向 {@link BotExtensionFactory} 提供更多创建 BotExtension 时可用的参数.
+ */
+@SuppressWarnings("unused")
+public class BotExtensionCreateOptions {
+
+    private final long botAccountId;
+    private final ProxyConfig proxy;
+
+    /**
+     * 构造新的 BotExtensionCreateOptions.
+     *
+     * @param botAccountId 创建扩展的 Bot 账户 Id.
+     * @param proxy        Bot 所使用的代理配置.
+     */
+    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;
+    }
+}

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} 创建扩展.
  *
  * <p> 由于 AbilityExtension 无法直接获取 {@link BaseAbilityBot} 的
- * 数据库对象 {@link org.telegram.abilitybots.api.db.DBContext},
+ * 数据库对象 {@link DBContext},
  * 所以将通过该接口工厂来创建扩展对象.
  *
  * @author LamGC
@@ -20,7 +21,7 @@ public interface BotExtensionFactory {
     /**
      * 为给定的 {@link BaseAbilityBot} 对象创建扩展.
      *
-     * <p> 如扩展无使用 {@link org.telegram.abilitybots.api.db.DBContext} 的话,
+     * <p> 如扩展无使用 {@link DBContext} 的话,
      * 也可以返回扩展单例, 因为 AbilityBot 本身并不禁止多个机器人共用一个扩展对象
      * (AbilityBot 只是调用了扩展中的方法来创建 Ability 对象).
      *
@@ -30,8 +31,10 @@ public interface BotExtensionFactory {
      *                        <pre> $DATA_ROOT/data/extensions/{GroupId}/{ArtifactId}</pre>
      *                        <b>同一个扩展包的 Factory</b> 接收到的共享数据目录<b>都是一样的</b>,
      *                        建议将数据存储在数据目录中, 便于数据的存储管理.
+     * @param options         创建扩展时可用的参数.
      * @return 返回为该 Bot 对象创建的扩展对象, 如果不希望为该机器人提供扩展, 可返回 {@code null}.
+     * @since 0.7.0
      */
-    AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder);
+    AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder, BotExtensionCreateOptions options);
 
 }

scalabot-extension/src/main/java/net/lamgc/scalabot/extension/util/AbilityBots.java

@@ -1,38 +1,17 @@
 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.
-     *
-     * <p> 账户 Id 来自于 botToken 中, token 的格式为 "[AccountId]:[Secret]".
-     * <p> 账户 Id 的真实性与 botToken 的有效性有关, 本方法并不会确保 botToken 的有效性, 一般情况下也无需考虑 Id 的有效性,
-     * 如果有需要, 可尝试通过调用 {@link org.telegram.telegrambots.meta.api.methods.GetMe} 来确保 botToken 的有效性.
-     *
-     * @param bot 要获取账户 Id 的 AbilityBot 对象.
-     * @return 返回 AbilityBot 的账户 Id.
-     * @throws IllegalArgumentException 当 AbilityBot 的 botToken 格式错误时抛出该异常.
-     */
-    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));
-    }
-
     /**
      * 取消某一对话的状态机.
      *
@@ -41,7 +20,7 @@ public class AbilityBots {
      * @return 如果状态机存在, 则删除后返回 true, 不存在(未开启任何状态机, 即没有触发任何 Reply)则返回 false.
      */
     public static boolean cancelReplyState(BaseAbilityBot bot, long chatId) {
-        Map<Long, Integer> stateMap = bot.db().getMap("user_state_replies");
+        Map<Long, Integer> stateMap = bot.getDb().getMap("user_state_replies");
         if (!stateMap.containsKey(chatId)) {
             return false;
         }

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()
                     )

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 <T extends Serializable, Method extends BotApiMethod<T>> CompletableFuture<T> executeAsync(Method method) {
+        return null;
+    }
+
+    @Override
+    public <T extends Serializable, Method extends BotApiMethod<T>> 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<Message> execute(SendMediaGroup sendMediaGroup) {
+        return List.of();
+    }
+
+    @Override
+    public List<Message> 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<Message> executeAsync(SendDocument sendDocument) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Message> executeAsync(SendPhoto sendPhoto) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> executeAsync(SetWebhook setWebhook) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Message> executeAsync(SendVideo sendVideo) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Message> executeAsync(SendVideoNote sendVideoNote) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Message> executeAsync(SendSticker sendSticker) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Message> executeAsync(SendAudio sendAudio) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Message> executeAsync(SendVoice sendVoice) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<Message>> executeAsync(SendMediaGroup sendMediaGroup) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<List<Message>> executeAsync(SendPaidMedia sendPaidMedia) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> executeAsync(SetChatPhoto setChatPhoto) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> executeAsync(AddStickerToSet addStickerToSet) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> executeAsync(ReplaceStickerInSet replaceStickerInSet) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> executeAsync(SetStickerSetThumbnail setStickerSetThumbnail) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Boolean> executeAsync(CreateNewStickerSet createNewStickerSet) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<File> executeAsync(UploadStickerFile uploadStickerFile) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Serializable> executeAsync(EditMessageMedia editMessageMedia) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<Message> executeAsync(SendAnimation sendAnimation) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<java.io.File> downloadFileAsync(File file) {
+        return null;
+    }
+
+    @Override
+    public CompletableFuture<InputStream> downloadFileAsStreamAsync(File file) {
+        return null;
+    }
+}

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 <init> (Ljava/lang/String;Ljava/net/URL;Lorg/eclipse/aether/repository/Proxy;Ljava/lang/String;ZZLorg/eclipse/aether/repository/Authentication;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/net/URL;Lorg/eclipse/aether/repository/Proxy;Ljava/lang/String;ZZLorg/eclipse/aether/repository/Authentication;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -123,6 +128,7 @@ public final class net/lamgc/scalabot/config/ProxyType : java/lang/Enum {
 	public static final field NO_PROXY Lnet/lamgc/scalabot/config/ProxyType;
 	public static final field SOCKS4 Lnet/lamgc/scalabot/config/ProxyType;
 	public static final field SOCKS5 Lnet/lamgc/scalabot/config/ProxyType;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lnet/lamgc/scalabot/config/ProxyType;
 	public static fun values ()[Lnet/lamgc/scalabot/config/ProxyType;
 }

scalabot-meta/build.gradle.kts

@@ -1,7 +1,9 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("jvm")
     id("org.jetbrains.kotlinx.kover")
-    id("org.jetbrains.dokka") version "1.7.20"
+    id("org.jetbrains.dokka") version "1.9.20"
     `maven-publish`
     signing
     id("org.jetbrains.kotlinx.binary-compatibility-validator")
@@ -12,29 +14,29 @@ dependencies {
     api("org.eclipse.aether:aether-api:$aetherVersion")
     implementation("org.eclipse.aether:aether-util:$aetherVersion")
 
-    implementation("org.telegram:telegrambots-meta:6.5.0")
+    implementation("org.telegram:telegrambots-meta:8.0.0")
 
-    api("com.google.code.gson:gson:2.10.1")
+    api("com.google.code.gson:gson:2.11.0")
 
     testImplementation(kotlin("test"))
-    testImplementation("io.mockk:mockk:1.13.2")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
+    testImplementation("io.mockk:mockk:1.13.13")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 
-    dokkaHtmlPlugin("org.jetbrains.dokka:javadoc-plugin:1.7.20")
+    dokkaHtmlPlugin("org.jetbrains.dokka:javadoc-plugin:2.0.0")
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "11"
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
     }
 }
 
 java {
     withJavadocJar()
     withSourcesJar()
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType<AbstractArchiveTask>().configureEach {
@@ -52,19 +54,10 @@ val javadocJar = tasks.named<Jar>("javadocJar") {
 
 publishing {
     repositories {
-        if (project.version.toString().endsWith("-SNAPSHOT", ignoreCase = true)) {
-            maven("https://nexus.kuku.me/repository/maven-snapshots/") {
+        maven("https://git.lamgc.me/api/packages/LamGC/maven") {
             credentials {
-                    username = project.properties["repo.credentials.private.username"].toString()
-                    password = project.properties["repo.credentials.private.password"].toString()
-                }
-            }
-        } else {
-            maven("https://nexus.kuku.me/repository/maven-releases/") {
-                credentials {
-                    username = project.properties["repo.credentials.private.username"].toString()
-                    password = project.properties["repo.credentials.private.password"].toString()
-                }
+                username = project.properties["repo.credentials.self-git.username"].toString()
+                password = project.properties["repo.credentials.self-git.password"].toString()
             }
         }
     }

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<Artifact> = 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()
+            }
+        }
+    }
+}
 
 /**
  * 代理类型.

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 反序列化结果与预期不符."