Skip to content

Commit 67cd242

Browse files
committed
fix: correct the logic error in the command
1 parent 9c4fe79 commit 67cd242

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# mirai-console-lolicon
2+
23
[![GitHub top language](https://img.shields.io/github/languages/top/Samarium150/mirai-console-lolicon?style=flat)](https://kotlinlang.org/)
34
[![Gradle CI](https://github.com/Samarium150/mirai-console-lolicon/workflows/Gradle%20CI/badge.svg?branch=master)](https://github.com/Samarium150/mirai-console-lolicon/actions?query=workflow%3A%22Gradle+CI%22)
45
[![GitHub](https://img.shields.io/github/license/Samarium150/mirai-console-lolicon?style=flat)](https://github.com/Samarium150/mirai-console-lolicon/blob/master/LICENSE)
@@ -8,11 +9,12 @@
89

910
[ACGPro](https://github.com/ShrBox/ACGPro) 启发而写
1011

11-
Social preview的图片来自 [AliceSoft](https://www.alicesoft.com) 制作的游戏 [ドーナドーナ いっしょにわるいことをしよう](https://www.alicesoft.com/dohnadohna)
12+
Social preview的图片来自 [AliceSoft](https://www.alicesoft.com)
13+
制作的游戏 [ドーナドーナ いっしょにわるいことをしよう](https://www.alicesoft.com/dohnadohna)
1214

1315
在群内随机发送来自 [Lolicon API v2](https://api.lolicon.app/#/setu) 的图片(默认30s自动撤回+60s冷却),支持标签检索和JSON高级检索
1416

15-
适配 [mirai-console](https://github.com/mamoe/mirai-console) [![Version](https://img.shields.io/badge/version-2.10.2-blue)](https://github.com/mamoe/mirai/releases/tag/v2.10.2)
17+
适配 [mirai-console](https://github.com/mamoe/mirai-console) [![Version](https://img.shields.io/badge/version-2.12.1-blue)](https://github.com/mamoe/mirai/releases/tag/v2.12.1)
1618

1719
使用文档已经移到了 [Wiki](https://github.com/Samarium150/mirai-console-lolicon/wiki) 页面
1820

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
kotlin("jvm") version kotlinVersion
66
kotlin("plugin.serialization") version kotlinVersion
77

8-
id("net.mamoe.mirai-console") version "2.12.0"
8+
id("net.mamoe.mirai-console") version "2.12.1"
99
id("com.geoffgranum.gradle-conventional-changelog") version "+"
1010
}
1111

1212
group = "io.github.samarium150"
13-
version = "6.0.0"
13+
version = "6.0.1"
1414

1515
repositories {
1616
mavenCentral()

src/main/kotlin/MiraiConsoleLolicon.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import java.net.Proxy
3535
object MiraiConsoleLolicon : KotlinPlugin(
3636
JvmPluginDescription(
3737
id = "io.github.samarium150.mirai.plugin.mirai-console-lolicon",
38-
version = "6.0.0",
38+
version = "6.0.1",
3939
name = "Lolicon"
4040
) {
4141
author("Samarium150")

src/main/kotlin/command/Lolicon.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ object Lolicon : CompositeCommand(
182182
}
183183
}
184184
}
185+
185186
imageData.urls.size == 1 -> {
186187
runCatching {
187188
val stream = getImageInputStream(imageData.urls.values.first())
@@ -199,6 +200,7 @@ object Lolicon : CompositeCommand(
199200
}
200201
}
201202
}
203+
202204
else -> {
203205
continue
204206
}
@@ -241,6 +243,7 @@ object Lolicon : CompositeCommand(
241243
}
242244
}
243245
}
246+
244247
imageData.urls.size == 1 -> runCatching {
245248
val stream = getImageInputStream(imageData.urls.values.first())
246249
val image = subject?.uploadImage(stream)
@@ -260,6 +263,7 @@ object Lolicon : CompositeCommand(
260263
it.close()
261264
}
262265
}
266+
263267
else -> {
264268
continue
265269
}
@@ -287,7 +291,7 @@ object Lolicon : CompositeCommand(
287291
@SubCommand("set", "设置")
288292
@Description("设置属性, 详见帮助信息")
289293
suspend fun CommandSenderOnMessage<MessageEvent>.set(property: PluginData.Property, value: Int) {
290-
if (fromEvent !is GroupMessageEvent || fromEvent !is FriendMessageEvent)
294+
if (fromEvent !is GroupMessageEvent && fromEvent !is FriendMessageEvent)
291295
return
292296
if (fromEvent is GroupMessageEvent && !(fromEvent as GroupMessageEvent).sender.isOperator()) {
293297
sendMessage(ReplyConfig.nonAdminPermissionDenied)

0 commit comments

Comments
 (0)