Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-15 19:55:48 +00:00
Code Issues Projects Releases Wiki Activity

Added optional "sender" filter to GET /chat/messages

Browse Source
This commit is contained in:
CalDescent 2023-03-10 13:53:46 +00:00
parent 4afbca7ed2
commit b4a736c5d2
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/api/resource/ChatResource.java
View File

@ -72,6 +72,7 @@ public class ChatResource {
@QueryParam("reference") String reference, @QueryParam("reference") String reference,
@QueryParam("chatreference") String chatReference, @QueryParam("chatreference") String chatReference,
@QueryParam("haschatreference") Boolean hasChatReference, @QueryParam("haschatreference") Boolean hasChatReference,
@QueryParam("sender") String sender,
@Parameter(ref = "limit") @QueryParam("limit") Integer limit, @Parameter(ref = "limit") @QueryParam("limit") Integer limit,
@Parameter(ref = "offset") @QueryParam("offset") Integer offset, @Parameter(ref = "offset") @QueryParam("offset") Integer offset,
@Parameter(ref = "reverse") @QueryParam("reverse") Boolean reverse) { @Parameter(ref = "reverse") @QueryParam("reverse") Boolean reverse) {
@ -107,6 +108,7 @@ public class ChatResource {
chatReferenceBytes, chatReferenceBytes,
hasChatReference, hasChatReference,
involvingAddresses, involvingAddresses,
sender,
limit, offset, reverse); limit, offset, reverse);
} catch (DataException e) { } catch (DataException e) {
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);

2
src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java
View File

@ -49,6 +49,7 @@ public class ChatMessagesWebSocket extends ApiWebSocket {
null, null,
null, null,
null, null,
null,
null, null, null); null, null, null);
sendMessages(session, chatMessages); sendMessages(session, chatMessages);
@ -79,6 +80,7 @@ public class ChatMessagesWebSocket extends ApiWebSocket {
null, null,
null, null,
involvingAddresses, involvingAddresses,
null,
null, null, null); null, null, null);
sendMessages(session, chatMessages); sendMessages(session, chatMessages);

2
src/main/java/org/qortal/repository/ChatRepository.java
View File

@ -15,7 +15,7 @@ public interface ChatRepository {
*/ */
public List<ChatMessage> getMessagesMatchingCriteria(Long before, Long after, public List<ChatMessage> getMessagesMatchingCriteria(Long before, Long after,
Integer txGroupId, byte[] reference, byte[] chatReferenceBytes, Boolean hasChatReference, Integer txGroupId, byte[] reference, byte[] chatReferenceBytes, Boolean hasChatReference,
List<String> involving, Integer limit, Integer offset, Boolean reverse) throws DataException; List<String> involving, String senderAddress, Integer limit, Integer offset, Boolean reverse) throws DataException;
public ChatMessage toChatMessage(ChatTransactionData chatTransactionData) throws DataException; public ChatMessage toChatMessage(ChatTransactionData chatTransactionData) throws DataException;

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

@ -24,7 +24,7 @@ public class HSQLDBChatRepository implements ChatRepository {
@Override @Override
public List<ChatMessage> getMessagesMatchingCriteria(Long before, Long after, Integer txGroupId, byte[] referenceBytes, public List<ChatMessage> getMessagesMatchingCriteria(Long before, Long after, Integer txGroupId, byte[] referenceBytes,
byte[] chatReferenceBytes, Boolean hasChatReference, List<String> involving, byte[] chatReferenceBytes, Boolean hasChatReference, List<String> involving, String senderAddress,
Integer limit, Integer offset, Boolean reverse) throws DataException { Integer limit, Integer offset, Boolean reverse) throws DataException {
// Check args meet expectations // Check args meet expectations
if ((txGroupId != null && involving != null && !involving.isEmpty()) if ((txGroupId != null && involving != null && !involving.isEmpty())
@ -74,6 +74,11 @@ public class HSQLDBChatRepository implements ChatRepository {
whereClauses.add("chat_reference IS NULL"); whereClauses.add("chat_reference IS NULL");
} }
if (senderAddress != null) {
whereClauses.add("sender = ?");
bindParams.add(senderAddress);
}
if (txGroupId != null) { if (txGroupId != null) {
whereClauses.add("tx_group_id = " + txGroupId); // int safe to use literally whereClauses.add("tx_group_id = " + txGroupId); // int safe to use literally
whereClauses.add("recipient IS NULL"); whereClauses.add("recipient IS NULL");