Skip to content

Commit f88e4bb

Browse files
committed
fix: correctly close stream
1 parent aca755e commit f88e4bb

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
}
1414

1515
group = "io.github.samarium150"
16-
version = "5.0.0-beta.4"
16+
version = "5.0.0-beta.5"
1717

1818
repositories {
1919
mavenLocal()
@@ -44,8 +44,8 @@ tasks.withType<DokkaTask>().configureEach {
4444
}
4545
jdkVersion.set(11)
4646
externalDocumentationLink {
47-
url.set(URL("https://kdoc.mirai.mamoe.net/2.9.0-RC"))
48-
packageListUrl.set(URL("https://kdoc.mirai.mamoe.net/2.9.0-RC/package-list"))
47+
url.set(URL("https://kdoc.mirai.mamoe.net/2.9.0-RC2"))
48+
packageListUrl.set(URL("https://kdoc.mirai.mamoe.net/2.9.0-RC2/package-list"))
4949
}
5050
}
5151
}

src/main/kotlin/io/github/samarium150/mirai/plugin/MiraiConsoleLolicon.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import java.net.Proxy
4747
object MiraiConsoleLolicon : KotlinPlugin(
4848
JvmPluginDescription(
4949
id = "io.github.samarium150.mirai.plugin.mirai-console-lolicon",
50-
version = "5.0.0-beta.4",
50+
version = "5.0.0-beta.5",
5151
name = "Lolicon"
5252
) {
5353
author("Samarium150")

src/main/kotlin/io/github/samarium150/mirai/plugin/command/Lolicon.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ import io.github.samarium150.mirai.plugin.config.ReplyConfig
2424
import io.github.samarium150.mirai.plugin.data.PluginData
2525
import io.github.samarium150.mirai.plugin.data.RequestBody
2626
import io.github.samarium150.mirai.plugin.util.CooldownUtil
27-
import io.github.samarium150.mirai.plugin.util.ThrottleUtil
2827
import io.github.samarium150.mirai.plugin.util.GeneralUtil
28+
import io.github.samarium150.mirai.plugin.util.ThrottleUtil
29+
import kotlinx.coroutines.Dispatchers
30+
import kotlinx.coroutines.withContext
2931
import kotlinx.serialization.ExperimentalSerializationApi
3032
import kotlinx.serialization.decodeFromString
3133
import kotlinx.serialization.json.Json
@@ -105,6 +107,7 @@ object Lolicon : CompositeCommand(
105107
val imageData = response.data[0]
106108
if (!GeneralUtil.areTagsAllowed(imageData.tags)) {
107109
sendMessage(ReplyConfig.filteredTag)
110+
ThrottleUtil.unlock(subject)
108111
return
109112
}
110113
val url = imageData.urls[PluginConfig.size]
@@ -133,8 +136,7 @@ object Lolicon : CompositeCommand(
133136
logger.error(e)
134137
sendMessage(ReplyConfig.networkError)
135138
} finally {
136-
@Suppress("BlockingMethodInNonBlockingContext")
137-
stream?.close()
139+
withContext(Dispatchers.IO) { stream?.close() }
138140
if (PluginConfig.verbose && imgInfoReceipt != null && recall > 0 && PluginConfig.recallImgInfo)
139141
GeneralUtil.recall(GeneralUtil.RecallType.IMAGE_INFO, imgInfoReceipt, recall)
140142
}
@@ -210,8 +212,7 @@ object Lolicon : CompositeCommand(
210212
logger.error(e)
211213
sendMessage(ReplyConfig.networkError)
212214
} finally {
213-
@Suppress("BlockingMethodInNonBlockingContext")
214-
stream?.close()
215+
withContext(Dispatchers.IO) { stream?.close() }
215216
}
216217
}
217218
val imgInfoReceipt =

0 commit comments

Comments
 (0)