From 09014d07e0fc1b18cf37827698f3064e568f16dc Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 23 Oct 2022 19:29:31 +0100
Subject: [PATCH] Fixed issues retrieving chatReference from the db.

---
 .../java/org/qortal/data/chat/ChatMessage.java   | 11 +++++++++--
 .../repository/hsqldb/HSQLDBChatRepository.java  | 16 +++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/qortal/data/chat/ChatMessage.java b/src/main/java/org/qortal/data/chat/ChatMessage.java
index 26df1da4..5d16bb7c 100644
--- a/src/main/java/org/qortal/data/chat/ChatMessage.java
+++ b/src/main/java/org/qortal/data/chat/ChatMessage.java
@@ -27,6 +27,8 @@ public class ChatMessage {
 
 	private String recipientName;
 
+	private byte[] chatReference;
+
 	private byte[] data;
 
 	private boolean isText;
@@ -42,8 +44,8 @@ public class ChatMessage {
 
 	// For repository use
 	public ChatMessage(long timestamp, int txGroupId, byte[] reference, byte[] senderPublicKey, String sender,
-			String senderName, String recipient, String recipientName, byte[] data, boolean isText,
-			boolean isEncrypted, byte[] signature) {
+			String senderName, String recipient, String recipientName, byte[] chatReference, byte[] data,
+			boolean isText, boolean isEncrypted, byte[] signature) {
 		this.timestamp = timestamp;
 		this.txGroupId = txGroupId;
 		this.reference = reference;
@@ -52,6 +54,7 @@ public class ChatMessage {
 		this.senderName = senderName;
 		this.recipient = recipient;
 		this.recipientName = recipientName;
+		this.chatReference = chatReference;
 		this.data = data;
 		this.isText = isText;
 		this.isEncrypted = isEncrypted;
@@ -90,6 +93,10 @@ public class ChatMessage {
 		return this.recipientName;
 	}
 
+	public byte[] getChatReference() {
+		return this.chatReference;
+	}
+
 	public byte[] getData() {
 		return this.data;
 	}
diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java
index d4c9d7e0..178a4c24 100644
--- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java
+++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java
@@ -35,7 +35,7 @@ public class HSQLDBChatRepository implements ChatRepository {
 
 		sql.append("SELECT created_when, tx_group_id, Transactions.reference, creator, "
 				+ "sender, SenderNames.name, recipient, RecipientNames.name, "
-				+ "data, is_text, is_encrypted, signature "
+				+ "chat_reference, data, is_text, is_encrypted, signature "
 				+ "FROM ChatTransactions "
 				+ "JOIN Transactions USING (signature) "
 				+ "LEFT OUTER JOIN Names AS SenderNames ON SenderNames.owner = sender "
@@ -108,13 +108,14 @@ public class HSQLDBChatRepository implements ChatRepository {
 				String senderName = resultSet.getString(6);
 				String recipient = resultSet.getString(7);
 				String recipientName = resultSet.getString(8);
-				byte[] data = resultSet.getBytes(9);
-				boolean isText = resultSet.getBoolean(10);
-				boolean isEncrypted = resultSet.getBoolean(11);
-				byte[] signature = resultSet.getBytes(12);
+				byte[] chatReference = resultSet.getBytes(9);
+				byte[] data = resultSet.getBytes(10);
+				boolean isText = resultSet.getBoolean(11);
+				boolean isEncrypted = resultSet.getBoolean(12);
+				byte[] signature = resultSet.getBytes(13);
 
 				ChatMessage chatMessage = new ChatMessage(timestamp, groupId, reference, senderPublicKey, sender,
-						senderName, recipient, recipientName, data, isText, isEncrypted, signature);
+						senderName, recipient, recipientName, chatReference, data, isText, isEncrypted, signature);
 
 				chatMessages.add(chatMessage);
 			} while (resultSet.next());
@@ -146,13 +147,14 @@ public class HSQLDBChatRepository implements ChatRepository {
 			byte[] senderPublicKey = chatTransactionData.getSenderPublicKey();
 			String sender = chatTransactionData.getSender();
 			String recipient = chatTransactionData.getRecipient();
+			byte[] chatReference = chatTransactionData.getChatReference();
 			byte[] data = chatTransactionData.getData();
 			boolean isText = chatTransactionData.getIsText();
 			boolean isEncrypted = chatTransactionData.getIsEncrypted();
 			byte[] signature = chatTransactionData.getSignature();
 
 			return new ChatMessage(timestamp, groupId, reference, senderPublicKey, sender,
-					senderName, recipient, recipientName, data, isText, isEncrypted, signature);
+					senderName, recipient, recipientName, chatReference, data, isText, isEncrypted, signature);
 		} catch (SQLException e) {
 			throw new DataException("Unable to fetch convert chat transaction from repository", e);
 		}