Merge pull request #8 from Threkork/nightly

Nightly to main
Threkork · Oct 2, 2024 · 676691e · 676691e
2 parents f7a1865 + 480bf90
commit 676691e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kovi"
-version = "0.8.0-rc2"
+version = "0.8.0"
 edition = "2021"
 description = "A OneBot V11 bot plugin framework"
 license = "MPL-2.0"

diff --git a/src/bot/message.rs b/src/bot/message.rs
@@ -88,6 +88,17 @@ impl From<String> for Message {
     }
 }
 
+impl From<&String> for Message {
+    fn from(v: &String) -> Self {
+        Message(vec![Segment {
+            type_: "text".to_string(),
+            data: json!({
+                "text":v,
+            }),
+        }])
+    }
+}
+
 #[cfg(feature = "cqstring")]
 impl From<CQMessage> for Message {
     fn from(v: CQMessage) -> Self {

diff --git a/src/bot/run.rs b/src/bot/run.rs
@@ -124,9 +124,7 @@ impl Bot {
                 let plugin_builder = PluginBuilder::new(name.clone(), bot.clone(), api_tx.clone());
 
                 // 异步运行 main()
-                PLUGIN_BUILDER.scope(plugin_builder, async move {
-                    (plugins.main)().await;
-                })
+                PLUGIN_BUILDER.scope(plugin_builder, (plugins.main)())
             });
         }
     }