更新simbot到RC3, 更新部分插件版本, 清理部分代码或TODO

simple-robot · Jun 9, 2024 · bc73faf · bc73faf
1 parent cfc511f
commit bc73faf
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 16 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -50,7 +50,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info 
             --warning-mode all
             -x test
@@ -110,7 +110,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -x test

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -60,7 +60,7 @@ jobs:
           arguments: |
             test 
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 

diff --git a/.github/workflows/publish-v4-release.yml.bk b/.github/workflows/publish-v4-release.yml.bk
@@ -50,7 +50,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info 
             --warning-mode all
             -x test
@@ -108,7 +108,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -x test

diff --git a/.github/workflows/publish-v4-snapshot.yml.bk b/.github/workflows/publish-v4-snapshot.yml.bk
@@ -61,7 +61,7 @@ jobs:
           arguments: |
             test 
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 

diff --git a/.gitignore b/.gitignore
@@ -158,3 +158,5 @@ fabric.properties
 .idea/caches/build_file_checksums.ser
 
 generated-docs
+
+.kotlin
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     implementation(libs.bundles.dokka)
 
     // see https://github.com/gradle-nexus/publish-plugin
-    implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
+    implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
 
     // simbot suspend transform gradle common
     implementation(libs.simbot.gradle)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,9 +8,9 @@ ktor = "2.3.8"
 openjdk-jmh = "1.37"
 log4j = "2.23.1"
 # simbot
-simbot = "4.0.0-RC2"
+simbot = "4.0.0-RC3"
 suspendTransform = "0.8.0-beta1"
-gradleCommon = "0.3.0"
+gradleCommon = "0.4.0"
 # ksp
 ksp = "2.0.0-1.0.22"
 # https://square.github.io/kotlinpoet/

diff --git a/...uild-core/src/commonMain/kotlin/love/forte/simbot/component/qguild/event/QGForumEvents.kt b/...uild-core/src/commonMain/kotlin/love/forte/simbot/component/qguild/event/QGForumEvents.kt
@@ -269,5 +269,3 @@ public abstract class QGForumPublishAuditResultEvent : QGForumEvent() {
     override fun toString(): String =
         "QGForumPublishAuditResultEvent(sourceEventEntity=$sourceEventEntity)"
 }
-
-// TODO Open forum event?
diff --git a/...ommonMain/kotlin/love/forte/simbot/component/qguild/internal/bot/QQGuildBotManagerImpl.kt b/...ommonMain/kotlin/love/forte/simbot/component/qguild/internal/bot/QQGuildBotManagerImpl.kt
@@ -19,6 +19,8 @@ package love.forte.simbot.component.qguild.internal.bot
 
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
 import love.forte.simbot.bot.ConflictBotException
 import love.forte.simbot.bot.JobBasedBotManager
 import love.forte.simbot.bot.NoSuchBotException
@@ -35,7 +37,9 @@ import love.forte.simbot.component.qguild.bot.QGBot
 import love.forte.simbot.component.qguild.bot.QQGuildBotManager
 import love.forte.simbot.component.qguild.bot.QQGuildBotManagerConfiguration
 import love.forte.simbot.component.qguild.bot.config.QGBotComponentConfiguration
+import love.forte.simbot.component.qguild.internal.event.QGBotRegisteredEventImpl
 import love.forte.simbot.event.EventDispatcher
+import love.forte.simbot.event.onEachError
 import love.forte.simbot.logger.Logger
 import love.forte.simbot.logger.LoggerFactory
 import love.forte.simbot.logger.logger
@@ -154,13 +158,20 @@ internal class QQGuildBotManagerImpl(
 
         bots.add(newBot)
 
-        onCompletion {
+        newBot.onCompletion {
             // remove self on completion
             bots.remove(newBot)
         }
 
-        // TODO
-//        eventProcessor.pushAndLaunch(newBot, QGBotRegisteredEventImpl(bot))
+        newBot.launch {
+            val event = QGBotRegisteredEventImpl(newBot)
+            eventDispatcher
+                .push(event)
+                .onEachError { e ->
+                    logger.error("Event {} process failed: {}", event, e, e.content)
+                }
+                .collect()
+        }
 
         return newBot
     }

diff --git a/...q-guild-core/src/commonMain/kotlin/love/forte/simbot/component/qguild/message/QGImages.kt b/...q-guild-core/src/commonMain/kotlin/love/forte/simbot/component/qguild/message/QGImages.kt
@@ -26,11 +26,11 @@ import love.forte.simbot.message.OfflineImage
  * @see Image
  * @suppress TODO
  */
-public class QGOfflineImage // TODO
+internal class QGOfflineImage // TODO
 
 /**
  * 收到的图片类型
  * @see OfflineImage
  * @suppress TODO
  */
-public class QGImage // TODO
+internal class QGImage // TODO
Original file line number	Diff line number	Diff line change
Expand Up		@@ -158,3 +158,5 @@ fabric.properties
		.idea/caches/build_file_checksums.ser

		generated-docs

		.kotlin