mirror of
https://github.com/LamGC/ScalaBot.git
synced 2025-07-01 12:57:24 +00:00
feat: 将 TelegramBots 升级至 8.0.0, 并适配 TelegramBots 的新改动.
将 TelegramBots 升级至新版本, 以支持新的 API. 由于 TelegramBots 发生无法兼容旧版本的重大变更, 因此 ScalaBot 将随着此次更新一同进行重大更改. BREAKING CHANGE: ScalaBot 所依赖的 TelegramBots 发生重大更改, 所有扩展都需要进行适配. 有关 TelegramBots 的重大变更说明请参考官方文档. ScalaBot 的最低 Java 版本已全部升级至 Java 17 (这是 TelegramBots 的最低兼容性要求), 所有扩展都应该至少迁移至 Java 17 版本. ScalaBot 的重大更改: - scalabot-extension - `net.lamgc.scalabot.extension.util.AbilityBots.getBotAccountId(BaseAbilityBot): long` 已被移除, 由于 BaseAbilityBot 不再允许获取 botToken, 因此该方法被移除. 作为代替, 请通过 `net.lamgc.scalabot.extension.BotExtensionFactory.createExtensionInstance` 所得到的 `BotExtensionCreateOptions` 中获取 botAccountId. 另外, scalabot-extension 中的 `org.jetbrains.kotlinx.binary-compatibility-validator` 似乎不再对 Java 代码起作用, 因此移除该插件, 并在后续寻找替代品. TelegramBots 文档: https://rubenlagus.github.io/TelegramBotsDocumentation/how-to-update-7.html
This commit is contained in:
@ -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
|
||||
|
@ -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<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().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<AbstractArchiveTask>().configureEach {
|
||||
|
@ -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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 代理类型.
|
||||
|
@ -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 反序列化结果与预期不符."
|
||||
|
Reference in New Issue
Block a user