Fixed improper logic of checking websocket message type

Mirai-NET-Shelter · May 21, 2022 · 2283f81 · 2283f81
1 parent d62fdf1
commit 2283f81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/Mirai.Net.Test/Program.cs b/Mirai.Net.Test/Program.cs
@@ -17,17 +17,15 @@ internal static class Program
     {
         private static async Task Main()
         {
-            var con = new ConnectConfig
-            {
-                HttpAddress = "",
-                WebsocketAddress = ""
-            };
-            return;
             var exit = new ManualResetEvent(false);
 
-            using var bot = new MiraiBot
+            var bot = new MiraiBot
             {
-                Address = "localhost:8080",
+                Address = new ConnectConfig
+                {
+                    HttpAddress = new ConnectConfig.AdapterConfig("localhost", "8080"),
+                    WebsocketAddress = new ConnectConfig.AdapterConfig("localhost", "1234")
+                },
                 VerifyKey = "1145141919810",
                 QQ = "1590454991"
             };

diff --git a/Mirai.Net/Sessions/MiraiBot.cs b/Mirai.Net/Sessions/MiraiBot.cs
@@ -225,7 +225,7 @@ private void RedirectWebSocketData(string data)
             throw new InvalidWebsocketReponseException("Websocket传回错误响应");
         }
 
-        if (dataType.EndsWith("Message"))
+        if (dataType.Contains("Message"))
         {
             var receiver = ReflectionUtils.GetMessageReceiverBase(data);
 
@@ -250,7 +250,7 @@ private void RedirectWebSocketData(string data)
 
             _messageReceivedSubject.OnNext(receiver);
         }
-        else if (dataType.EndsWith("Event"))
+        else if (dataType.Contains("Event"))
         {
             _eventReceivedSubject.OnNext(ReflectionUtils.GetEventBase(data));
         }