Contain chat id in Message

Author: DemonExposer

Nockx.Base/Cryptography.cs

@@ -288,10 +288,8 @@ public static Message Encrypt(string inputText, RsaKeyParameters personalPublicK
 			ReceiverEncryptedKey = Convert.ToBase64String(foreignEncryptedKey),
 			Timestamp = timestamp,
 			Signature = Sign(inputText + timestamp, privateKey), // TODO: add receiver's key to this as well, so no forwarding can be done
-			Receiver = foreignPublicKey,
 			Sender = personalPublicKey,
-			SenderDisplayName = "",
-			ReceiverDisplayName = ""
+			SenderDisplayName = ""
 		};
 	}
 }

Nockx.Base/Nockx.Base.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>0.4.1</Version>
+        <Version>0.5.0</Version>
         <Authors>DemonExposer</Authors>
         <Description>The underlying cryptography system + foundational classes for Nockx™</Description>
         <RepositoryUrl>https://github.com/DemonExposer/Nockx.Base</RepositoryUrl>

Nockx.Base/Util/Message.cs

@@ -5,32 +5,33 @@
 namespace Nockx.Base.Util;
 
 public class Message {
-	public long Id, Timestamp;
-	public string Body, ReceiverEncryptedKey, SenderEncryptedKey, Signature, SenderDisplayName, ReceiverDisplayName;
-	public RsaKeyParameters Sender, Receiver;
+	public long Id, ChatId, Timestamp;
+	public string Body, ReceiverEncryptedKey, SenderEncryptedKey, Signature, SenderDisplayName;
+	public RsaKeyParameters Sender;
 	public bool IsRead;
 
 	public static Message Parse(JsonObject jsonMessage) {
 		Message message;
 		try {
 			message = new Message {
 				Id = jsonMessage["id"]!.GetValue<long>(),
+				ChatId = jsonMessage["chatId"]!.GetValue<long>(),
 				Body = jsonMessage["text"]!.GetValue<string>(),
 				ReceiverEncryptedKey = jsonMessage["receiverEncryptedKey"]!.GetValue<string>(),
 				SenderEncryptedKey = jsonMessage["senderEncryptedKey"]?.GetValue<string>(),
 				Timestamp = jsonMessage["timestamp"]!.GetValue<long>(),
 				Signature = jsonMessage["signature"]!.GetValue<string>(),
 				Sender = RsaKeyParametersExtension.FromBase64String(jsonMessage["sender"]!["key"]!.GetValue<string>()),
-				Receiver = jsonMessage["receiver"] == null ? null : RsaKeyParametersExtension.FromBase64String(jsonMessage["receiver"]!["key"]!.GetValue<string>()),
 				SenderDisplayName = jsonMessage["sender"]!["displayName"]!.GetValue<string>(),
-				ReceiverDisplayName = jsonMessage["receiver"]!["displayName"]!.GetValue<string>(),
 				IsRead = jsonMessage["isRead"]!.GetValue<bool>()
 			};
 		} catch (Exception e) { // TODO: make this better. currently this is just easy for identifying issues between client and server
 			Console.WriteLine(e.Message);
 
 			if (jsonMessage["id"] == null)
 				Console.WriteLine("id null");
+			if (jsonMessage["chatId"] == null)
+				Console.WriteLine("chatId null");
 			if (jsonMessage["text"] == null)
 				Console.WriteLine("text null");
 			if (jsonMessage["receiverEncryptedKey"] == null)
@@ -43,8 +44,6 @@ public static Message Parse(JsonObject jsonMessage) {
 				Console.WriteLine("signature null");
 			if (jsonMessage["sender"] == null)
 				Console.WriteLine("sender null");
-			if (jsonMessage["receiver"] == null)
-				Console.WriteLine("receiver null");
 			if (jsonMessage["isRead"] == null)
 				Console.WriteLine("isRead null");