Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 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
5 changes: 5 additions & 0 deletions .changeset/gentle-months-kick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where deleted messages remain visible until a manual page refresh when "Message removed" is hidden in hidden system messages settings.
4 changes: 3 additions & 1 deletion apps/meteor/server/lib/systemMessage/hideSystemMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ export const isMutedUnmuted = (messageType: string): boolean => {
return messageType === 'user-muted' || messageType === 'user-unmuted';
};

export const isMessageRemove = (messageType: string): boolean => messageType === 'rm';

export const shouldHideSystemMessage = (messageType: MessageTypesValues, hideSystemMessage?: MessageTypesValues[]): boolean => {
if (!hideSystemMessage?.length) {
if (!hideSystemMessage?.length || isMessageRemove(messageType)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ describe('hideSystemMessage', () => {
expect(result).to.be.false;
});

it('should return false if message type is of deleted message', async () => {
const result = shouldHideSystemMessage('rm', undefined);
expect(result).to.be.false;
});

it('should return false if hidden system messages are undefined', async () => {
const result = shouldHideSystemMessage('user-muted', undefined);
expect(result).to.be.false;
Expand Down
Loading