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

Conversation

KevLehman
Copy link
Contributor

@KevLehman KevLehman commented Apr 19, 2024

https://rocketchat.atlassian.net/browse/CORE-297

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

System messages associated with an OTR conversation should be deleted and not stored on trash. By using the underlying mongo connection directly, we bypass our internal logic for trashing deleted messages

Copy link

changeset-bot bot commented Apr 19, 2024

🦋 Changeset detected

Latest commit: fd0d118

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

codecov bot commented Apr 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.87%. Comparing base (3cbbecd) to head (fd0d118).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32269      +/-   ##
===========================================
+ Coverage    55.84%   55.87%   +0.02%     
===========================================
  Files         2432     2431       -1     
  Lines        53480    53449      -31     
  Branches     10993    10987       -6     
===========================================
- Hits         29868    29865       -3     
+ Misses       20973    20945      -28     
  Partials      2639     2639              
Flag Coverage Δ
e2e 55.22% <ø> (+0.04%) ⬆️
unit 72.74% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@KevLehman KevLehman marked this pull request as ready for review April 22, 2024 14:55
@KevLehman KevLehman requested a review from a team as a code owner April 22, 2024 14:55
Copy link
Member

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a changeset?

Copy link
Contributor

dionisio-bot bot commented Apr 23, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Apr 25, 2024
@scuciatto scuciatto added this to the 6.9 milestone Apr 26, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Apr 26, 2024
@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label May 20, 2024
@KevLehman KevLehman added the stat: ready to merge PR tested and approved waiting for merge label May 20, 2024
@kodiakhq kodiakhq bot merged commit 61e31aa into develop May 20, 2024
50 checks passed
@kodiakhq kodiakhq bot deleted the fix/otr-sysmess branch May 20, 2024 15:20
gabriellsh added a commit that referenced this pull request May 28, 2024
…retention

* 'develop' of github.com:RocketChat/Rocket.Chat: (36 commits)
  refactor: IntegrationHistory out of DB Watcher (#32502)
  fix: Message update being broadcasted without updated values (#32472)
  test: make api teams test fully independent (#31756)
  test: Fix test name (#32490)
  fix: streams being called with no logged user (#32489)
  feat: Un-encrypted messages not allowed in E2EE rooms (#32040)
  feat(UiKit): Users select (#31455)
  fix: Re-login same browser tab issues (#32479)
  chore: move all webclient code out of the COSS folders (#32273)
  chore(deps): bump thehanimo/pr-title-checker from 1.3.7 to 1.4.1 (#30619)
  fix: Don't show join default channels option for edit user form  (#31750)
  fix: CAS user merge not working (#32444)
  fix: Overriding Retention Policy not working (#32454)
  fix: `rooms.export` endpoint generates an empty export when given an invalid date (#32364)
  fix: "Allow Password Change for OAuth Users" setting is not honored in the "Forgot Password" flow (#32398)
  fix: Bypass trash when removing OTR system messages and read receipts (#32269)
  fix: Monitors dissapearing from Unit upon edit (#32393)
  fix: Link image preview not opening in gallery (#32391)
  feat: Allow visitors & integrations to access downloaded files after a room has closed (#32439)
  regression: Users tab misaligned (#32451)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants