From 69381663eb9407f93e96b739290325e4cac34945 Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Fri, 15 Oct 2021 08:45:55 -0500
Subject: [PATCH] REVERT: "DEV: APIs to disable PWA badging and unsubscribe
 from user notifications (#14595)" (#14620)

This reverts commit e1d317566827bab78a1a34da8172834e31f5b7c1.
---
 .../javascripts/discourse/app/initializers/badging.js | 11 ++---------
 .../app/initializers/subscribe-user-notifications.js  |  9 ---------
 .../javascripts/discourse/app/lib/plugin-api.js       | 10 ----------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/initializers/badging.js b/app/assets/javascripts/discourse/app/initializers/badging.js
index 41291d9adf..73c90b0aa1 100644
--- a/app/assets/javascripts/discourse/app/initializers/badging.js
+++ b/app/assets/javascripts/discourse/app/initializers/badging.js
@@ -1,19 +1,12 @@
 // Updates the PWA badging if available
-
-let defaultBadgingDisabled = false;
-export function disableDefaultBadging() {
-  defaultBadgingDisabled = true;
-}
-
 export default {
   name: "badging",
   after: "message-bus",
 
   initialize(container) {
-    // must have the Badging API
-    if (defaultBadgingDisabled || !navigator.setAppBadge) {
+    if (!navigator.setAppBadge) {
       return;
-    }
+    } // must have the Badging API
 
     const user = container.lookup("current-user:main");
     if (!user) {
diff --git a/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js b/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
index 43f19daf52..2381e0886e 100644
--- a/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
+++ b/app/assets/javascripts/discourse/app/initializers/subscribe-user-notifications.js
@@ -13,20 +13,11 @@ import {
 } from "discourse/lib/push-notifications";
 import { isTesting } from "discourse-common/config/environment";
 
-let subscribeToNotifications = true;
-export function unsubscribeFromNotifications() {
-  subscribeToNotifications = false;
-}
-
 export default {
   name: "subscribe-user-notifications",
   after: "message-bus",
 
   initialize(container) {
-    if (!subscribeToNotifications) {
-      return;
-    }
-
     const user = container.lookup("current-user:main");
     const bus = container.lookup("message-bus:main");
     const appEvents = container.lookup("service:app-events");
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js
index 059492bc12..477675607e 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.js
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js
@@ -90,8 +90,6 @@ import {
   addSearchSuggestion,
 } from "discourse/widgets/search-menu-results";
 import { CUSTOM_USER_SEARCH_OPTIONS } from "select-kit/components/user-chooser";
-import { unsubscribeFromNotifications } from "discourse/initializers/subscribe-user-notifications";
-import { disableDefaultBadging } from "discourse/initializers/badging";
 import { downloadCalendar } from "discourse/lib/download-calendar";
 
 // If you add any methods to the API ensure you bump up this number
@@ -1513,14 +1511,6 @@ class PluginApi {
       { ignoreMissing: true }
     );
   }
-  // Stops the subscribe-user-notifications initializer from listening to notifications
-  unsubscribeFromNotifications() {
-    unsubscribeFromNotifications();
-  }
-  // Stops the badging initializer from updating the PWA badge with the user's notification count
-  disableDefaultBadging() {
-    disableDefaultBadging();
-  }
 
   /**
    * Support for customizing the composer text. By providing a callback. Callbacks should