Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Bypass trash when removing OTR system messages and read receipts #32269

Merged
merged 4 commits into from
May 20, 2024
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
8 changes: 8 additions & 0 deletions .changeset/weak-turkeys-sit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@rocket.chat/meteor": patch
---

Fixed a bad behavior with the interaction between OTR system messages & trash collection. We use trash collection as a temporary storage that holds recently deleted items from some collections. Messages is one of those. This was causing "User joined OTR" messages to be viewable when querying the trash collection.
Since OTR messages are by definition private, code was updated to bypass trash collection when removing these special messages.

Note: this only applies to these system messages. OTR user's messages are not stored on the database.
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/models/raw/ReadReceipts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class ReadReceiptsRaw extends BaseRaw<ReadReceipt> implements IReadReceip
},
ts: { $lte: until },
};
return this.deleteMany(query);
return this.col.deleteMany(query);
}

async removeByIdPinnedTimestampLimitAndUsers(
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/server/models/raw/Messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
},
ts: { $lte: ts },
};
return this.deleteMany(query);
return this.col.deleteMany(query);
}

addTranslations(messageId: string, translations: Record<string, string>, providerName: string): Promise<UpdateResult> {
Expand Down
Loading