]> cat aescling's git repositories - mastodon.git/commitdiff
Do not override the default push notification settings (#6037)
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Sat, 19 May 2018 12:45:58 +0000 (21:45 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 19 May 2018 12:45:58 +0000 (14:45 +0200)
app/javascript/mastodon/actions/push_notifications/registerer.js

index 82fe4519a269e92e2c7089389bbd23c02236edab..b0f42b6a20e3091c1c3a7fde321c47d2a457d6b9 100644 (file)
@@ -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.');