Page MenuHomePhabricator
Files F3401956

D10482.diff
No OneTemporary
Actions

D10482.diff
View Options

diff --git a/keyserver/src/push/send.js b/keyserver/src/push/send.js
--- a/keyserver/src/push/send.js
+++ b/keyserver/src/push/send.js
@@ -311,7 +311,6 @@
const preparePromise: Promise<$ReadOnlyArray<PreparePushResult>> =
(async () => {
const targetedNotifications = await prepareAPNsNotification(
- userID,
{
notifTexts,
newRawMessageInfos: shimmedNewRawMessageInfos,
@@ -430,7 +429,6 @@
const preparePromise: Promise<$ReadOnlyArray<PreparePushResult>> =
(async () => {
const targetedNotifications = await prepareAPNsNotification(
- userID,
{
notifTexts,
newRawMessageInfos: shimmedNewRawMessageInfos,
@@ -903,7 +901,6 @@
platformDetails: tPlatformDetails,
});
async function prepareAPNsNotification(
- userID: string,
inputData: APNsNotifInputData,
devices: $ReadOnlyArray<NotificationTargetDevice>,
): Promise<$ReadOnlyArray<TargetedAPNsNotification>> {
@@ -939,9 +936,7 @@
(isNonCollapsibleTextNotification &&
canDecryptNonCollapsibleTextIOSNotifs));
- const isStaffOrDev = isStaff(userID) || isDev;
const canDecryptMacOSNotifs =
- isStaffOrDev &&
platformDetails.platform === 'macos' &&
hasMinCodeVersion(platformDetails, {
web: 47,
@@ -1764,13 +1759,10 @@
notification.badge = unreadCount;
notification.pushType = 'alert';
const preparePromise: Promise<PreparePushResult[]> = (async () => {
- const isStaffOrDev = isStaff(userID) || isDev;
- const shouldBeEncrypted =
- isStaffOrDev &&
- hasMinCodeVersion(viewer.platformDetails, {
- web: 47,
- majorDesktop: 9,
- });
+ const shouldBeEncrypted = hasMinCodeVersion(viewer.platformDetails, {
+ web: 47,
+ majorDesktop: 9,
+ });
let targetedNotifications: $ReadOnlyArray<TargetedAPNsNotification>;
if (shouldBeEncrypted) {
const notificationsArray = await prepareEncryptedAPNsNotifications(
diff --git a/keyserver/src/session/cookies.js b/keyserver/src/session/cookies.js
--- a/keyserver/src/session/cookies.js
+++ b/keyserver/src/session/cookies.js
@@ -757,7 +757,6 @@
hasMinCodeVersion(viewer.platformDetails, { web: 43 });
const isMacOSSupportingE2ENotifs =
- isStaffOrDev &&
viewer.platformDetails?.platform === 'macos' &&
hasMinCodeVersion(viewer.platformDetails, { web: 43, majorDesktop: 9 });

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 3, 2:41 PM (22 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2612041
Default Alt Text
D10482.diff (2 KB)

Event Timeline