build: 1.4.7

cssxsh · Feb 19, 2022 · ab0bcf6 · ab0bcf6
1 parent 042780d
commit ab0bcf6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "xyz.cssxsh"
-version = "1.4.6"
+version = "1.4.7"
 
 repositories {
     mavenLocal()

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/plugin/BiliHelperPlugin.kt b/src/main/kotlin/xyz/cssxsh/mirai/plugin/BiliHelperPlugin.kt
@@ -1,6 +1,7 @@
 package xyz.cssxsh.mirai.plugin
 
 import kotlinx.coroutines.*
+import net.mamoe.mirai.*
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.unregister
 import net.mamoe.mirai.console.plugin.jvm.*
@@ -12,7 +13,7 @@ import xyz.cssxsh.mirai.plugin.command.*
 import xyz.cssxsh.mirai.plugin.data.*
 
 object BiliHelperPlugin : KotlinPlugin(
-    JvmPluginDescription(id = "xyz.cssxsh.mirai.plugin.bilibili-helper", version = "1.4.6") {
+    JvmPluginDescription(id = "xyz.cssxsh.mirai.plugin.bilibili-helper", version = "1.4.7") {
         name("bilibili-helper")
         author("cssxsh")
 
@@ -37,6 +38,7 @@ object BiliHelperPlugin : KotlinPlugin(
         }
 
         logger.info { "如果要B站动态的截图内容，请修改 DynamicInfo.template, 添加 #screenshot" }
+        logger.info { "如果要B站专栏的截图内容，请修改 Article.template, 添加 #screenshot" }
 
         if (SetupSelenium) {
             launch(SupervisorJob()) {
@@ -47,14 +49,22 @@ object BiliHelperPlugin : KotlinPlugin(
 
         BiliListener.registerTo(globalEventChannel())
 
-        globalEventChannel().subscribeOnce<BotOnlineEvent> {
+        waitOnline {
             for (task in BiliTasker) {
                 task.start()
             }
             BiliCleaner.start()
         }
     }
 
+    private fun waitOnline(block: () -> Unit) {
+        if (Bot.instances.isEmpty()) {
+            globalEventChannel().subscribeOnce<BotOnlineEvent> { block() }
+        } else {
+            block()
+        }
+    }
+
     override fun onDisable() {
         for (command in BiliHelperCommand) {
             command.unregister()