fix 聊天桥

UnrealMultiple · Apr 10, 2024 · 5976b2d · 5976b2d
1 parent 22318b9
commit 5976b2d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/ChattyBridge/Message/PlayerMessage.cs b/ChattyBridge/Message/PlayerMessage.cs
@@ -18,7 +18,7 @@ public class PlayerMessage
     public string Group { get; init; }
 
     [JsonProperty("rgb")]
-    public byte[] RGB { get; init; } = new byte[3];
+    public int[] RGB { get; init; } = new int[3];
 
     [JsonProperty("type")]
     [JsonConverter(typeof(EnumConveter))]
@@ -29,7 +29,7 @@ public PlayerMessage(TSPlayer player)
         Name = player.Name;
         Prefix = player.Group.Prefix;
         Group = player.Group.Name;
-        RGB = new byte[3]
+        RGB = new int[3]
         {
             player.Group.R,
             player.Group.G,

diff --git a/ChattyBridge/Plugin.cs b/ChattyBridge/Plugin.cs
@@ -2,6 +2,7 @@
 using Newtonsoft.Json.Linq;
 using Rests;
 using System.Reflection;
+using System.Text;
 using Terraria;
 using TerrariaApi.Server;
 using TShockAPI;
@@ -68,28 +69,29 @@ private object Receive(RestRequestArgs args)
         {
             try
             { 
-                var json = JObject.Parse(msg);
+                var sourceMsg = Encoding.UTF8.GetString(Convert.FromBase64String(msg));
+                var json = JObject.Parse(sourceMsg);
                 if (json.TryGetValue("type", out var type))
                 {
                     switch (type.ToString())
                     {
                         case "player_join":
                             {
                                 var jobj = json.ToObject<PlayerJoinMessage>()!;
-                                TShock.Utils.Broadcast($"[{jobj.ServerName}] {jobj.Name} 加入服务器", jobj.RGB[0], jobj.RGB[1], jobj.RGB[2]);
+                                TShock.Utils.Broadcast($"[{jobj.ServerName}] {jobj.Name} 加入服务器", (byte)jobj.RGB[0], (byte)jobj.RGB[1], (byte)jobj.RGB[2]);
                                 break;
                             }
 
                         case "player_leave":
                             {
                                 var jobj = json.ToObject<PlayerLeaveMessage>()!;
-                                TShock.Utils.Broadcast($"[{jobj.ServerName}] {jobj.Name} 离开服务器", jobj.RGB[0], jobj.RGB[1], jobj.RGB[2]);
+                                TShock.Utils.Broadcast($"[{jobj.ServerName}] {jobj.Name} 离开服务器", (byte)jobj.RGB[0], (byte)jobj.RGB[1], (byte)jobj.RGB[2]);
                                 break;
                             }
                         case "player_chat":
                             {
                                 var jobj = json.ToObject<PlayerChatMessage>()!;
-                                TShock.Utils.Broadcast($"[{jobj.ServerName}] {jobj.Name}: {jobj.Text}", jobj.RGB[0], jobj.RGB[1], jobj.RGB[2]);
+                                TShock.Utils.Broadcast($"[{jobj.ServerName}] {jobj.Name}: {jobj.Text}", (byte)jobj.RGB[0], (byte)jobj.RGB[1], (byte)jobj.RGB[2]);
                                 break;
                             }
                         default:
@@ -111,11 +113,12 @@ private void SendMessage(string msg)
     {
         Task.Run(() =>
         {
+            var baseStr = Convert.ToBase64String(Encoding.UTF8.GetBytes(msg));
             foreach (var host in Config.RestHost)
             {
                 try
                 {
-                    var url = $"http://{host}{RestAPI}?msg={msg}";
+                    var url = $"http://{host}{RestAPI}?msg={baseStr}";
                     Client.Send(new HttpRequestMessage(HttpMethod.Get, url));
                 }
                 catch