Skip to content

[SER-2840] Use Android specific content for Huawei messages #7375

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

Merged
cihadtekin merged 2 commits into from
Mar 13, 2026
Merged

[SER-2840] Use Android specific content for Huawei messages #7375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed47ca6
[push] Use Android specific content for Huawei messages
Mar 12, 2026
66fa570
Merge branch 'master' into SER-2840-apply-android-platform-settings-t…
cihadtekin Mar 13, 2026
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
9 changes: 6 additions & 3 deletions plugins/push/api/send/data/message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,19 +382,22 @@ class Message extends Mongoable {

/**
* Filter contents for given lang-platform combination
*
*
* @param {Content[]|object[]} contents array of contents to filter
* @param {string} p platform key
* @param {string} la language key
* @returns {Content[]} array of contents which are applicable for this p/l case
*/
static filterContents(contents, p, la) {
return (contents || []).filter(c => (!p || (!c.p || c.p === p)) && (!la || (!c.la || c.la === la)));
return (contents || []).filter(
c => (!p || (!c.p || c.p === p || (c.p === "a" && p === "h")))
&& (!la || (!c.la || c.la === la))
);
}

/**
* Get Content instance by p & l given. `content()` returns default content.
*
*
* @param {string} p platform key
* @param {string} la language key
* @returns {Content|undefined} Content instance if one with given p & l exists or undefined
Expand Down
Loading