Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -1208,6 +1208,12 @@ Message.delete(messageId).request();

// hard delete the message (works only server-side)
Message.delete(messageId).hard(true).request();

// delete the message with a specific user as the deleter
Message.delete(messageId).deletedBy(userId).request();

// combine parameters
Message.delete(messageId).hard(true).deletedBy(userId).request();
```

**Upload file or image**
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/io/getstream/chat/java/models/Message.java
Original file line number Diff line number Diff line change
Expand Up @@ -794,15 +794,23 @@ public static class MessageDeleteRequest extends StreamRequest<MessageDeleteResp

@Nullable private Boolean hard;

@Nullable private String deletedBy;

@NotNull
public MessageDeleteRequest hard(@NotNull Boolean hard) {
this.hard = hard;
return this;
}

@NotNull
public MessageDeleteRequest deletedBy(@NotNull String deletedBy) {
this.deletedBy = deletedBy;
return this;
}

@Override
protected Call<MessageDeleteResponse> generateCall(Client client) {
return client.create(MessageService.class).delete(this.id, this.hard);
return client.create(MessageService.class).delete(this.id, this.hard, this.deletedBy);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ Call<StreamResponseObject> deleteImage(

@DELETE("messages/{id}")
Call<MessageDeleteResponse> delete(
@NotNull @Path("id") String id, @Nullable @Query("hard") Boolean hard);
@NotNull @Path("id") String id,
@Nullable @Query("hard") Boolean hard,
@Nullable @Query("deleted_by") String deletedBy);

@GET("messages/{id}")
Call<MessageGetResponse> get(
Expand Down
25 changes: 25 additions & 0 deletions src/test/java/io/getstream/chat/java/MessageTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,31 @@ void whenDeletingMessage_thenIsDeleted() {
Assertions.assertNotNull(deletedMessage.getDeletedAt());
}

@DisplayName("Can delete a message with deletedBy specified")
@Test
void whenDeletingMessageWithDeletedBy_thenIsDeletedWithSpecifiedUser() {
String text = "This is a message to be deleted with deletedBy";
MessageRequestObject messageRequest =
MessageRequestObject.builder().text(text).userId(testUserRequestObject.getId()).build();
Message message =
Assertions.assertDoesNotThrow(
() ->
Message.send(testChannel.getType(), testChannel.getId())
.message(messageRequest)
.request())
.getMessage();
Assertions.assertNull(message.getDeletedAt());

String deletedByUserId = "test-deleted-by-user";
Message deletedMessage =
Assertions.assertDoesNotThrow(
() -> Message.delete(message.getId()).deletedBy(deletedByUserId).request())
.getMessage();
Assertions.assertNotNull(deletedMessage.getDeletedAt());
// Additional assertions can be added here once the backend supports checking the deletedBy
// field
}

@DisplayName("Can retrieve many messages")
@Test
void whenRetrievingManyMessage_thenAreRetrieved() {
Expand Down
Loading