AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Include transaction reference in chat messages returned by API call GET /chat/messages

Browse Source
This commit is contained in:
catbref 2020-05-22 08:00:43 +01:00
parent 0164bca2d7
commit 200a97184c
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/qortal/data/chat/ChatMessage.java
View File

@ -12,6 +12,8 @@ public class ChatMessage {
private int txGroupId; private int txGroupId;
private byte[] reference;
private byte[] senderPublicKey; private byte[] senderPublicKey;
/* Address of sender */ /* Address of sender */
@ -37,10 +39,12 @@ public class ChatMessage {
} }
// For repository use // For repository use
public ChatMessage(long timestamp, int txGroupId, byte[] senderPublicKey, String sender, String senderName, public ChatMessage(long timestamp, int txGroupId, byte[] reference, byte[] senderPublicKey, String sender,
String recipient, String recipientName, byte[] data, boolean isText, boolean isEncrypted) { String senderName, String recipient, String recipientName, byte[] data, boolean isText,
boolean isEncrypted) {
this.timestamp = timestamp; this.timestamp = timestamp;
this.txGroupId = txGroupId; this.txGroupId = txGroupId;
this.reference = reference;
this.senderPublicKey = senderPublicKey; this.senderPublicKey = senderPublicKey;
this.sender = sender; this.sender = sender;
this.senderName = senderName; this.senderName = senderName;
@ -59,6 +63,10 @@ public class ChatMessage {
return this.txGroupId; return this.txGroupId;
} }
public byte[] getReference() {
return this.reference;
}
public byte[] getSenderPublicKey() { public byte[] getSenderPublicKey() {
return this.senderPublicKey; return this.senderPublicKey;
} }

26
src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java
View File

@ -32,8 +32,9 @@ public class HSQLDBChatRepository implements ChatRepository {
StringBuilder sql = new StringBuilder(1024); StringBuilder sql = new StringBuilder(1024);
sql.append("SELECT created_when, tx_group_id, creator, sender, SenderNames.name, " sql.append("SELECT created_when, tx_group_id, Transactions.reference, creator, "
+ "recipient, RecipientNames.name, data, is_text, is_encrypted " + "sender, SenderNames.name, recipient, RecipientNames.name, "
+ "data, is_text, is_encrypted "
+ "FROM ChatTransactions " + "FROM ChatTransactions "
+ "JOIN Transactions USING (signature) " + "JOIN Transactions USING (signature) "
+ "LEFT OUTER JOIN Names AS SenderNames ON SenderNames.owner = sender " + "LEFT OUTER JOIN Names AS SenderNames ON SenderNames.owner = sender "
@ -90,17 +91,18 @@ public class HSQLDBChatRepository implements ChatRepository {
do { do {
long timestamp = resultSet.getLong(1); long timestamp = resultSet.getLong(1);
int groupId = resultSet.getInt(2); int groupId = resultSet.getInt(2);
byte[] senderPublicKey = resultSet.getBytes(3); byte[] reference = resultSet.getBytes(3);
String sender = resultSet.getString(4); byte[] senderPublicKey = resultSet.getBytes(4);
String senderName = resultSet.getString(5); String sender = resultSet.getString(5);
String recipient = resultSet.getString(6); String senderName = resultSet.getString(6);
String recipientName = resultSet.getString(7); String recipient = resultSet.getString(7);
byte[] data = resultSet.getBytes(8); String recipientName = resultSet.getString(8);
boolean isText = resultSet.getBoolean(9); byte[] data = resultSet.getBytes(9);
boolean isEncrypted = resultSet.getBoolean(10); boolean isText = resultSet.getBoolean(10);
boolean isEncrypted = resultSet.getBoolean(11);
ChatMessage chatMessage = new ChatMessage(timestamp, groupId, senderPublicKey, sender, senderName, ChatMessage chatMessage = new ChatMessage(timestamp, groupId, reference, senderPublicKey, sender,
recipient, recipientName, data, isText, isEncrypted); senderName, recipient, recipientName, data, isText, isEncrypted);
chatMessages.add(chatMessage); chatMessages.add(chatMessage);
} while (resultSet.next()); } while (resultSet.next());