No more base64 on chatroom
This commit is contained in:
@@ -1,7 +1,5 @@
|
|||||||
using System;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Numerics;
|
using System.Numerics;
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MikeSchweitzer.WebSocket;
|
using MikeSchweitzer.WebSocket;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
@@ -141,7 +139,7 @@ public class ChatroomMenu : MonoBehaviour
|
|||||||
var optionsButton = rowInfo.transform.GetChild(4).GetComponent<Button>();
|
var optionsButton = rowInfo.transform.GetChild(4).GetComponent<Button>();
|
||||||
|
|
||||||
usernameText.text = message.Username;
|
usernameText.text = message.Username;
|
||||||
messageText.text = Encoding.UTF8.GetString(Convert.FromBase64String(message.Content));
|
messageText.text = message.Content;
|
||||||
if (message.CustomIcon == null)
|
if (message.CustomIcon == null)
|
||||||
{
|
{
|
||||||
playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + message.Icon);
|
playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + message.Icon);
|
||||||
@@ -214,7 +212,7 @@ public class ChatroomMenu : MonoBehaviour
|
|||||||
var editMessageChildEditedPreview = editMessageChild.GetChild(3).gameObject;
|
var editMessageChildEditedPreview = editMessageChild.GetChild(3).gameObject;
|
||||||
var editMessageChildNewContentInputBox = editMessageChild.GetChild(4).GetComponent<TMP_InputField>();
|
var editMessageChildNewContentInputBox = editMessageChild.GetChild(4).GetComponent<TMP_InputField>();
|
||||||
editMessageChildNewContentInputBox.onSelect.AddListener((_) => editMessageChildNewContentInputBox.caretPosition = editMessageChildNewContentInputBox.text.Length);
|
editMessageChildNewContentInputBox.onSelect.AddListener((_) => editMessageChildNewContentInputBox.caretPosition = editMessageChildNewContentInputBox.text.Length);
|
||||||
editMessageChildNewContentInputBox.text = Encoding.UTF8.GetString(Convert.FromBase64String(selectedMessageForOptions.Content));
|
editMessageChildNewContentInputBox.text = selectedMessageForOptions.Content;
|
||||||
editMessageChildExitButton.onClick.AddListener(() =>
|
editMessageChildExitButton.onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
editMessagePanelCurrent = null;
|
editMessagePanelCurrent = null;
|
||||||
@@ -237,7 +235,7 @@ public class ChatroomMenu : MonoBehaviour
|
|||||||
var optionsButton = rowInfo.transform.GetChild(5).GetComponent<Button>();
|
var optionsButton = rowInfo.transform.GetChild(5).GetComponent<Button>();
|
||||||
|
|
||||||
usernameText.text = selectedMessageForOptions.Username;
|
usernameText.text = selectedMessageForOptions.Username;
|
||||||
messageText.text = Encoding.UTF8.GetString(Convert.FromBase64String(selectedMessageForOptions.Content));
|
messageText.text = selectedMessageForOptions.Content;
|
||||||
if (selectedMessageForOptions.CustomIcon == null)
|
if (selectedMessageForOptions.CustomIcon == null)
|
||||||
{
|
{
|
||||||
playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + selectedMessageForOptions.Icon);
|
playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + selectedMessageForOptions.Icon);
|
||||||
@@ -268,7 +266,7 @@ public class ChatroomMenu : MonoBehaviour
|
|||||||
optionsButton = rowInfo.transform.GetChild(5).GetComponent<Button>();
|
optionsButton = rowInfo.transform.GetChild(5).GetComponent<Button>();
|
||||||
|
|
||||||
usernameText.text = selectedMessageForOptions.Username;
|
usernameText.text = selectedMessageForOptions.Username;
|
||||||
messageText.text = Encoding.UTF8.GetString(Convert.FromBase64String(selectedMessageForOptions.Content));
|
messageText.text = selectedMessageForOptions.Content;
|
||||||
editMessageChildNewContentInputBox.onValueChanged.AddListener((value) => messageText.text = value);
|
editMessageChildNewContentInputBox.onValueChanged.AddListener((value) => messageText.text = value);
|
||||||
if (selectedMessageForOptions.CustomIcon == null)
|
if (selectedMessageForOptions.CustomIcon == null)
|
||||||
{
|
{
|
||||||
@@ -318,7 +316,7 @@ public class ChatroomMenu : MonoBehaviour
|
|||||||
});
|
});
|
||||||
optionsPanelCopyButton.onClick.AddListener(() =>
|
optionsPanelCopyButton.onClick.AddListener(() =>
|
||||||
{
|
{
|
||||||
if (selectedMessageForOptions != null) GUIUtility.systemCopyBuffer = Encoding.UTF8.GetString(Convert.FromBase64String(selectedMessageForOptions.Content));
|
if (selectedMessageForOptions != null) GUIUtility.systemCopyBuffer = selectedMessageForOptions.Content;
|
||||||
});
|
});
|
||||||
optionsPanelCopyButton.onClick.AddListener(optionsPanelExitButton.onClick.Invoke);
|
optionsPanelCopyButton.onClick.AddListener(optionsPanelExitButton.onClick.Invoke);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user