From 851e7c7f5c071db7f77a064d2b35b2fadeb67a06 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Wed, 5 Jan 2022 15:13:02 -0800
Subject: [PATCH] Enable notifications for disappearing messages on macOS
 12.0.1 and above

Co-authored-by: Scott Nonnenberg <scott@signal.org>
---
 ts/services/notifications.ts | 5 ++---
 ts/types/Settings.ts         | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ts/services/notifications.ts b/ts/services/notifications.ts
index 0f8fa580e..e1288198e 100644
--- a/ts/services/notifications.ts
+++ b/ts/services/notifications.ts
@@ -7,6 +7,7 @@ import { Sound } from '../util/Sound';
 import {
   AudioNotificationSupport,
   getAudioNotificationSupport,
+  shouldHideExpiringMessageBody,
 } from '../types/Settings';
 import * as OS from '../OS';
 import * as log from '../logging/log';
@@ -284,9 +285,7 @@ class NotificationService extends EventEmitter {
         notificationTitle = senderTitle;
         ({ notificationIconUrl } = notificationData);
 
-        const shouldHideExpiringMessageBody =
-          isExpiringMessage && (OS.isMacOS() || OS.isWindows());
-        if (shouldHideExpiringMessageBody) {
+        if (isExpiringMessage && shouldHideExpiringMessageBody()) {
           notificationMessage = i18n('newMessage');
         } else if (userSetting === NotificationSetting.NameOnly) {
           if (reaction) {
diff --git a/ts/types/Settings.ts b/ts/types/Settings.ts
index 44e1d0006..eeda0c576 100644
--- a/ts/types/Settings.ts
+++ b/ts/types/Settings.ts
@@ -1,6 +1,9 @@
 // Copyright 2018-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
+import semver from 'semver';
+import os from 'os';
+
 import * as OS from '../OS';
 import { isProduction } from '../util/version';
 
@@ -61,3 +64,6 @@ export const isSystemTraySupported = (appVersion: string): boolean =>
 
 export const isAutoDownloadUpdatesSupported = (): boolean =>
   OS.isWindows() || OS.isMacOS();
+
+export const shouldHideExpiringMessageBody = (): boolean =>
+  OS.isWindows() || (OS.isMacOS() && semver.lt(os.release(), '21.1.0'));