feat: allow users to select notification types (#1512)

* feat: allow users to select notification types

* fix(ui): display personal notification types before management types

* fix: update allRequestsAutoApproved check to account for new REQUEST_MOVIE & REQUEST_TV perms

* fix(ui): do not display Discord notif type selector if user not eligible for any types

* refactor(ui): remove unnecessary 'enabled' checkboxes from user notif settings

* fix(ui): correct checkbox behavior

* fix: add missing return type on hasNotificationType

* refactor: remove unused isValid prop in NotificationsWebPush

* fix(ui): use SensitiveInput for users' public PGP keys

* fix(ui): add missing tip/hint for email encryption setting

* refactor(svg): use the new Discord logo

* revert(api): undo breaking change removing discordEnabled from UserSettingsNotificationsResponse

* fix(lang): update notification type descriptions for clarity

* fix(telegram): do not send users notifications of their own auto-approved requests

server/lib/notifications/agents/webpush.ts

@@ -1,6 +1,6 @@
 import { getRepository } from 'typeorm';
 import webpush from 'web-push';
-import { hasNotificationType, Notification } from '..';
+import { Notification } from '..';
 import { MediaType } from '../../../constants/media';
 import { User } from '../../../entity/User';
 import { UserPushSubscription } from '../../../entity/UserPushSubscription';
@@ -135,11 +135,8 @@ class WebPushAgent
     }
   }
 
-  public shouldSend(type: Notification): boolean {
-    if (
-      this.getSettings().enabled &&
-      hasNotificationType(type, this.getSettings().types)
-    ) {
+  public shouldSend(): boolean {
+    if (this.getSettings().enabled) {
       return true;
     }
 
@@ -150,11 +147,6 @@ class WebPushAgent
     type: Notification,
     payload: NotificationPayload
   ): Promise<boolean> {
-    logger.debug('Sending web push notification', {
-      label: 'Notifications',
-      type: Notification[type],
-      subject: payload.subject,
-    });
     const userRepository = getRepository(User);
     const userPushSubRepository = getRepository(UserPushSubscription);
     const settings = getSettings();
@@ -213,8 +205,15 @@ class WebPushAgent
         settings.vapidPrivate
       );
 
-      Promise.all(
+      await Promise.all(
         pushSubs.map(async (sub) => {
+          logger.debug('Sending web push notification', {
+            label: 'Notifications',
+            recipient: sub.user.displayName,
+            type: Notification[type],
+            subject: payload.subject,
+          });
+
           try {
             await webpush.sendNotification(
               {
@@ -230,12 +229,24 @@ class WebPushAgent
               )
             );
           } catch (e) {
+            logger.error(
+              'Error sending web push notification; removing subscription',
+              {
+                label: 'Notifications',
+                recipient: sub.user.displayName,
+                type: Notification[type],
+                subject: payload.subject,
+                errorMessage: e.message,
+              }
+            );
+
             // Failed to send notification so we need to remove the subscription
             userPushSubRepository.remove(sub);
           }
         })
       );
     }
+
     return true;
   }
 }