Skip to content

Conversation

@abhinavkrin
Copy link
Member

@abhinavkrin abhinavkrin commented Jun 4, 2025

Proposed changes (including videos or screenshots)

This PR resolves an issue where the Show Message in Notification and Show Channel/Group/Username in Notification settings were not respected in desktop notifications.

Key updates:

  • Notification content now dynamically adheres to these privacy settings.
  • Even when titles and message content are omitted, users are correctly redirected to the intended room using the room ID.
  • Added support across all room types (channels, private groups, DMs, VoIP, and Livechat).
  • Added comprehensive tests to validate different combinations of privacy settings.
Screen.Recording.2025-06-05.at.11.02.59.PM.mov

Issue(s)

Steps to test or reproduce

  1. Go to Administration > Workspace > Settings > Push > Privacy.
  2. Disable one or both of:
    • Show Message in Notification
    • Show Channel/Group/Username in Notification
  3. Trigger a message to a user.
  4. Confirm the notification respects the settings (no content shown if disabled).
  5. Click the notification and confirm the app navigates to the correct room.

Further comments

SUP-781

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>
@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jun 4, 2025

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

@changeset-bot
Copy link

changeset-bot bot commented Jun 4, 2025

🦋 Changeset detected

Latest commit: b644f4d

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

This PR includes changesets to release 37 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/http-router 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/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip 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

@github-actions
Copy link
Contributor

github-actions bot commented Jun 4, 2025

PR Preview Action v1.6.1

🚀 View preview at
https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-36156/

Built to branch gh-pages at 2025-06-18 11:09 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@codecov
Copy link

codecov bot commented Jun 4, 2025

Codecov Report

Attention: Patch coverage is 90.55118% with 12 lines in your changes missing coverage. Please review.

Project coverage is 64.37%. Comparing base (3779de0) to head (b644f4d).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #36156      +/-   ##
===========================================
- Coverage    64.39%   64.37%   -0.02%     
===========================================
  Files         3142     3145       +3     
  Lines       104891   105141     +250     
  Branches     19791    20007     +216     
===========================================
+ Hits         67543    67689     +146     
- Misses       34667    34761      +94     
- Partials      2681     2691      +10     
Flag Coverage Δ
e2e 57.65% <0.00%> (-0.02%) ⬇️
unit 68.84% <93.49%> (-0.14%) ⬇️

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>
@abhinavkrin abhinavkrin added this to the 7.8.0 milestone Jun 5, 2025
@abhinavkrin abhinavkrin marked this pull request as ready for review June 5, 2025 17:36
@abhinavkrin abhinavkrin requested review from a team as code owners June 5, 2025 17:36
Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>
Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

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

Front-End LGTM!

@scuciatto scuciatto added the stat: QA assured Means it has been tested and approved by a company insider label Jun 18, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 18, 2025
@kodiakhq kodiakhq bot merged commit d2ac7f0 into develop Jun 18, 2025
49 checks passed
@kodiakhq kodiakhq bot deleted the fix/desktop-notifications-not-respecting-privacy-settings branch June 18, 2025 11:54
This was referenced Jun 20, 2025
abhinavkrin added a commit that referenced this pull request Jul 22, 2025
abhinavkrin added a commit that referenced this pull request Jul 23, 2025
abhinavkrin added a commit that referenced this pull request Jul 23, 2025
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