diff --git a/Assets/Scripts/ChatroomMenu.cs b/Assets/Scripts/ChatroomMenu.cs index f522ae9..70c32a8 100644 --- a/Assets/Scripts/ChatroomMenu.cs +++ b/Assets/Scripts/ChatroomMenu.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Numerics; using System.Text; using System.Threading.Tasks; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using TMPro; using UnityEngine; @@ -195,20 +196,11 @@ public class ChatroomMenu : MonoBehaviour break; default: shouldClear = false; - var jsonResponse = JArray.Parse(response); + var messages = JsonConvert.DeserializeObject(response); var localUserId = BazookaManager.Instance.GetAccountID(); - foreach (JObject entry in jsonResponse.Cast()) + foreach (var message in messages) { - var username = (string)entry["username"]; - var chatContent = Encoding.UTF8.GetString(Convert.FromBase64String((string)entry["content"])); - var id = BigInteger.Parse((string)entry["id"]); - var icon = (int)entry["icon"]; - var overlay = (int)entry["overlay"]; - var uid = BigInteger.Parse((string)entry["userid"]); - var birdColor = (JArray)entry["birdColor"]; - var overlayColor = (JArray)entry["overlayColor"]; - - if (content.transform.Find("ChatroomRow_" + id + "_" + uid) != null) + if (content.transform.Find("ChatroomRow_" + message.ID + "_" + message.UserID) != null) { continue; } @@ -226,34 +218,34 @@ public class ChatroomMenu : MonoBehaviour var messageText = rowInfo.transform.GetChild(3).GetComponent(); var optionsButton = rowInfo.transform.GetChild(4).GetComponent