up

Coloryr · May 16, 2024 · 94c8f45 · 94c8f45
1 parent 0609475
commit 94c8f45
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/Minecraft_QQ_Cmd/Properties/PublishProfiles/linux-x64.pubxml b/Minecraft_QQ_Cmd/Properties/PublishProfiles/linux-x64.pubxml
@@ -10,9 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net8.0</TargetFramework>
     <SelfContained>true</SelfContained>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>false</PublishReadyToRun>
     <PublishTrimmed>false</PublishTrimmed>
     <TrimMode>partial</TrimMode>
     <PublishTrimmed>true</PublishTrimmed>

diff --git a/Minecraft_QQ_Cmd/Properties/PublishProfiles/linux-x64.pubxml.user b/Minecraft_QQ_Cmd/Properties/PublishProfiles/linux-x64.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-05-16T08:07:40.1144349Z||;True|2024-05-13T20:30:51.7503157+08:00||;True|2024-05-13T20:29:37.0822568+08:00||;True|2024-05-13T10:51:01.0984596+08:00||;True|2024-05-07T19:01:31.1314796+08:00||;True|2024-02-19T14:58:53.6167020+08:00||;</History>
+    <History>True|2024-05-16T08:08:07.8889753Z||;True|2024-05-16T16:07:40.1144349+08:00||;True|2024-05-13T20:30:51.7503157+08:00||;True|2024-05-13T20:29:37.0822568+08:00||;True|2024-05-13T10:51:01.0984596+08:00||;True|2024-05-07T19:01:31.1314796+08:00||;True|2024-02-19T14:58:53.6167020+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
diff --git a/Minecraft_QQ_Core/Robot/MessageHelper.cs b/Minecraft_QQ_Core/Robot/MessageHelper.cs
@@ -499,6 +499,13 @@ private static async void SendMessage(GroupObj group, PlayerObj? player, string
             {
                 for (int a = 1; a < list.Count; a++)
                 {
+                    if (list[a] is MsgText text1)
+                    {
+                        if (text1.Data.Text.StartsWith("[分享] 不支持的消息类型，请到手机上查看"))
+                        {
+                            continue;
+                        }
+                    }
                     builder.Append(list[a].ToString());
                 }
             }

diff --git a/Minecraft_QQ_Core/Utils/Funtion.cs b/Minecraft_QQ_Core/Utils/Funtion.cs
@@ -129,9 +129,17 @@ public static string GetString(string a, string b, string? c = null)
                 }
                 else if (app == "com.tencent.structmsg")
                 {
+                    if (obj["view"]?.ToString() == "music")
+                    {
+                        return obj["prompt"]?.ToString() + "\n" + obj["meta"]?["music"]?["jumpUrl"]?.ToString();
+                    }
                     return obj["prompt"]?.ToString() + "\n" + "链接：" + obj["meta"]?["news"]?["jumpUrl"]?.ToString();
                 }
-
+                else if (app == "com.tencent.troopsharecard")
+                {
+                    return obj["prompt"]?.ToString() + "：" + obj["meta"]?["contact"]?["nickname"]?.ToString() 
+                        + "\n" + obj["meta"]?["contact"]?["jumpUrl"]?.ToString();
+                }
             }
             else if (a is MsgForward msg)
             {

diff --git a/OneBotSharp b/OneBotSharp
+2 −2		OneBotSharp/Objs/Event/EventMessage.cs
+2 −0		OneBotSharp/Objs/Message/MsgBase.cs
+4 −4		OneBotSharp/Objs/Message/MsgJson.cs
+1 −1		OneBotSharp/Protocol/OneBotWebSocketClient.cs
+1 −1		OneBotSharp/Protocol/OneBotWebSocketServer.cs