about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2018-05-19 21:45:58 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-05-19 14:45:58 +0200
commit1951ff41b33b264fd8179998648c3cbbf2834cd5 (patch)
tree644e362fa2064f021ac0399886ea425ca6316b72
parent138512d20414de5782deca515b35d1d4f5406e1c (diff)
Do not override the default push notification settings (#6037)
-rw-r--r--app/javascript/mastodon/actions/push_notifications/registerer.js7
1 files changed, 0 insertions, 7 deletions
diff --git a/app/javascript/mastodon/actions/push_notifications/registerer.js b/app/javascript/mastodon/actions/push_notifications/registerer.js
index 82fe4519a..b0f42b6a2 100644
--- a/app/javascript/mastodon/actions/push_notifications/registerer.js
+++ b/app/javascript/mastodon/actions/push_notifications/registerer.js
@@ -51,13 +51,6 @@ export function register () {
   return (dispatch, getState) => {
     dispatch(setBrowserSupport(supportsPushNotifications));
 
-    if (me && !pushNotificationsSetting.get(me)) {
-      const alerts = getState().getIn(['push_notifications', 'alerts']);
-      if (alerts) {
-        pushNotificationsSetting.set(me, { alerts: alerts });
-      }
-    }
-
     if (supportsPushNotifications) {
       if (!getApplicationServerKey()) {
         console.error('The VAPID public key is not set. You will not be able to receive Web Push Notifications.');