fix(plugins/moliplugin/): 支持茉莉API回复图片

yiyungent · Jan 29, 2023 · 0617972 · 0617972
1 parent f6d9fc8
commit 0617972
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/plugins/MoLiPlugin/MoLiPlugin.cs b/plugins/MoLiPlugin/MoLiPlugin.cs
@@ -11,6 +11,7 @@
 using Konata.Core.Message;
 using Konata.Core.Message.Model;
 using System.Text;
+using System.Collections.Generic;
 
 namespace MoLiPlugin
 {
@@ -29,7 +30,7 @@ public override (bool IsSuccess, string Message) BeforeDisable()
         }
 
         #region QQBot
-        public void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, string groupName, uint groupUin, uint memberUin)
+        public async void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, string groupName, uint groupUin, uint memberUin)
         {
             SettingsModel settingsModel = PluginCore.PluginSettingsModelFactory.Create<SettingsModel>(nameof(MoLiPlugin));
 
@@ -77,16 +78,26 @@ public void OnGroupMessage((Bot s, GroupMessageEvent e) obj, string message, str
                 {
                     if (resModel.data != null && resModel.data.Count >= 1)
                     {
+                        List<BaseChain> baseChains = new List<BaseChain>();
                         foreach (var item in resModel.data)
                         {
-                            obj.s.SendGroupMessage(groupUin: groupUin, message: item.content);
+                            if (item.typed == "1") {
+                                baseChains.Add(TextChain.Create(item.content));
+                            } else if (item.typed == "2") {
+                                string imageUrl = "https://files.molicloud.com/" + item.content;
+                                baseChains.Add(ImageChain.CreateFromUrl(url: imageUrl));
+                            } else {
+                                baseChains.Add(TextChain.Create(item.content));
+                            }
+                            baseChains.Add(TextChain.Create("\r\n"));
                         }
+                        await obj.s.SendGroupMessage(groupUin: groupUin, chains: baseChains.ToArray());
                     }
                 }
             }
         }
 
-        public void OnFriendMessage((Bot s, FriendMessageEvent e) obj, string message, uint friendUin)
+        public async void OnFriendMessage((Bot s, FriendMessageEvent e) obj, string message, uint friendUin)
         {
             SettingsModel settingsModel = PluginCore.PluginSettingsModelFactory.Create<SettingsModel>(nameof(MoLiPlugin));
 
@@ -133,10 +144,20 @@ public void OnFriendMessage((Bot s, FriendMessageEvent e) obj, string message, u
                 {
                     if (resModel.data != null && resModel.data.Count >= 1)
                     {
+                        List<BaseChain> baseChains = new List<BaseChain>();
                         foreach (var item in resModel.data)
                         {
-                            obj.s.SendFriendMessage(friendUin: friendUin, message: item.content);
+                            if (item.typed == "1") {
+                                baseChains.Add(TextChain.Create(item.content));
+                            } else if (item.typed == "2") {
+                                string imageUrl = "https://files.molicloud.com/" + item.content;
+                                baseChains.Add(ImageChain.CreateFromUrl(url: imageUrl));
+                            } else {
+                                baseChains.Add(TextChain.Create(item.content));
+                            }
+                            baseChains.Add(TextChain.Create("\r\n"));
                         }
+                        await obj.s.SendFriendMessage(friendUin: friendUin, chains: baseChains.ToArray());
                     }
                 }
             }

diff --git a/plugins/MoLiPlugin/info.json b/plugins/MoLiPlugin/info.json
@@ -3,6 +3,6 @@
 	"DisplayName": "茉莉机器人",
 	"Description": "对接 茉莉 API",
 	"Author": "yiyun",
-	"Version": "1.0.2",
+	"Version": "1.0.3",
 	"SupportedVersions": [ "0.0.1" ]
 }