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.

Sign up for GitHub

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: Encrypted push notification missing message.content #33377

Merged
merged 9 commits into from
Oct 16, 2024
Merged

fix: Encrypted push notification missing message.content #33377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7dca7f8
Add message.content to encrypted push
diegolmello Sep 26, 2024
8e9ea5d
Create cool-dryers-judge.md
hugocostadev Sep 26, 2024
ce39a95
Merge branch 'develop' into fix.encrypted-push-content
kodiakhq[bot] Sep 26, 2024
961ec1c
Merge branch 'develop' into fix.encrypted-push-content
hugocostadev Sep 27, 2024
e13e94d
Merge branch 'develop' into fix.encrypted-push-content
hugocostadev Oct 2, 2024
3f1e134
Merge branch 'develop' into fix.encrypted-push-content
KevLehman Oct 14, 2024
6b1688c
Merge branch 'develop' into fix.encrypted-push-content
Dnouv Oct 16, 2024
733f135
Merge branch 'develop' into fix.encrypted-push-content
kodiakhq[bot] Oct 16, 2024
d5a37ff
Merge branch 'develop' into fix.encrypted-push-content
kodiakhq[bot] Oct 16, 2024
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/cool-dryers-judge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Send messages with encrypted attachments to mobile notification service
2 changes: 1 addition & 1 deletion apps/meteor/app/lib/server/functions/notifications/mobile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export async function getPushData({
name: settings.get('Push_show_username_room') ? room.name : '',
messageType: message.t,
tmid: message.tmid,
...(message.t === 'e2e' && { msg: message.msg }),
...(message.t === 'e2e' && { msg: message.msg, content: message.content }),
},
roomName:
settings.get('Push_show_username_room') && roomCoordinator.getRoomDirectives(room.t).isGroupChat(room)
Expand Down
Loading