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 @@ -390,7 +390,6 @@ const preparePromise: Promise<$ReadOnlyArray> = (async () => { const targetedNotifications = await prepareWebNotification( - userID, { notifTexts, threadID: threadInfo.id, @@ -1241,7 +1240,6 @@ platformDetails: tPlatformDetails, }); async function prepareWebNotification( - userID: string, inputData: WebNotifInputData, devices: $ReadOnlyArray, ): Promise<$ReadOnlyArray> { @@ -1260,11 +1258,9 @@ threadID, }; - const isStaffOrDev = isStaff(userID) || isDev; - const shouldBeEncrypted = - hasMinCodeVersion(convertedData.platformDetails, { - web: 43, - }) && isStaffOrDev; + const shouldBeEncrypted = hasMinCodeVersion(convertedData.platformDetails, { + web: 43, + }); if (!shouldBeEncrypted) { return devices.map(({ deviceToken }) => ({ deviceToken, notification })); 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 @@ -753,7 +753,6 @@ const isStaffOrDev = isStaff(viewer.userID) || isDev; const isWebSupportingE2ENotifs = - isStaffOrDev && viewer.platformDetails?.platform === 'web' && hasMinCodeVersion(viewer.platformDetails, { web: 43 });