mirror of
https://github.com/LamGC/ScalaBot.git
synced 2025-04-30 06:37:29 +00:00
Compare commits
No commits in common. "main" and "v0.5.0" have entirely different histories.
@ -1,2 +0,0 @@
|
||||
**/
|
||||
!scalabot-app/build/install/
|
||||
33
.github/dependabot.yml
vendored
33
.github/dependabot.yml
vendored
@ -1,33 +0,0 @@
|
||||
# To get started with Dependabot version updates, you'll need to specify which
|
||||
# package ecosystems to update and where the package manifests are located.
|
||||
# Please see the documentation for all configuration options:
|
||||
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
||||
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "weekly"
|
||||
|
||||
- package-ecosystem: "gradle"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
|
||||
# - package-ecosystem: "gradle"
|
||||
# directory: "/scalabot-app"
|
||||
# schedule:
|
||||
# interval: "weekly"
|
||||
# - package-ecosystem: "gradle"
|
||||
# directory: "/scalabot-meta"
|
||||
# schedule:
|
||||
# interval: "weekly"
|
||||
# - package-ecosystem: "gradle"
|
||||
# directory: "/scalabot-extension"
|
||||
# schedule:
|
||||
# interval: "weekly"
|
||||
# - package-ecosystem: "gradle"
|
||||
# directory: "/scalabot-ext-example"
|
||||
# schedule:
|
||||
# interval: "weekly"
|
||||
@ -1,33 +0,0 @@
|
||||
name: Binary compatibility verification (for API)
|
||||
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- 'scalabot-meta/**'
|
||||
- 'scalabot-extension/**'
|
||||
pull_request:
|
||||
paths:
|
||||
- 'scalabot-meta/**'
|
||||
- 'scalabot-extension/**'
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
apiCompatibilityCheck:
|
||||
timeout-minutes: 8
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt-hotspot'
|
||||
- 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
|
||||
run: ./gradlew apiCheck
|
||||
16
.github/workflows/build-and-test.yml
vendored
16
.github/workflows/build-and-test.yml
vendored
@ -18,15 +18,17 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up JDK 11
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
java-version: '11'
|
||||
distribution: 'adopt-hotspot'
|
||||
- name: Set up Gradle
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
cache: 'gradle'
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Build and test
|
||||
run: ./gradlew clean test
|
||||
uses: gradle/gradle-build-action@v2.2.1
|
||||
with:
|
||||
gradle-version: 'wrapper'
|
||||
arguments: test
|
||||
|
||||
62
.github/workflows/create-release.yml
vendored
62
.github/workflows/create-release.yml
vendored
@ -1,62 +0,0 @@
|
||||
name: Create release draft
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v[0-9]+.[0-9]+.[0-9]+*'
|
||||
|
||||
# 该 Action 有以下步骤：
|
||||
# 1. 拉取并构建代码, 然后生成 Application 发行包;
|
||||
# 2. 创建 Release, 并标记为 Draft(草稿);
|
||||
# 3. 上传 Application 发行包;
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
create-release:
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
# 创建更新日志.
|
||||
- name: 'Get Previous tag'
|
||||
id: previous-tag
|
||||
uses: younited/get-previous-tag-action@v1.1.0
|
||||
with:
|
||||
match: "v*.*.*"
|
||||
- name: Set up Python 3
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.10'
|
||||
- name: Install Commitizen
|
||||
run: pip install -U commitizen
|
||||
- name: Create Change log
|
||||
run: cz ch --start-rev ${{ steps.previous-tag.outputs.previous-tag }} --file-name ${{ github.workspace }}/CURRENT_CHANGELOG.md
|
||||
|
||||
# 开始构建项目.
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt-hotspot'
|
||||
- name: Set up Gradle
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Build and test
|
||||
run: ./gradlew clean test assembleDist
|
||||
|
||||
# 创建新的发行版本
|
||||
- name: Create Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
draft: true
|
||||
body_path: ${{ github.workspace }}/CURRENT_CHANGELOG.md
|
||||
files: |
|
||||
*/build/distributions/*
|
||||
*/build/libs/*
|
||||
10
.github/workflows/gradle-wrapper-validation.yml
vendored
Normal file
10
.github/workflows/gradle-wrapper-validation.yml
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
name: "Validate Gradle Wrapper"
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
validation:
|
||||
name: "Validation"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: gradle/wrapper-validation-action@v1
|
||||
46
.github/workflows/publish-artifacts.yml
vendored
46
.github/workflows/publish-artifacts.yml
vendored
@ -1,46 +0,0 @@
|
||||
name: Publish artifacts
|
||||
|
||||
on:
|
||||
release:
|
||||
types:
|
||||
- published
|
||||
|
||||
env:
|
||||
IMAGE_NAME: lamgc/scalabot
|
||||
|
||||
jobs:
|
||||
publish-container-image:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 15
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt-hotspot'
|
||||
- name: Set up Gradle
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Build and test
|
||||
run: ./gradlew clean test installDist
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
- name: Set up Docker BuildX
|
||||
uses: docker/setup-buildx-action@v3
|
||||
- name: Login to DockerHub
|
||||
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@v6
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
tags: ${{ env.IMAGE_NAME }}:latest, ${{ env.IMAGE_NAME }}:${{ github.ref_name }}
|
||||
platforms: linux/amd64,linux/arm64
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
@ -1,46 +0,0 @@
|
||||
name: Build development version container image
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "main"
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
timeout-minutes: 15
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt-hotspot'
|
||||
- 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
|
||||
run: ./gradlew clean test installDist
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
- name: Set up Docker BuildX
|
||||
uses: docker/setup-buildx-action@v3
|
||||
- name: Login to DockerHub
|
||||
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@v6
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
tags: lamgc/scalabot:dev
|
||||
platforms: linux/amd64,linux/arm64
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
@ -1,8 +0,0 @@
|
||||
FROM eclipse-temurin:21-jdk-alpine
|
||||
|
||||
ENV BOT_DATA_PATH /scalabot/data/
|
||||
WORKDIR /scalabot/run/
|
||||
|
||||
CMD ["/scalabot/app/bin/scalabot-app"]
|
||||
|
||||
COPY scalabot-app/build/install/scalabot-app/ /scalabot/app/
|
||||
@ -1,7 +1,6 @@
|
||||
plugins {
|
||||
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
|
||||
kotlin("jvm") version "1.6.10" apply false
|
||||
id("org.jetbrains.kotlinx.kover") version "0.5.1" apply false
|
||||
}
|
||||
|
||||
allprojects {
|
||||
@ -13,5 +12,5 @@ allprojects {
|
||||
|
||||
}
|
||||
group = "net.lamgc"
|
||||
version = "0.8.0-1"
|
||||
version = "0.5.0"
|
||||
}
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
10
gradlew
vendored
10
gradlew
vendored
@ -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:
|
||||
#
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
plugins {
|
||||
@ -11,9 +10,9 @@ dependencies {
|
||||
implementation(project(":scalabot-meta"))
|
||||
implementation(project(":scalabot-extension"))
|
||||
|
||||
implementation("org.slf4j:slf4j-api:2.0.11")
|
||||
implementation("io.github.microutils:kotlin-logging:3.0.5")
|
||||
implementation("ch.qos.logback:logback-classic:1.5.12")
|
||||
implementation("org.slf4j:slf4j-api:1.7.36")
|
||||
implementation("io.github.microutils:kotlin-logging:2.1.23")
|
||||
implementation("ch.qos.logback:logback-classic:1.2.11")
|
||||
|
||||
val aetherVersion = "1.1.0"
|
||||
implementation("org.eclipse.aether:aether-api:$aetherVersion")
|
||||
@ -23,35 +22,31 @@ 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.9.0")
|
||||
implementation("org.jetbrains.kotlin:kotlin-reflect:2.1.0")
|
||||
implementation("com.google.code.gson:gson:2.11.0")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
|
||||
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.20")
|
||||
implementation("com.google.code.gson:gson:2.9.0")
|
||||
|
||||
implementation("org.jdom:jdom2:2.0.6.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("org.telegram:telegrambots-abilities:6.1.0")
|
||||
implementation("org.telegram:telegrambots:6.1.0")
|
||||
|
||||
implementation("io.prometheus:simpleclient:0.16.0")
|
||||
implementation("io.prometheus:simpleclient_httpserver:0.16.0")
|
||||
implementation("io.prometheus:simpleclient:0.15.0")
|
||||
implementation("io.prometheus:simpleclient_httpserver:0.15.0")
|
||||
|
||||
testImplementation(kotlin("test"))
|
||||
testImplementation("io.mockk:mockk:1.13.13")
|
||||
testImplementation("io.mockk:mockk:1.12.4")
|
||||
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> {
|
||||
compilerOptions {
|
||||
jvmTarget = JvmTarget.JVM_17
|
||||
}
|
||||
kotlinOptions.jvmTarget = "11"
|
||||
}
|
||||
|
||||
application {
|
||||
@ -61,8 +56,3 @@ application {
|
||||
tasks.jar.configure {
|
||||
exclude("**/logback-test.xml")
|
||||
}
|
||||
|
||||
tasks.withType<AbstractArchiveTask>().configureEach {
|
||||
isPreserveFileTimestamps = false
|
||||
isReproducibleFileOrder = true
|
||||
}
|
||||
|
||||
@ -12,24 +12,22 @@ import org.eclipse.aether.repository.Authentication
|
||||
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
|
||||
import java.util.concurrent.atomic.AtomicBoolean
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
import java.util.function.Supplier
|
||||
import kotlin.reflect.KProperty
|
||||
|
||||
private val log = KotlinLogging.logger { }
|
||||
|
||||
internal fun ProxyType.toJavaProxyType(): java.net.Proxy.Type? {
|
||||
internal fun ProxyType.toTelegramBotsType(): DefaultBotOptions.ProxyType {
|
||||
return when (this) {
|
||||
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
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,10 +45,6 @@ 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
|
||||
}
|
||||
@ -108,9 +102,9 @@ private fun createDefaultRepositoryId(): String {
|
||||
* 必须提供 `pathSupplier` 或 `fileSupplier` 其中一个, 才能正常提供路径.
|
||||
*/
|
||||
internal enum class AppPaths(
|
||||
private val pathSupplier: PathSupplier,
|
||||
private val pathSupplier: () -> String = { fileSupplier.invoke().canonicalPath },
|
||||
private val initializer: AppPaths.() -> Unit = AppPaths::defaultInitializer,
|
||||
private val fileSupplier: FileSupplier,
|
||||
private val fileSupplier: () -> File = { File(pathSupplier()) }
|
||||
) {
|
||||
/**
|
||||
* 数据根目录.
|
||||
@ -119,7 +113,7 @@ internal enum class AppPaths(
|
||||
*
|
||||
* 提示: 结尾不带 `/`.
|
||||
*/
|
||||
DATA_ROOT(fileSupplier = FileSupplier {
|
||||
DATA_ROOT(fileSupplier = {
|
||||
File(
|
||||
System.getProperty(PathConst.PROP_DATA_PATH) ?: System.getenv(PathConst.ENV_DATA_PATH)
|
||||
?: System.getProperty("user.dir") ?: "."
|
||||
@ -131,7 +125,7 @@ internal enum class AppPaths(
|
||||
}
|
||||
}),
|
||||
|
||||
CONFIG_APPLICATION(PathSupplier { "$DATA_ROOT/config.json" }, {
|
||||
CONFIG_APPLICATION({ "$DATA_ROOT/config.json" }, {
|
||||
if (!file.exists()) {
|
||||
file.bufferedWriter(StandardCharsets.UTF_8).use {
|
||||
GsonConst.appConfigGson.toJson(
|
||||
@ -147,7 +141,7 @@ internal enum class AppPaths(
|
||||
}
|
||||
}
|
||||
}),
|
||||
CONFIG_BOT(PathSupplier { "$DATA_ROOT/bot.json" }, {
|
||||
CONFIG_BOT({ "$DATA_ROOT/bot.json" }, {
|
||||
if (!file.exists()) {
|
||||
file.bufferedWriter(StandardCharsets.UTF_8).use {
|
||||
GsonConst.botConfigGson.toJson(
|
||||
@ -173,25 +167,10 @@ internal enum class AppPaths(
|
||||
TEMP({ "$DATA_ROOT/tmp/" })
|
||||
;
|
||||
|
||||
constructor(pathSupplier: PathSupplier, initializer: AppPaths.() -> Unit = AppPaths::defaultInitializer) : this(
|
||||
fileSupplier = FileSupplier { File(pathSupplier.path).canonicalFile },
|
||||
pathSupplier = pathSupplier,
|
||||
initializer = initializer
|
||||
)
|
||||
|
||||
constructor(fileSupplier: FileSupplier, initializer: AppPaths.() -> Unit = AppPaths::defaultInitializer) : this(
|
||||
fileSupplier = fileSupplier,
|
||||
pathSupplier = PathSupplier { fileSupplier.file.canonicalPath },
|
||||
initializer = initializer
|
||||
)
|
||||
|
||||
constructor(pathSupplier: () -> String) : this(
|
||||
fileSupplier = FileSupplier { File(pathSupplier.invoke()).canonicalFile },
|
||||
pathSupplier = PathSupplier { pathSupplier.invoke() }
|
||||
)
|
||||
|
||||
val file: File by fileSupplier
|
||||
val path: String by pathSupplier
|
||||
val file: File
|
||||
get() = fileSupplier.invoke()
|
||||
val path: String
|
||||
get() = pathSupplier.invoke()
|
||||
|
||||
private val initialized = AtomicBoolean(false)
|
||||
|
||||
@ -227,20 +206,6 @@ internal enum class AppPaths(
|
||||
const val ENV_DATA_PATH = "BOT_DATA_PATH"
|
||||
}
|
||||
|
||||
private class FileSupplier(private val supplier: Supplier<File>) {
|
||||
operator fun getValue(appPaths: AppPaths, property: KProperty<*>): File = supplier.get()
|
||||
|
||||
val file: File
|
||||
get() = supplier.get()
|
||||
}
|
||||
|
||||
private class PathSupplier(private val supplier: Supplier<String>) {
|
||||
operator fun getValue(appPaths: AppPaths, property: KProperty<*>): String = supplier.get()
|
||||
|
||||
val path: String
|
||||
get() = supplier.get()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@ -252,37 +217,8 @@ internal class LogDirectorySupplier : PropertyDefinerBase() {
|
||||
}
|
||||
}
|
||||
|
||||
internal class LogLevelSupplier : PropertyDefinerBase() {
|
||||
override fun getPropertyValue(): String {
|
||||
val property = System.getProperty("scalabot.log.level", System.getenv("BOT_LOG_LEVEL"))
|
||||
val level = if (property != null) {
|
||||
try {
|
||||
Level.valueOf(property.uppercase())
|
||||
} catch (e: IllegalArgumentException) {
|
||||
addWarn("Invalid log level: `$property`, the log will be output using the Info log level.")
|
||||
Level.INFO
|
||||
}
|
||||
} else {
|
||||
Level.INFO
|
||||
}
|
||||
return level.name
|
||||
}
|
||||
}
|
||||
|
||||
internal class NetworkVerboseLogSupplier : PropertyDefinerBase() {
|
||||
override fun getPropertyValue(): String {
|
||||
val propertyValue = System.getProperty("scalabot.log.network.verbose", "false")
|
||||
return if (propertyValue.toBoolean()) {
|
||||
"DEBUG"
|
||||
} else {
|
||||
"INFO"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal object Const {
|
||||
val config = loadAppConfig()
|
||||
const val METRICS_NAMESPACE = "scalabot"
|
||||
}
|
||||
|
||||
private fun AppPaths.defaultInitializer() {
|
||||
@ -309,7 +245,7 @@ internal fun initialFiles(): Boolean {
|
||||
val configFilesNotInitialized = !AppPaths.CONFIG_APPLICATION.file.exists()
|
||||
&& !AppPaths.CONFIG_BOT.file.exists()
|
||||
|
||||
for (path in AppPaths.entries) {
|
||||
for (path in AppPaths.values()) {
|
||||
path.initial()
|
||||
}
|
||||
|
||||
|
||||
@ -6,17 +6,13 @@ 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.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.bots.DefaultBotOptions
|
||||
import org.telegram.telegrambots.meta.TelegramBotsApi
|
||||
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
|
||||
@ -30,7 +26,6 @@ private val log = KotlinLogging.logger { }
|
||||
fun main(args: Array<String>): Unit = runBlocking {
|
||||
log.info { "ScalaBot 正在启动中..." }
|
||||
log.info { "数据目录: ${AppPaths.DATA_ROOT}" }
|
||||
log.debug { "Kotlin: ${KotlinVersion.CURRENT}, JVM: ${Runtime.version()}" }
|
||||
log.debug { "启动参数: ${args.joinToString(prefix = "[", postfix = "]")}" }
|
||||
if (initialFiles()) {
|
||||
exitProcess(1)
|
||||
@ -66,24 +61,23 @@ internal fun startMetricsServer(config: MetricsConfig = Const.config.metrics): H
|
||||
return httpServer
|
||||
}
|
||||
|
||||
internal class Launcher(
|
||||
private val config: AppConfig = Const.config,
|
||||
private val configFile: File = AppPaths.CONFIG_APPLICATION.file,
|
||||
) : AutoCloseable {
|
||||
internal class Launcher(private val config: AppConfig = Const.config) : AutoCloseable {
|
||||
|
||||
companion object {
|
||||
@JvmStatic
|
||||
private val log = KotlinLogging.logger { }
|
||||
}
|
||||
|
||||
private val botApi = TelegramBotsLongPollingApplication()
|
||||
private val botApi = TelegramBotsApi(DefaultBotSession::class.java)
|
||||
private val botSessionMap = mutableMapOf<ScalaBot, BotSession>()
|
||||
private val mavenLocalRepository = getMavenLocalRepository()
|
||||
|
||||
private fun getMavenLocalRepository(): LocalRepository {
|
||||
val localPath =
|
||||
if (config.mavenLocalRepository != null && config.mavenLocalRepository!!.isNotEmpty()) {
|
||||
val repoPath = configFile.toPath().resolve(config.mavenLocalRepository!!).apply {
|
||||
val repoPath = AppPaths.DATA_ROOT.file.toPath()
|
||||
.resolve(config.mavenLocalRepository!!)
|
||||
.apply {
|
||||
if (!exists()) {
|
||||
if (!parent.isWritable() || !parent.isReadable()) {
|
||||
throw IOException("Unable to read and write the directory where Maven repository is located.")
|
||||
@ -139,17 +133,9 @@ 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
|
||||
@ -177,17 +163,17 @@ internal class Launcher(
|
||||
ProxyConfig(type = ProxyType.NO_PROXY)
|
||||
}
|
||||
|
||||
val okhttpClientBuilder = OkHttpClient.Builder()
|
||||
|
||||
val botOption = DefaultBotOptions().apply {
|
||||
if (proxyConfig.type != ProxyType.NO_PROXY) {
|
||||
val proxyType = proxyConfig.type.toJavaProxyType()
|
||||
val proxyAddress = InetSocketAddress.createUnresolved(proxyConfig.host, proxyConfig.port)
|
||||
okhttpClientBuilder.proxy(Proxy(proxyType, proxyAddress))
|
||||
proxyType = proxyConfig.type.toTelegramBotsType()
|
||||
proxyHost = config.proxy.host
|
||||
proxyPort = config.proxy.port
|
||||
log.debug { "机器人 `${botConfig.account.name}` 已启用代理配置: $proxyConfig" }
|
||||
}
|
||||
|
||||
baseUrl = botConfig.baseApiUrl
|
||||
}
|
||||
val account = botConfig.account
|
||||
val telegramClient =
|
||||
OkHttpTelegramClient(okhttpClientBuilder.build(), account.token, botConfig.getBaseApiTelegramUrl())
|
||||
|
||||
val remoteRepositories = config.mavenRepositories
|
||||
.map { it.toRemoteRepository(proxyConfig) }
|
||||
@ -196,7 +182,7 @@ internal class Launcher(
|
||||
it.url == MavenRepositoryExtensionFinder.MAVEN_CENTRAL_URL
|
||||
|| it.url == MavenRepositoryExtensionFinder.MAVEN_CENTRAL_URL.trimEnd('/')
|
||||
}) {
|
||||
add(MavenRepositoryExtensionFinder.getMavenCentralRepository(proxy = proxyConfig.toAetherProxy()))
|
||||
add(MavenRepositoryExtensionFinder.getMavenCentralRepository(proxy = config.proxy.toAetherProxy()))
|
||||
}
|
||||
}.toList()
|
||||
val extensionPackageFinders = setOf(
|
||||
@ -209,15 +195,11 @@ internal class Launcher(
|
||||
|
||||
val bot = ScalaBot(
|
||||
BotDBMaker.getBotDbInstance(account),
|
||||
telegramClient,
|
||||
botOption,
|
||||
extensionPackageFinders,
|
||||
botConfig
|
||||
)
|
||||
|
||||
val botUser = bot.telegramClient.execute(GetMe())
|
||||
log.debug { "已验证 Bot Token 有效性, Bot Username: ${botUser.userName}" }
|
||||
|
||||
botSessionMap[bot] = botApi.registerBot(botConfig.account.token, bot)
|
||||
botSessionMap[bot] = botApi.registerBot(bot)
|
||||
log.info { "机器人 `${bot.botUsername}` 已启动." }
|
||||
|
||||
if (botConfig.autoUpdateCommandList) {
|
||||
|
||||
@ -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.telegrambots.abilitybots.api.db.DBContext
|
||||
import org.telegram.telegrambots.abilitybots.api.db.MapDBContext
|
||||
import org.telegram.abilitybots.api.db.DBContext
|
||||
import org.telegram.abilitybots.api.db.MapDBContext
|
||||
import java.io.File
|
||||
import java.nio.charset.StandardCharsets
|
||||
import java.security.MessageDigest
|
||||
@ -157,6 +157,7 @@ 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()) {
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
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.telegrambots.abilitybots.api.util.AbilityExtension
|
||||
import org.telegram.abilitybots.api.util.AbilityExtension
|
||||
import java.io.File
|
||||
import java.io.FileNotFoundException
|
||||
import java.net.URL
|
||||
@ -123,13 +122,7 @@ internal class ExtensionLoader(
|
||||
for (factory in extClassLoader.serviceLoader) {
|
||||
try {
|
||||
val extension =
|
||||
factory.createExtensionInstance(
|
||||
bot, getExtensionDataFolder(extensionArtifact),
|
||||
BotExtensionCreateOptions(
|
||||
bot.accountId,
|
||||
bot.botConfig.proxy.copy()
|
||||
)
|
||||
)
|
||||
factory.createExtensionInstance(bot, getExtensionDataFolder(extensionArtifact))
|
||||
if (extension == null) {
|
||||
log.debug { "Factory ${factory::class.java} 创建插件时返回了 null, 已跳过. (BotName: ${bot.botUsername})" }
|
||||
continue
|
||||
@ -159,7 +152,7 @@ internal class ExtensionLoader(
|
||||
* 搜索指定构件坐标的依赖包.
|
||||
*
|
||||
* 搜索扩展包将根据搜索器优先级从高到低依次搜索, 当某一个优先级的搜索器搜到扩展包后将停止搜索.
|
||||
* 可以根据不同优先级的搜索器, 配置扩展包的主用和备用文件.
|
||||
* 可以根据不同优先级的搜索器, 配置扩展包的主用与备用文件.
|
||||
*
|
||||
* @return 返回各个搜索器返回的搜索结果.
|
||||
*/
|
||||
@ -420,14 +413,14 @@ internal class ExtensionClassLoader(urls: Array<URL>, dependencyLoader: ClassLoa
|
||||
// 以免使用了不来自扩展包的机器人扩展.
|
||||
|
||||
override fun getResources(name: String?): Enumeration<URL> {
|
||||
if ("META-INF/services/${BotExtensionFactory::class.java.name}" == name) {
|
||||
if (BotExtensionFactory::class.java.equals(name)) {
|
||||
return findResources(name)
|
||||
}
|
||||
return super.getResources(name)
|
||||
}
|
||||
|
||||
override fun getResource(name: String?): URL? {
|
||||
if ("META-INF/services/${BotExtensionFactory::class.java}" == name) {
|
||||
if (BotExtensionFactory::class.java.equals(name)) {
|
||||
return findResource(name)
|
||||
}
|
||||
return super.getResource(name)
|
||||
|
||||
@ -26,7 +26,6 @@ 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.*
|
||||
@ -397,6 +396,7 @@ internal class MavenRepositoryExtensionFinder(
|
||||
/**
|
||||
* Maven 中央仓库 Url.
|
||||
*/
|
||||
@Suppress("MemberVisibilityCanBePrivate")
|
||||
const val MAVEN_CENTRAL_URL = "https://repo1.maven.org/maven2/"
|
||||
|
||||
/**
|
||||
@ -466,19 +466,17 @@ internal class MavenRepositoryExtensionFinder(
|
||||
throw IllegalArgumentException("Unsupported FoundExtensionPackage type: $foundExtensionPackage")
|
||||
}
|
||||
|
||||
val urls = mutableSetOf<URI>()
|
||||
val urls = mutableSetOf<URL>()
|
||||
for (dependency in foundExtensionPackage.dependencies) {
|
||||
val dependencyFile = dependency.file ?: continue
|
||||
urls.add(dependencyFile.toURI())
|
||||
urls.add(dependencyFile.toURI().toURL())
|
||||
}
|
||||
|
||||
// 将依赖的 ClassLoader 与 ExtensionPackage 的 ClassLoader 分开
|
||||
// 这么做可以防范依赖中隐藏的 SPI 注册, 避免安全隐患.
|
||||
|
||||
val dependenciesUrlArray = urls.toTypedArray()
|
||||
val dependenciesClassLoader = URLClassLoader(
|
||||
dependenciesUrlArray.map { it.toURL() }.toTypedArray()
|
||||
)
|
||||
val dependenciesClassLoader = URLClassLoader(dependenciesUrlArray)
|
||||
|
||||
return ExtensionClassLoader(
|
||||
arrayOf(foundExtensionPackage.getPackageFile().toURI().toURL()),
|
||||
|
||||
@ -6,42 +6,43 @@ import io.prometheus.client.Summary
|
||||
import mu.KotlinLogging
|
||||
import net.lamgc.scalabot.config.BotConfig
|
||||
import org.eclipse.aether.artifact.Artifact
|
||||
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.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.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,
|
||||
client: TelegramClient,
|
||||
options: DefaultBotOptions,
|
||||
extensionFinders: Set<ExtensionPackageFinder>,
|
||||
val botConfig: BotConfig,
|
||||
val accountId: Long = botConfig.account.id,
|
||||
botConfig: BotConfig,
|
||||
private val creatorId: Long = botConfig.account.creatorId,
|
||||
val accountId: Long = botConfig.account.id,
|
||||
val extensions: Set<Artifact> = botConfig.extensions
|
||||
) :
|
||||
AbilityBot(
|
||||
client,
|
||||
botConfig.account.token,
|
||||
botConfig.account.name,
|
||||
db,
|
||||
if (botConfig.disableBuiltInAbility)
|
||||
BareboneToggle()
|
||||
else
|
||||
DefaultToggle()
|
||||
DefaultToggle(),
|
||||
options
|
||||
) {
|
||||
|
||||
private val extensionLoader = ExtensionLoader(
|
||||
@ -49,8 +50,6 @@ internal class ScalaBot(
|
||||
extensionFinders = extensionFinders
|
||||
)
|
||||
|
||||
private val accountIdString = accountId.toString()
|
||||
|
||||
init {
|
||||
log.info { "[Bot $botUsername] 正在加载扩展..." }
|
||||
val extensionEntries = extensionLoader.getExtensions()
|
||||
@ -66,19 +65,19 @@ internal class ScalaBot(
|
||||
|
||||
override fun creatorId(): Long = creatorId
|
||||
|
||||
override fun consume(update: Update?) {
|
||||
botUpdateCounter.labels(botUsername, accountIdString).inc()
|
||||
botUpdateGauge.labels(botUsername, accountIdString).inc()
|
||||
override fun onUpdateReceived(update: Update?) {
|
||||
botUpdateCounter.labels(botUsername).inc()
|
||||
botUpdateGauge.labels(botUsername).inc()
|
||||
|
||||
val timer = updateProcessTime.labels(botUsername, accountIdString).startTimer()
|
||||
val timer = updateProcessTime.labels(botUsername).startTimer()
|
||||
try {
|
||||
super.consume(update)
|
||||
super.onUpdateReceived(update)
|
||||
} catch (e: Exception) {
|
||||
exceptionHandlingCounter.labels(botUsername, accountIdString).inc()
|
||||
exceptionHandlingCounter.labels(botUsername).inc()
|
||||
throw e
|
||||
} finally {
|
||||
timer.observeDuration()
|
||||
botUpdateGauge.labels(botUsername, accountIdString).dec()
|
||||
botUpdateGauge.labels(botUsername).dec()
|
||||
}
|
||||
}
|
||||
|
||||
@ -91,11 +90,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)"
|
||||
@ -111,10 +110,9 @@ internal class ScalaBot(
|
||||
return true
|
||||
}
|
||||
|
||||
val setMyCommands = SetMyCommands.builder()
|
||||
.commands(botCommands)
|
||||
.build()
|
||||
return telegramClient.execute(DeleteMyCommands()) && telegramClient.execute(setMyCommands)
|
||||
val setMyCommands = SetMyCommands()
|
||||
setMyCommands.commands = botCommands
|
||||
return execute(DeleteMyCommands()) && execute(setMyCommands)
|
||||
}
|
||||
|
||||
override fun onRegister() {
|
||||
@ -122,6 +120,10 @@ internal class ScalaBot(
|
||||
onlineBotGauge.inc()
|
||||
}
|
||||
|
||||
override fun onClosing() {
|
||||
onlineBotGauge.dec()
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic
|
||||
private val log = KotlinLogging.logger { }
|
||||
@ -132,8 +134,7 @@ internal class ScalaBot(
|
||||
private val botUpdateCounter = Counter.build()
|
||||
.name("updates_total")
|
||||
.help("Total number of updates received by all bots.")
|
||||
.labelNames("bot_name", "bot_id")
|
||||
.namespace(Const.METRICS_NAMESPACE)
|
||||
.labelNames("bot_name")
|
||||
.subsystem("telegrambots")
|
||||
.register()
|
||||
|
||||
@ -141,8 +142,7 @@ internal class ScalaBot(
|
||||
private val botUpdateGauge = Gauge.build()
|
||||
.name("updates_in_progress")
|
||||
.help("Number of updates in process by all bots.")
|
||||
.labelNames("bot_name", "bot_id")
|
||||
.namespace(Const.METRICS_NAMESPACE)
|
||||
.labelNames("bot_name")
|
||||
.subsystem("telegrambots")
|
||||
.register()
|
||||
|
||||
@ -150,7 +150,6 @@ internal class ScalaBot(
|
||||
private val onlineBotGauge = Gauge.build()
|
||||
.name("bots_online")
|
||||
.help("Number of bots Online.")
|
||||
.namespace(Const.METRICS_NAMESPACE)
|
||||
.subsystem("telegrambots")
|
||||
.register()
|
||||
|
||||
@ -162,8 +161,7 @@ internal class ScalaBot(
|
||||
"so it may be different from the actual execution time of ability. " +
|
||||
"It is not recommended to use it as the accurate execution time of ability)"
|
||||
)
|
||||
.labelNames("bot_name", "bot_id")
|
||||
.namespace(Const.METRICS_NAMESPACE)
|
||||
.labelNames("bot_name")
|
||||
.subsystem("telegrambots")
|
||||
.register()
|
||||
|
||||
@ -171,8 +169,7 @@ internal class ScalaBot(
|
||||
private val exceptionHandlingCounter = Counter.build()
|
||||
.name("updates_exception_handling")
|
||||
.help("Number of exceptions during processing.")
|
||||
.labelNames("bot_name", "bot_id")
|
||||
.namespace(Const.METRICS_NAMESPACE)
|
||||
.labelNames("bot_name")
|
||||
.subsystem("telegrambots")
|
||||
.register()
|
||||
}
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
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()
|
||||
}
|
||||
|
||||
}
|
||||
@ -74,7 +74,7 @@ fun <T : AutoCloseable> T.registerShutdownHook(): T {
|
||||
private object UtilsInternal {
|
||||
|
||||
val autoCloseableSet = mutableSetOf<AutoCloseable>()
|
||||
private val log = KotlinLogging.logger(UtilsInternal::class.java.name)
|
||||
private val log = KotlinLogging.logger { }
|
||||
|
||||
init {
|
||||
Runtime.getRuntime().addShutdownHook(Thread(this::doCloseResources, "Shutdown-AutoCloseable"))
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<included>
|
||||
<define name="DATA_LOGS" class="net.lamgc.scalabot.LogDirectorySupplier"/>
|
||||
<define name="LOG_LEVEL" class="net.lamgc.scalabot.LogLevelSupplier"/>
|
||||
<define name="NETWORK_LOG_LEVEL" class="net.lamgc.scalabot.NetworkVerboseLogSupplier"/>
|
||||
|
||||
<appender name="STD_OUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
@ -26,7 +24,7 @@
|
||||
<appender name="FILE_OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${DATA_LOGS}/latest.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>${DATA_LOGS}/%d{yyyy-MM-dd}.log.gz</fileNamePattern>
|
||||
<fileNamePattern>data/logs/%d{yyyy-MM-dd}.log.gz</fileNamePattern>
|
||||
<maxHistory>30</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
|
||||
16
scalabot-app/src/main/resources/logback-test.xml
Normal file
16
scalabot-app/src/main/resources/logback-test.xml
Normal file
@ -0,0 +1,16 @@
|
||||
<configuration scan="false" debug="false">
|
||||
<include resource="base-logback.xml"/>
|
||||
|
||||
<logger name="org.apache.http" level="INFO"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.DefaultTransporterProvider" level="INFO"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider" level="INFO"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManager" level="INFO"/>
|
||||
<logger name="org.telegram.telegrambots.facilities.proxysocketfactorys" level="INFO"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.DefaultUpdateCheckManager" level="INFO"/>
|
||||
|
||||
<root level="DEBUG">
|
||||
<appender-ref ref="FILE_OUT"/>
|
||||
<appender-ref ref="STD_ERR"/>
|
||||
<appender-ref ref="STD_OUT"/>
|
||||
</root>
|
||||
</configuration>
|
||||
@ -1,14 +1,7 @@
|
||||
<configuration scan="false" debug="false">
|
||||
<include resource="base-logback.xml"/>
|
||||
|
||||
<logger name="org.apache.http" level="${NETWORK_LOG_LEVEL}"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.DefaultTransporterProvider" level="${NETWORK_LOG_LEVEL}"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider" level="${NETWORK_LOG_LEVEL}"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManager" level="${NETWORK_LOG_LEVEL}"/>
|
||||
<logger name="org.telegram.telegrambots.facilities.proxysocketfactorys" level="${NETWORK_LOG_LEVEL}"/>
|
||||
<logger name="org.eclipse.aether.internal.impl.DefaultUpdateCheckManager" level="${NETWORK_LOG_LEVEL}"/>
|
||||
|
||||
<root level="${LOG_LEVEL}">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="FILE_OUT"/>
|
||||
<appender-ref ref="STD_ERR"/>
|
||||
<appender-ref ref="STD_OUT"/>
|
||||
|
||||
@ -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
|
||||
@ -21,17 +21,6 @@ import kotlin.test.*
|
||||
|
||||
internal class AppPathsTest {
|
||||
|
||||
@Test
|
||||
fun `Consistency check`() {
|
||||
for (path in AppPaths.entries) {
|
||||
assertEquals(
|
||||
File(path.path).canonicalPath,
|
||||
path.file.canonicalPath,
|
||||
"路径 File 与 Path 不一致: ${path.name}"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `Data root path priority`() {
|
||||
System.setProperty(AppPaths.PathConst.PROP_DATA_PATH, "fromSystemProperties")
|
||||
@ -226,17 +215,17 @@ internal class AppPathsTest {
|
||||
@Test
|
||||
fun `ProxyType_toTelegramBotsType test`() {
|
||||
val expectTypeMapping = mapOf(
|
||||
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
|
||||
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
|
||||
)
|
||||
|
||||
for (proxyType in ProxyType.entries) {
|
||||
for (proxyType in ProxyType.values()) {
|
||||
assertEquals(
|
||||
expectTypeMapping[proxyType],
|
||||
proxyType.toJavaProxyType(),
|
||||
proxyType.toTelegramBotsType(),
|
||||
"ProxyType 转换失败."
|
||||
)
|
||||
}
|
||||
@ -251,7 +240,7 @@ internal class AppPathsTest {
|
||||
ProxyType.HTTP,
|
||||
ProxyType.HTTPS
|
||||
)
|
||||
for (proxyType in ProxyType.entries) {
|
||||
for (proxyType in ProxyType.values()) {
|
||||
val proxyConfig = ProxyConfig(proxyType, host, port)
|
||||
val aetherProxy = proxyConfig.toAetherProxy()
|
||||
if (expectNotNullProxyType.contains(proxyType)) {
|
||||
@ -337,7 +326,7 @@ internal class AppPathsTest {
|
||||
|
||||
assertTrue(initialFiles(), "方法未能提醒用户编辑初始配置文件.")
|
||||
|
||||
for (path in AppPaths.entries) {
|
||||
for (path in AppPaths.values()) {
|
||||
assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}")
|
||||
if (path.file.isFile) {
|
||||
assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}")
|
||||
@ -347,7 +336,7 @@ internal class AppPathsTest {
|
||||
|
||||
assertFalse(initialFiles(), "方法试图在配置已初始化的情况下提醒用户编辑初始配置文件.")
|
||||
|
||||
for (path in AppPaths.entries) {
|
||||
for (path in AppPaths.values()) {
|
||||
assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}")
|
||||
if (path.file.isFile) {
|
||||
assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}")
|
||||
@ -358,7 +347,7 @@ internal class AppPathsTest {
|
||||
assertTrue(AppPaths.CONFIG_APPLICATION.file.delete(), "config.json 删除失败.")
|
||||
assertFalse(initialFiles(), "方法试图在部分配置已初始化的情况下提醒用户编辑初始配置文件.")
|
||||
|
||||
for (path in AppPaths.entries) {
|
||||
for (path in AppPaths.values()) {
|
||||
assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}")
|
||||
if (path.file.isFile) {
|
||||
assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}")
|
||||
@ -369,7 +358,7 @@ internal class AppPathsTest {
|
||||
assertTrue(AppPaths.CONFIG_BOT.file.delete(), "bot.json 删除失败.")
|
||||
assertFalse(initialFiles(), "方法试图在部分配置已初始化的情况下提醒用户编辑初始配置文件.")
|
||||
|
||||
for (path in AppPaths.entries) {
|
||||
for (path in AppPaths.values()) {
|
||||
assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}")
|
||||
if (path.file.isFile) {
|
||||
assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}")
|
||||
@ -384,7 +373,7 @@ internal class AppPathsTest {
|
||||
"在主要配置文件(config.json 和 bot.json)不存在的情况下初始化文件后, 方法未能提醒用户编辑初始配置文件."
|
||||
)
|
||||
|
||||
for (path in AppPaths.entries) {
|
||||
for (path in AppPaths.values()) {
|
||||
assertTrue(path.file.exists(), "文件未初始化成功: ${path.path}")
|
||||
if (path.file.isFile) {
|
||||
assertNotEquals(0, path.file.length(), "文件未初始化成功(大小为 0): ${path.path}")
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
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) }
|
||||
}
|
||||
|
||||
}
|
||||
@ -5,7 +5,7 @@ plugins {
|
||||
dependencies {
|
||||
compileOnly(project(":scalabot-extension"))
|
||||
|
||||
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
|
||||
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
|
||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package net.lamgc.scalabot.simple;
|
||||
|
||||
import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot;
|
||||
import org.telegram.telegrambots.abilitybots.api.objects.*;
|
||||
import org.telegram.telegrambots.abilitybots.api.util.AbilityExtension;
|
||||
import org.telegram.abilitybots.api.bot.BaseAbilityBot;
|
||||
import org.telegram.abilitybots.api.objects.*;
|
||||
import org.telegram.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().getSilent().send(msg, ctx.chatId());
|
||||
ctx.bot().silent().send(msg, ctx.chatId());
|
||||
})
|
||||
.build();
|
||||
}
|
||||
@ -36,13 +36,13 @@ public class SayHelloExtension implements AbilityExtension {
|
||||
* 更具特色的 `Say hello`.
|
||||
*/
|
||||
public Ability test() {
|
||||
ReplyFlow botHello = ReplyFlow.builder(bot.getDb())
|
||||
ReplyFlow botHello = ReplyFlow.builder(bot.db())
|
||||
.enableStats("say_hello")
|
||||
.action((bot, upd) -> bot.getSilent().send("What is u name?", upd.getMessage().getChatId()))
|
||||
.action((bot, upd) -> bot.silent().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.getSilent()
|
||||
.next(Reply.of((bot, upd) -> bot.silent()
|
||||
.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().getSilent().send("Hello!", ctx.chatId()))
|
||||
.action(ctx -> ctx.bot().silent().send("Hello!", ctx.chatId()))
|
||||
.reply(botHello)
|
||||
.build();
|
||||
}
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
package net.lamgc.scalabot.simple;
|
||||
|
||||
import net.lamgc.scalabot.extension.BotExtensionCreateOptions;
|
||||
import net.lamgc.scalabot.extension.BotExtensionFactory;
|
||||
import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot;
|
||||
import org.telegram.telegrambots.abilitybots.api.util.AbilityExtension;
|
||||
import org.telegram.abilitybots.api.bot.BaseAbilityBot;
|
||||
import org.telegram.abilitybots.api.util.AbilityExtension;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
public class SimpleExtensionFactory implements BotExtensionFactory {
|
||||
|
||||
@Override
|
||||
public AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder, BotExtensionCreateOptions options) {
|
||||
public AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder) {
|
||||
return new SayHelloExtension(bot);
|
||||
}
|
||||
|
||||
|
||||
@ -1,18 +1,16 @@
|
||||
plugins {
|
||||
`java-library`
|
||||
jacoco
|
||||
kotlin("jvm")
|
||||
java
|
||||
`maven-publish`
|
||||
signing
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("commons-codec:commons-codec:1.16.1")
|
||||
api("org.telegram:telegrambots-abilities:8.0.0")
|
||||
api(project(":scalabot-meta"))
|
||||
api("org.telegram:telegrambots-abilities:6.1.0")
|
||||
api("org.slf4j:slf4j-api:1.7.36")
|
||||
|
||||
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")
|
||||
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
|
||||
testImplementation("org.mockito:mockito-core:4.6.1")
|
||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
|
||||
}
|
||||
|
||||
@ -25,30 +23,29 @@ tasks.withType<Javadoc> {
|
||||
java {
|
||||
withJavadocJar()
|
||||
withSourcesJar()
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
tasks.test {
|
||||
useJUnitPlatform()
|
||||
finalizedBy(tasks.jacocoTestReport)
|
||||
}
|
||||
|
||||
tasks.jacocoTestReport {
|
||||
dependsOn(tasks.test)
|
||||
}
|
||||
|
||||
tasks.withType<AbstractArchiveTask>().configureEach {
|
||||
isPreserveFileTimestamps = false
|
||||
isReproducibleFileOrder = true
|
||||
}
|
||||
|
||||
publishing {
|
||||
repositories {
|
||||
maven("https://git.lamgc.me/api/packages/LamGC/maven") {
|
||||
if (project.version.toString().endsWith("-SNAPSHOT")) {
|
||||
maven("https://nexus.kuku.me/repository/maven-snapshots/") {
|
||||
credentials {
|
||||
username = project.properties["repo.credentials.self-git.username"].toString()
|
||||
password = project.properties["repo.credentials.self-git.password"].toString()
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -1,8 +1,7 @@
|
||||
package net.lamgc.scalabot.extension;
|
||||
|
||||
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 org.telegram.abilitybots.api.bot.BaseAbilityBot;
|
||||
import org.telegram.abilitybots.api.util.AbilityExtension;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@ -10,7 +9,7 @@ import java.io.File;
|
||||
* 该接口用于为指定的 {@link BaseAbilityBot} 创建扩展.
|
||||
*
|
||||
* <p> 由于 AbilityExtension 无法直接获取 {@link BaseAbilityBot} 的
|
||||
* 数据库对象 {@link DBContext},
|
||||
* 数据库对象 {@link org.telegram.abilitybots.api.db.DBContext},
|
||||
* 所以将通过该接口工厂来创建扩展对象.
|
||||
*
|
||||
* @author LamGC
|
||||
@ -21,7 +20,7 @@ public interface BotExtensionFactory {
|
||||
/**
|
||||
* 为给定的 {@link BaseAbilityBot} 对象创建扩展.
|
||||
*
|
||||
* <p> 如扩展无使用 {@link DBContext} 的话,
|
||||
* <p> 如扩展无使用 {@link org.telegram.abilitybots.api.db.DBContext} 的话,
|
||||
* 也可以返回扩展单例, 因为 AbilityBot 本身并不禁止多个机器人共用一个扩展对象
|
||||
* (AbilityBot 只是调用了扩展中的方法来创建 Ability 对象).
|
||||
*
|
||||
@ -31,10 +30,8 @@ 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, BotExtensionCreateOptions options);
|
||||
AbilityExtension createExtensionInstance(BaseAbilityBot bot, File shareDataFolder);
|
||||
|
||||
}
|
||||
|
||||
@ -1,17 +1,38 @@
|
||||
package net.lamgc.scalabot.extension.util;
|
||||
|
||||
import org.telegram.telegrambots.abilitybots.api.bot.BaseAbilityBot;
|
||||
import org.telegram.abilitybots.api.bot.BaseAbilityBot;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* 一些开发扩展中可以用到的工具类.
|
||||
*/
|
||||
public final class AbilityBots {
|
||||
public class AbilityBots {
|
||||
|
||||
private final static Pattern botTokenPattern = Pattern.compile("([1-9]\\d+):([A-Za-z\\d_-]{35,})");
|
||||
|
||||
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));
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消某一对话的状态机.
|
||||
*
|
||||
@ -20,7 +41,7 @@ public final class AbilityBots {
|
||||
* @return 如果状态机存在, 则删除后返回 true, 不存在(未开启任何状态机, 即没有触发任何 Reply)则返回 false.
|
||||
*/
|
||||
public static boolean cancelReplyState(BaseAbilityBot bot, long chatId) {
|
||||
Map<Long, Integer> stateMap = bot.getDb().getMap("user_state_replies");
|
||||
Map<Long, Integer> stateMap = bot.db().getMap("user_state_replies");
|
||||
if (!stateMap.containsKey(chatId)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -2,35 +2,22 @@ package net.lamgc.scalabot.extension.util;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mapdb.DBMaker;
|
||||
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.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.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.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
public class AbilityBotsTest {
|
||||
|
||||
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();
|
||||
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);
|
||||
|
||||
static Update mockFullUpdate(BaseAbilityBot bot, User user, String args) {
|
||||
bot.users().put(USER.getId(), USER);
|
||||
@ -52,51 +39,58 @@ 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 = 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();
|
||||
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);
|
||||
SilentSender silent = mock(SilentSender.class);
|
||||
BaseAbilityBot bot = new TestingAbilityBot("", silent);
|
||||
BaseAbilityBot bot = new TestingAbilityBot("", "", silent);
|
||||
bot.onRegister();
|
||||
bot.consume(mockFullUpdate(bot, userA, "/set_reply"));
|
||||
bot.onUpdateReceived(mockFullUpdate(bot, userA, "/set_reply"));
|
||||
verify(silent, times(1)).send("Reply set!", userA.getId());
|
||||
bot.consume(mockFullUpdate(bot, userA, "reply_01"));
|
||||
bot.onUpdateReceived(mockFullUpdate(bot, userA, "reply_01"));
|
||||
verify(silent, times(1)).send("Reply 01", userA.getId());
|
||||
assertTrue(AbilityBots.cancelReplyState(bot, userA.getId()));
|
||||
bot.consume(mockFullUpdate(bot, userA, "reply_02"));
|
||||
bot.onUpdateReceived(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.consume(mockFullUpdate(bot, userA, "/set_reply"));
|
||||
bot.onUpdateReceived(mockFullUpdate(bot, userA, "/set_reply"));
|
||||
verify(silent, times(1)).send("Reply set!", userA.getId());
|
||||
bot.consume(mockFullUpdate(bot, userA, "reply_01"));
|
||||
bot.onUpdateReceived(mockFullUpdate(bot, userA, "reply_01"));
|
||||
verify(silent, times(1)).send("Reply 01", userA.getId());
|
||||
bot.consume(mockFullUpdate(bot, userA, "reply_02"));
|
||||
bot.onUpdateReceived(mockFullUpdate(bot, userA, "reply_02"));
|
||||
verify(silent, times(1)).send("Reply 02", userA.getId());
|
||||
}
|
||||
|
||||
public static class TestingAbilityBot extends AbilityBot {
|
||||
|
||||
public TestingAbilityBot(String botUsername, SilentSender silentSender) {
|
||||
super(new NoOpTelegramClient(), botUsername, new MapDBContext(DBMaker.heapDB().make()));
|
||||
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()));
|
||||
this.silent = silentSender;
|
||||
}
|
||||
|
||||
@ -107,12 +101,12 @@ public class AbilityBotsTest {
|
||||
.enableStats()
|
||||
.locality(Locality.ALL)
|
||||
.privacy(Privacy.PUBLIC)
|
||||
.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()))
|
||||
.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()))
|
||||
.onlyIf(upd -> upd.hasMessage() && upd.getMessage().getText().equals("reply_01"))
|
||||
.next(Reply.of((bot, upd) ->
|
||||
bot.getSilent().send("Reply 02", upd.getMessage().getChatId()),
|
||||
bot.silent().send("Reply 02", upd.getMessage().getChatId()),
|
||||
upd -> upd.hasMessage() && upd.getMessage().getText().equals("reply_02")))
|
||||
.build()
|
||||
)
|
||||
|
||||
@ -1,229 +0,0 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -1,201 +0,0 @@
|
||||
public final class net/lamgc/scalabot/config/AppConfig {
|
||||
public fun <init> ()V
|
||||
public fun <init> (Lnet/lamgc/scalabot/config/ProxyConfig;Lnet/lamgc/scalabot/config/MetricsConfig;Ljava/util/List;Ljava/lang/String;)V
|
||||
public synthetic fun <init> (Lnet/lamgc/scalabot/config/ProxyConfig;Lnet/lamgc/scalabot/config/MetricsConfig;Ljava/util/List;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
|
||||
public final fun component1 ()Lnet/lamgc/scalabot/config/ProxyConfig;
|
||||
public final fun component2 ()Lnet/lamgc/scalabot/config/MetricsConfig;
|
||||
public final fun component3 ()Ljava/util/List;
|
||||
public final fun component4 ()Ljava/lang/String;
|
||||
public final fun copy (Lnet/lamgc/scalabot/config/ProxyConfig;Lnet/lamgc/scalabot/config/MetricsConfig;Ljava/util/List;Ljava/lang/String;)Lnet/lamgc/scalabot/config/AppConfig;
|
||||
public static synthetic fun copy$default (Lnet/lamgc/scalabot/config/AppConfig;Lnet/lamgc/scalabot/config/ProxyConfig;Lnet/lamgc/scalabot/config/MetricsConfig;Ljava/util/List;Ljava/lang/String;ILjava/lang/Object;)Lnet/lamgc/scalabot/config/AppConfig;
|
||||
public fun equals (Ljava/lang/Object;)Z
|
||||
public final fun getMavenLocalRepository ()Ljava/lang/String;
|
||||
public final fun getMavenRepositories ()Ljava/util/List;
|
||||
public final fun getMetrics ()Lnet/lamgc/scalabot/config/MetricsConfig;
|
||||
public final fun getProxy ()Lnet/lamgc/scalabot/config/ProxyConfig;
|
||||
public fun hashCode ()I
|
||||
public fun toString ()Ljava/lang/String;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/BotAccount {
|
||||
public fun <init> (Ljava/lang/String;Ljava/lang/String;J)V
|
||||
public final fun component1 ()Ljava/lang/String;
|
||||
public final fun component2 ()Ljava/lang/String;
|
||||
public final fun component3 ()J
|
||||
public final fun copy (Ljava/lang/String;Ljava/lang/String;J)Lnet/lamgc/scalabot/config/BotAccount;
|
||||
public static synthetic fun copy$default (Lnet/lamgc/scalabot/config/BotAccount;Ljava/lang/String;Ljava/lang/String;JILjava/lang/Object;)Lnet/lamgc/scalabot/config/BotAccount;
|
||||
public fun equals (Ljava/lang/Object;)Z
|
||||
public final fun getCreatorId ()J
|
||||
public final fun getId ()J
|
||||
public final fun getName ()Ljava/lang/String;
|
||||
public final fun getToken ()Ljava/lang/String;
|
||||
public fun hashCode ()I
|
||||
public fun toString ()Ljava/lang/String;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/BotConfig {
|
||||
public fun <init> (ZLnet/lamgc/scalabot/config/BotAccount;ZZLjava/util/Set;Lnet/lamgc/scalabot/config/ProxyConfig;Ljava/lang/String;)V
|
||||
public synthetic fun <init> (ZLnet/lamgc/scalabot/config/BotAccount;ZZLjava/util/Set;Lnet/lamgc/scalabot/config/ProxyConfig;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
|
||||
public final fun component1 ()Z
|
||||
public final fun component2 ()Lnet/lamgc/scalabot/config/BotAccount;
|
||||
public final fun component3 ()Z
|
||||
public final fun component4 ()Z
|
||||
public final fun component5 ()Ljava/util/Set;
|
||||
public final fun component6 ()Lnet/lamgc/scalabot/config/ProxyConfig;
|
||||
public final fun component7 ()Ljava/lang/String;
|
||||
public final fun copy (ZLnet/lamgc/scalabot/config/BotAccount;ZZLjava/util/Set;Lnet/lamgc/scalabot/config/ProxyConfig;Ljava/lang/String;)Lnet/lamgc/scalabot/config/BotConfig;
|
||||
public static synthetic fun copy$default (Lnet/lamgc/scalabot/config/BotConfig;ZLnet/lamgc/scalabot/config/BotAccount;ZZLjava/util/Set;Lnet/lamgc/scalabot/config/ProxyConfig;Ljava/lang/String;ILjava/lang/Object;)Lnet/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
|
||||
public final fun getExtensions ()Ljava/util/Set;
|
||||
public final fun getProxy ()Lnet/lamgc/scalabot/config/ProxyConfig;
|
||||
public fun hashCode ()I
|
||||
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
|
||||
public final fun component1 ()Ljava/lang/String;
|
||||
public final fun component2 ()Ljava/net/URL;
|
||||
public final fun component3 ()Lorg/eclipse/aether/repository/Proxy;
|
||||
public final fun component4 ()Ljava/lang/String;
|
||||
public final fun component5 ()Z
|
||||
public final fun component6 ()Z
|
||||
public final fun component7 ()Lorg/eclipse/aether/repository/Authentication;
|
||||
public final fun copy (Ljava/lang/String;Ljava/net/URL;Lorg/eclipse/aether/repository/Proxy;Ljava/lang/String;ZZLorg/eclipse/aether/repository/Authentication;)Lnet/lamgc/scalabot/config/MavenRepositoryConfig;
|
||||
public static synthetic fun copy$default (Lnet/lamgc/scalabot/config/MavenRepositoryConfig;Ljava/lang/String;Ljava/net/URL;Lorg/eclipse/aether/repository/Proxy;Ljava/lang/String;ZZLorg/eclipse/aether/repository/Authentication;ILjava/lang/Object;)Lnet/lamgc/scalabot/config/MavenRepositoryConfig;
|
||||
public fun equals (Ljava/lang/Object;)Z
|
||||
public final fun getAuthentication ()Lorg/eclipse/aether/repository/Authentication;
|
||||
public final fun getEnableReleases ()Z
|
||||
public final fun getEnableSnapshots ()Z
|
||||
public final fun getId ()Ljava/lang/String;
|
||||
public final fun getLayout ()Ljava/lang/String;
|
||||
public final fun getProxy ()Lorg/eclipse/aether/repository/Proxy;
|
||||
public final fun getUrl ()Ljava/net/URL;
|
||||
public fun hashCode ()I
|
||||
public fun toString ()Ljava/lang/String;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/MetricsConfig {
|
||||
public fun <init> ()V
|
||||
public fun <init> (ZILjava/lang/String;Lnet/lamgc/scalabot/config/UsernameAuthenticator;)V
|
||||
public synthetic fun <init> (ZILjava/lang/String;Lnet/lamgc/scalabot/config/UsernameAuthenticator;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
|
||||
public final fun component1 ()Z
|
||||
public final fun component2 ()I
|
||||
public final fun component3 ()Ljava/lang/String;
|
||||
public final fun component4 ()Lnet/lamgc/scalabot/config/UsernameAuthenticator;
|
||||
public final fun copy (ZILjava/lang/String;Lnet/lamgc/scalabot/config/UsernameAuthenticator;)Lnet/lamgc/scalabot/config/MetricsConfig;
|
||||
public static synthetic fun copy$default (Lnet/lamgc/scalabot/config/MetricsConfig;ZILjava/lang/String;Lnet/lamgc/scalabot/config/UsernameAuthenticator;ILjava/lang/Object;)Lnet/lamgc/scalabot/config/MetricsConfig;
|
||||
public fun equals (Ljava/lang/Object;)Z
|
||||
public final fun getAuthenticator ()Lnet/lamgc/scalabot/config/UsernameAuthenticator;
|
||||
public final fun getBindAddress ()Ljava/lang/String;
|
||||
public final fun getEnable ()Z
|
||||
public final fun getPort ()I
|
||||
public fun hashCode ()I
|
||||
public fun toString ()Ljava/lang/String;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/ProxyConfig {
|
||||
public fun <init> ()V
|
||||
public fun <init> (Lnet/lamgc/scalabot/config/ProxyType;Ljava/lang/String;I)V
|
||||
public synthetic fun <init> (Lnet/lamgc/scalabot/config/ProxyType;Ljava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
|
||||
public final fun component1 ()Lnet/lamgc/scalabot/config/ProxyType;
|
||||
public final fun component2 ()Ljava/lang/String;
|
||||
public final fun component3 ()I
|
||||
public final fun copy (Lnet/lamgc/scalabot/config/ProxyType;Ljava/lang/String;I)Lnet/lamgc/scalabot/config/ProxyConfig;
|
||||
public static synthetic fun copy$default (Lnet/lamgc/scalabot/config/ProxyConfig;Lnet/lamgc/scalabot/config/ProxyType;Ljava/lang/String;IILjava/lang/Object;)Lnet/lamgc/scalabot/config/ProxyConfig;
|
||||
public fun equals (Ljava/lang/Object;)Z
|
||||
public final fun getHost ()Ljava/lang/String;
|
||||
public final fun getPort ()I
|
||||
public final fun getType ()Lnet/lamgc/scalabot/config/ProxyType;
|
||||
public fun hashCode ()I
|
||||
public fun toString ()Ljava/lang/String;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/ProxyType : java/lang/Enum {
|
||||
public static final field HTTP Lnet/lamgc/scalabot/config/ProxyType;
|
||||
public static final field HTTPS Lnet/lamgc/scalabot/config/ProxyType;
|
||||
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;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/UsernameAuthenticator : com/sun/net/httpserver/BasicAuthenticator {
|
||||
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
|
||||
public fun checkCredentials (Ljava/lang/String;Ljava/lang/String;)Z
|
||||
public fun equals (Ljava/lang/Object;)Z
|
||||
public fun hashCode ()I
|
||||
public final fun toJsonObject ()Lcom/google/gson/JsonObject;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/ArtifactSerializer : com/google/gson/JsonDeserializer, com/google/gson/JsonSerializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/ArtifactSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lorg/eclipse/aether/artifact/Artifact;
|
||||
public synthetic fun serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
public fun serialize (Lorg/eclipse/aether/artifact/Artifact;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/AuthenticationSerializer : com/google/gson/JsonDeserializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/AuthenticationSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lorg/eclipse/aether/repository/Authentication;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/BotAccountSerializer : com/google/gson/JsonDeserializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/BotAccountSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/lamgc/scalabot/config/BotAccount;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/BotConfigSerializer : com/google/gson/JsonDeserializer, com/google/gson/JsonSerializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/BotConfigSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/lamgc/scalabot/config/BotConfig;
|
||||
public synthetic fun serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
public fun serialize (Lnet/lamgc/scalabot/config/BotConfig;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/MavenRepositoryConfigSerializer : com/google/gson/JsonDeserializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/MavenRepositoryConfigSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/lamgc/scalabot/config/MavenRepositoryConfig;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/ProxyConfigSerializer : com/google/gson/JsonDeserializer, com/google/gson/JsonSerializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/ProxyConfigSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/lamgc/scalabot/config/ProxyConfig;
|
||||
public synthetic fun serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
public fun serialize (Lnet/lamgc/scalabot/config/ProxyConfig;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/ProxyTypeSerializer : com/google/gson/JsonDeserializer, com/google/gson/JsonSerializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/ProxyTypeSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/lamgc/scalabot/config/ProxyType;
|
||||
public synthetic fun serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
public fun serialize (Lnet/lamgc/scalabot/config/ProxyType;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
}
|
||||
|
||||
public final class net/lamgc/scalabot/config/serializer/UsernameAuthenticatorSerializer : com/google/gson/JsonDeserializer, com/google/gson/JsonSerializer {
|
||||
public static final field INSTANCE Lnet/lamgc/scalabot/config/serializer/UsernameAuthenticatorSerializer;
|
||||
public synthetic fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
|
||||
public fun deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/lamgc/scalabot/config/UsernameAuthenticator;
|
||||
public synthetic fun serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
public fun serialize (Lnet/lamgc/scalabot/config/UsernameAuthenticator;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
|
||||
}
|
||||
|
||||
@ -1,12 +1,9 @@
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
|
||||
plugins {
|
||||
kotlin("jvm")
|
||||
id("org.jetbrains.kotlinx.kover")
|
||||
id("org.jetbrains.dokka") version "1.9.20"
|
||||
id("org.jetbrains.dokka") version "1.7.0"
|
||||
`maven-publish`
|
||||
signing
|
||||
id("org.jetbrains.kotlinx.binary-compatibility-validator")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@ -14,34 +11,29 @@ dependencies {
|
||||
api("org.eclipse.aether:aether-api:$aetherVersion")
|
||||
implementation("org.eclipse.aether:aether-util:$aetherVersion")
|
||||
|
||||
implementation("org.telegram:telegrambots-meta:8.0.0")
|
||||
implementation("org.telegram:telegrambots-meta:6.1.0")
|
||||
|
||||
api("com.google.code.gson:gson:2.11.0")
|
||||
api("com.google.code.gson:gson:2.9.0")
|
||||
|
||||
testImplementation(kotlin("test"))
|
||||
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")
|
||||
testImplementation("io.mockk:mockk:1.12.4")
|
||||
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
|
||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
||||
|
||||
dokkaHtmlPlugin("org.jetbrains.dokka:javadoc-plugin:2.0.0")
|
||||
dokkaHtmlPlugin("org.jetbrains.dokka:javadoc-plugin:1.7.0")
|
||||
}
|
||||
|
||||
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
|
||||
compilerOptions {
|
||||
jvmTarget = JvmTarget.JVM_17
|
||||
kotlinOptions {
|
||||
jvmTarget = "11"
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
withJavadocJar()
|
||||
withSourcesJar()
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
tasks.withType<AbstractArchiveTask>().configureEach {
|
||||
isPreserveFileTimestamps = false
|
||||
isReproducibleFileOrder = true
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
|
||||
tasks.getByName<Test>("test") {
|
||||
@ -54,10 +46,19 @@ val javadocJar = tasks.named<Jar>("javadocJar") {
|
||||
|
||||
publishing {
|
||||
repositories {
|
||||
maven("https://git.lamgc.me/api/packages/LamGC/maven") {
|
||||
if (project.version.toString().endsWith("-SNAPSHOT", ignoreCase = true)) {
|
||||
maven("https://nexus.kuku.me/repository/maven-snapshots/") {
|
||||
credentials {
|
||||
username = project.properties["repo.credentials.self-git.username"].toString()
|
||||
password = project.properties["repo.credentials.self-git.password"].toString()
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,8 +3,7 @@ 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.TelegramUrl
|
||||
import java.net.URI
|
||||
import org.telegram.telegrambots.meta.ApiConstants
|
||||
import java.net.URL
|
||||
|
||||
/**
|
||||
@ -27,22 +26,8 @@ data class BotAccount(
|
||||
get() = token.substringBefore(":").toLong()
|
||||
}
|
||||
|
||||
val defaultTelegramApiUrl: String = URL(
|
||||
TelegramUrl.DEFAULT_URL.schema,
|
||||
TelegramUrl.DEFAULT_URL.host,
|
||||
TelegramUrl.DEFAULT_URL.port,
|
||||
"/"
|
||||
).toExternalForm()
|
||||
|
||||
/**
|
||||
* 机器人配置.
|
||||
*
|
||||
* 使用 Gson 解析时, 请添加以下类型适配器:
|
||||
* - [net.lamgc.scalabot.config.serializer.ProxyTypeSerializer]
|
||||
* - [net.lamgc.scalabot.config.serializer.BotConfigSerializer]
|
||||
* - [net.lamgc.scalabot.config.serializer.BotAccountSerializer]
|
||||
* - [net.lamgc.scalabot.config.serializer.ArtifactSerializer]
|
||||
*
|
||||
* @property enabled 是否启用机器人.
|
||||
* @property account 机器人帐号信息, 用于访问 API.
|
||||
* @property disableBuiltInAbility 是否禁用 AbilityBot 自带命令.
|
||||
@ -64,22 +49,8 @@ data class BotConfig(
|
||||
*/
|
||||
val extensions: Set<Artifact> = emptySet(),
|
||||
val proxy: ProxyConfig = ProxyConfig(type = ProxyType.NO_PROXY),
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
val baseApiUrl: String = ApiConstants.BASE_URL
|
||||
)
|
||||
|
||||
/**
|
||||
* 代理类型.
|
||||
@ -155,13 +126,6 @@ data class MavenRepositoryConfig(
|
||||
* ScalaBot App 配置.
|
||||
*
|
||||
* App 配置信息与 BotConfig 分开, 分别存储在各自单独的文件中.
|
||||
*
|
||||
* 使用 Gson 解析时, 请添加以下类型适配器:
|
||||
* - [net.lamgc.scalabot.config.serializer.ProxyTypeSerializer]
|
||||
* - [net.lamgc.scalabot.config.serializer.MavenRepositoryConfigSerializer]
|
||||
* - [net.lamgc.scalabot.config.serializer.AuthenticationSerializer]
|
||||
* - [net.lamgc.scalabot.config.serializer.UsernameAuthenticatorSerializer]
|
||||
*
|
||||
* @property proxy Telegram API 代理配置.
|
||||
* @property metrics 运行指标数据配置. 可通过时序数据库记录运行数据.
|
||||
* @property mavenRepositories Maven 远端仓库配置.
|
||||
|
||||
@ -219,12 +219,6 @@ internal class ProxyConfigTest {
|
||||
assertEquals(8080, actualConfig.port)
|
||||
assertEquals(ProxyType.HTTP, actualConfig.type)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toString test`() {
|
||||
assertEquals("NO_PROXY", ProxyConfig(ProxyType.NO_PROXY).toString())
|
||||
assertEquals("HTTP://example.org:1008", ProxyConfig(ProxyType.HTTP, "example.org", 1008).toString())
|
||||
}
|
||||
}
|
||||
|
||||
internal class MetricsConfigTest {
|
||||
|
||||
@ -53,7 +53,7 @@ internal class ProxyTypeSerializerTest {
|
||||
|
||||
@Test
|
||||
fun `serialize test`() {
|
||||
for (type in ProxyType.entries) {
|
||||
for (type in ProxyType.values()) {
|
||||
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.entries) {
|
||||
for (type in ProxyType.values()) {
|
||||
assertEquals(
|
||||
type, ProxyTypeSerializer.deserialize(JsonPrimitive(type.name), null, null),
|
||||
"ProxyType 反序列化结果与预期不符."
|
||||
|
||||
Loading…
Reference in New Issue
Block a user