Start accounting for notificationPreferences in the unread indicator for Chat Rooms

desktop/main.js

@@ -240,7 +240,15 @@ const mainWindow = (() => {
             // Listen to badge updater event emitted by the render process
             // and update the app badge count (MacOS only)
             ipcMain.on(ELECTRON_EVENTS.REQUEST_UPDATE_BADGE_COUNT, (event, totalCount) => {
-                app.setBadgeCount(totalCount);
+                if (totalCount === -1) {
+                    // The electron docs say you should be able to update this and pass no parameters to set the badge
+                    // to a single red dot, but in practice it resulted in an error "TypeError: Insufficient number of
+                    // arguments." - Thus, setting to 1 instead.
+                    // See: https://www.electronjs.org/docs/api/app#appsetbadgecountcount-linux-macos
+                    app.setBadgeCount(1);
+                } else {
+                    app.setBadgeCount(totalCount);
+                }
             });
 
             return browserWindow;

src/libs/UnreadIndicatorUpdater/index.js

@@ -1,6 +1,7 @@
 import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
+import CONST from '../../CONST';
 import updateUnread from './updateUnread';
 
 // Stash the unread action counts for each report
@@ -11,7 +12,14 @@ const unreadActionCounts = {};
  * and Mac OS or iOS dock icon with an unread indicator.
  */
 const throttledUpdatePageTitleAndUnreadCount = _.throttle(() => {
-    const totalCount = _.reduce(unreadActionCounts, (total, reportCount) => total + reportCount, 0);
+    // If all of our nonzero unread action counts show -1, update the unread count to be -1 as well so we don't show a
+    // number in the indicator badge.
+    if (_.every(unreadActionCounts, count => count < 1) && _.some(unreadActionCounts, count => count === -1)) {
+        updateUnread(-1);
+        return;
+    }
+
+    const totalCount = _.reduce(unreadActionCounts, (total, reportCount) => total + Math.max(reportCount, 0), 0);
     updateUnread(totalCount);
 }, 1000, {leading: false});
 
@@ -29,7 +37,17 @@ function listenForReportChanges() {
                 return;
             }
 
-            unreadActionCounts[report.reportID] = report.unreadActionCount || 0;
+            if (report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.MUTE) {
+                return;
+            }
+
+            // An unreadActionCount of -1 signifies that we should show a badge icon with no number
+            if (report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.DAILY
+                && report.unreadActionCount > 0) {
+                unreadActionCounts[report.reportID] = -1;
+            } else {
+                unreadActionCounts[report.reportID] = report.unreadActionCount || 0;
+            }
             throttledUpdatePageTitleAndUnreadCount();
         },
     });

src/libs/UnreadIndicatorUpdater/updateUnread/index.ios.js

@@ -7,7 +7,11 @@ import {UrbanAirship} from 'urbanairship-react-native';
  * @param {Number} totalCount
  */
 function updateUnread(totalCount) {
-    UrbanAirship.setBadgeNumber(totalCount);
+    if (totalCount === -1) {
+        UrbanAirship.setBadgeNumber(1);
+    } else {
+        UrbanAirship.setBadgeNumber(totalCount);
+    }
 }
 
 export default updateUnread;

src/libs/UnreadIndicatorUpdater/updateUnread/index.website.js

@@ -9,7 +9,7 @@ import CONFIG from '../../../CONFIG';
  * @param {Number} totalCount
  */
 function updateUnread(totalCount) {
-    const hasUnread = totalCount > 0;
+    const hasUnread = totalCount !== 0;
     document.title = hasUnread ? `(NEW!) ${CONFIG.SITE_TITLE}` : CONFIG.SITE_TITLE;
     document.getElementById('favicon').href = hasUnread ? CONFIG.FAVICON.UNREAD : CONFIG.FAVICON.DEFAULT;
 }