Skip to content

Commit 5e9395d

Browse files
committed
Compatible: [Overflow](https://github.com/MrXiaoM/Overflow)
1 parent 8bbc02d commit 5e9395d

File tree

6 files changed

+28
-9
lines changed

6 files changed

+28
-9
lines changed

build.gradle.kts

+23-4
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,45 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
val kotlinVersion = "1.6.21"
4+
val kotlinVersion = "1.8.21"
55
kotlin("jvm") version kotlinVersion
66
kotlin("plugin.serialization") version kotlinVersion
77

8-
98
id("org.jetbrains.kotlin.plugin.noarg") version kotlinVersion
109
id("org.jetbrains.kotlin.plugin.allopen") version kotlinVersion
11-
id("net.mamoe.mirai-console") version "2.15.0-M1"
10+
id("net.mamoe.mirai-console") version "2.16.0"
1211
id("me.him188.maven-central-publish") version "1.0.0-dev-3"
1312
}
1413

1514
group = "com.hcyacg"
16-
version = "1.7.6"
15+
version = "1.7.7"
1716

1817
repositories {
18+
// maven("https://maven.aliyun.com/repository/public")
1919
// mavenLocal()
2020
// maven("https://maven.aliyun.com/repository/gradle-plugin")
2121
// maven("https://maven.aliyun.com/repository/central")
22+
maven("https://s01.oss.sonatype.org/content/repositories/snapshots")
2223
mavenCentral()
24+
// maven("https://s01.oss.sonatype.org/content/repositories/snapshots")
25+
}
26+
27+
mirai {
28+
noTestCore = true
29+
setupConsoleTestRuntime {
30+
// 移除 mirai-core 依赖
31+
classpath = classpath.filter {
32+
!it.nameWithoutExtension.startsWith("mirai-core-jvm")
33+
}
34+
}
2335
}
36+
2437
dependencies {
38+
val overflowVersion = "2.16.0-febc5da-SNAPSHOT"
39+
// compileOnly("top.mrxiaom:overflow-core-api:$overflowVersion")
40+
// testConsoleRuntime("top.mrxiaom:overflow-core:$overflowVersion")
41+
testConsoleRuntime("top.mrxiaom:overflow-core:$overflowVersion")
42+
2543
implementation("org.apache.commons:commons-lang3:3.12.0")
2644
implementation("commons-codec:commons-codec:1.15")
2745
implementation("org.apache.httpcomponents:httpclient:4.5.13")
@@ -31,6 +49,7 @@ dependencies {
3149
compileOnly("org.bytedeco:javacv-platform:1.5.7")
3250
// compileOnly
3351
implementation(kotlin("stdlib-jdk8"))
52+
3453
}
3554

3655
noArg {
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/kotlin/com/hcyacg/Nsfw.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ object Nsfw {
9090

9191
suspend fun load(event: GroupMessageEvent) {
9292
println("检测中")
93-
val picUri = DataUtil.getSubString(event.message.toString().replace(" ", ""), "[mirai:image:{", "}.")!!
93+
val picUri = DataUtil.getSubString(event.message.toString().replace(" ", ""), "[overflow:image:{", "}.")!!
9494
.replace("-", "")
9595
val url = "https://gchat.qpic.cn/gchatpic_new/0/0-0-${picUri}/0?"
9696

src/main/kotlin/com/hcyacg/Pixiv.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ object Pixiv : KotlinPlugin(
153153

154154
val lowPoly = Pattern.compile("(?i)^(${Command.lowPoly}).+\$")
155155
content { lowPoly.matcher(message.contentToString()).find() && !Setting.black.contains(group.id.toString())} quoteReply {
156-
val picUri = DataUtil.getSubString(this.message.toString().replace(" ", ""), "[mirai:image:{", "}.")!!
156+
val picUri = DataUtil.getSubString(this.message.toString().replace(" ", ""), "[overflow:image:{", "}.")!!
157157
.replace("-", "")
158158
val url = "https://gchat.qpic.cn/gchatpic_new/0/0-0-${picUri}/0?"
159159
val byte = ImageUtil.getImage(url, CacheUtil.Type.NONSUPPORT).toByteArray()

src/main/kotlin/com/hcyacg/science/Style2paints.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ object Style2paints {
2626
/**
2727
* 获取图片的代码
2828
*/
29-
val picUri = DataUtil.getSubString(event.message.toString().replace(" ", ""), "[mirai:image:{", "}.")!!
29+
val picUri = DataUtil.getSubString(event.message.toString().replace(" ", ""), "[overflow:image:{", "}.")!!
3030
.replace("-", "")
3131
val url = "https://gchat.qpic.cn/gchatpic_new/0/0-0-${picUri}/0?"
3232

src/main/kotlin/com/hcyacg/search/SearchPicCenter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object SearchPicCenter {
1919
/**
2020
* 获取图片的代码
2121
*/
22-
val picUri = DataUtil.getSubString(event.message.toString().replace(" ", ""), "[mirai:image:{", "}.")!!
22+
val picUri = DataUtil.getSubString(event.message.toString().replace(" ", ""), "[overflow:image:{", "}.")!!
2323
.replace("-", "")
2424

2525
if (Config.enable.search.ascii2d) {

0 commit comments

Comments
 (0)