Skip to content

Commit

Permalink
fix: Bypass trash when removing OTR system messages and read receipts (
Browse files Browse the repository at this point in the history
  • Loading branch information
KevLehman authored and matheusbsilva137 committed May 31, 2024
1 parent 789462b commit 696ce5b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
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

0 comments on commit 696ce5b

Please sign in to comment.