chore(release): 1.33.1

Release

.github/workflows/release.yml

@@ -9,6 +9,8 @@ jobs:
   semantic-release:
     name: Tag and release latest version
     runs-on: ubuntu-20.04
+    env:
+      HUSKY: 0
     steps:
       - name: Checkout
         uses: actions/checkout@v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "overseerr",
-  "version": "0.1.0",
+  "version": "1.33.1",
   "private": true,
   "scripts": {
     "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",

public/sw.js

@@ -109,25 +109,6 @@ self.addEventListener('push', (event) => {
     );
   }
 
-  //Set the badge with the amount of pending requests
-  //Only update the badge if the payload confirms they are the admin
-  if (
-    (payload.notificationType === 'MEDIA_APPROVED' ||
-      payload.notificationType === 'MEDIA_DECLINED') &&
-    payload.isAdmin
-  ) {
-    if ('setAppBadge' in navigator) {
-      navigator.setAppBadge(payload.pendingRequestsCount);
-    }
-    return;
-  }
-
-  if (payload.notificationType === 'MEDIA_PENDING') {
-    if ('setAppBadge' in navigator) {
-      navigator.setAppBadge(payload.pendingRequestsCount);
-    }
-  }
-
   event.waitUntil(
     self.registration.showNotification(payload.subject, options)
   );
@@ -147,7 +128,7 @@ self.addEventListener('notificationclick', (event) => {
       method: 'POST',
     });
   }
-
+  
   if (notificationData.actionUrl) {
     clients.openWindow(notificationData.actionUrl);
   }

server/lib/notifications/agents/agent.ts

@@ -19,8 +19,6 @@ export interface NotificationPayload {
   request?: MediaRequest;
   issue?: Issue;
   comment?: IssueComment;
-  pendingRequestsCount?: number;
-  isAdmin?: boolean;
 }
 
 export abstract class BaseAgent<T extends NotificationAgentConfig> {

server/lib/notifications/agents/webpush.ts

@@ -1,7 +1,6 @@
 import { IssueType, IssueTypeName } from '@server/constants/issue';
-import { MediaRequestStatus, MediaType } from '@server/constants/media';
+import { MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
-import MediaRequest from '@server/entity/MediaRequest';
 import { User } from '@server/entity/User';
 import { UserPushSubscription } from '@server/entity/UserPushSubscription';
 import type { NotificationAgentConfig } from '@server/lib/settings';
@@ -20,8 +19,6 @@ interface PushNotificationPayload {
   actionUrl?: string;
   actionUrlTitle?: string;
   requestId?: number;
-  pendingRequestsCount?: number;
-  isAdmin?: boolean;
 }
 
 class WebPushAgent
@@ -132,8 +129,6 @@ class WebPushAgent
       requestId: payload.request?.id,
       actionUrl,
       actionUrlTitle,
-      pendingRequestsCount: payload.pendingRequestsCount,
-      isAdmin: payload.isAdmin,
     };
   }
 
@@ -157,51 +152,6 @@ class WebPushAgent
 
     const mainUser = await userRepository.findOne({ where: { id: 1 } });
 
-    const requestRepository = getRepository(MediaRequest);
-
-    const pendingRequests = await requestRepository.find({
-      where: { status: MediaRequestStatus.PENDING },
-    });
-
-    const webPushNotification = async (
-      pushSub: UserPushSubscription,
-      notificationPayload: Buffer
-    ) => {
-      logger.debug('Sending web push notification', {
-        label: 'Notifications',
-        recipient: pushSub.user.displayName,
-        type: Notification[type],
-        subject: payload.subject,
-      });
-
-      try {
-        await webpush.sendNotification(
-          {
-            endpoint: pushSub.endpoint,
-            keys: {
-              auth: pushSub.auth,
-              p256dh: pushSub.p256dh,
-            },
-          },
-          notificationPayload
-        );
-      } catch (e) {
-        logger.error(
-          'Error sending web push notification; removing subscription',
-          {
-            label: 'Notifications',
-            recipient: pushSub.user.displayName,
-            type: Notification[type],
-            subject: payload.subject,
-            errorMessage: e.message,
-          }
-        );
-
-        // Failed to send notification so we need to remove the subscription
-        userPushSubRepository.remove(pushSub);
-      }
-    };
-
     if (
       payload.notifyUser &&
       // Check if user has webpush notifications enabled and fallback to true if undefined
@@ -219,11 +169,7 @@ class WebPushAgent
       pushSubs.push(...notifySubs);
     }
 
-    if (
-      payload.notifyAdmin ||
-      type === Notification.MEDIA_APPROVED ||
-      type === Notification.MEDIA_DECLINED
-    ) {
+    if (payload.notifyAdmin) {
       const users = await userRepository.find();
 
       const manageUsers = users.filter(
@@ -246,42 +192,7 @@ class WebPushAgent
         })
         .getMany();
 
-      //We only want to send the custom notification when type is approved or declined
-      //Otherwise, default to the normal notification
-      if (
-        type === Notification.MEDIA_APPROVED ||
-        type === Notification.MEDIA_DECLINED
-      ) {
-        if (mainUser && allSubs.length > 0) {
-          webpush.setVapidDetails(
-            `mailto:${mainUser.email}`,
-            settings.vapidPublic,
-            settings.vapidPrivate
-          );
-
-          //Custom payload only for updating the app badge
-          const notificationBadgePayload = Buffer.from(
-            JSON.stringify(
-              this.getNotificationPayload(type, {
-                subject: payload.subject,
-                notifySystem: false,
-                notifyAdmin: true,
-                isAdmin: true,
-                pendingRequestsCount: pendingRequests.length,
-              })
-            ),
-            'utf-8'
-          );
-
-          await Promise.all(
-            allSubs.map(async (sub) => {
-              webPushNotification(sub, notificationBadgePayload);
-            })
-          );
-        }
-      } else {
-        pushSubs.push(...allSubs);
-      }
+      pushSubs.push(...allSubs);
     }
 
     if (mainUser && pushSubs.length > 0) {
@@ -291,10 +202,6 @@ class WebPushAgent
         settings.vapidPrivate
       );
 
-      if (type === Notification.MEDIA_PENDING) {
-        payload = { ...payload, pendingRequestsCount: pendingRequests.length };
-      }
-
       const notificationPayload = Buffer.from(
         JSON.stringify(this.getNotificationPayload(type, payload)),
         'utf-8'
@@ -302,7 +209,39 @@ class WebPushAgent
 
       await Promise.all(
         pushSubs.map(async (sub) => {
-          webPushNotification(sub, notificationPayload);
+          logger.debug('Sending web push notification', {
+            label: 'Notifications',
+            recipient: sub.user.displayName,
+            type: Notification[type],
+            subject: payload.subject,
+          });
+
+          try {
+            await webpush.sendNotification(
+              {
+                endpoint: sub.endpoint,
+                keys: {
+                  auth: sub.auth,
+                  p256dh: sub.p256dh,
+                },
+              },
+              notificationPayload
+            );
+          } 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);
+          }
         })
       );
     }

src/pages/_app.tsx

@@ -11,7 +11,6 @@ import { LanguageContext } from '@app/context/LanguageContext';
 import { SettingsProvider } from '@app/context/SettingsContext';
 import { UserContext } from '@app/context/UserContext';
 import type { User } from '@app/hooks/useUser';
-import { Permission, useUser } from '@app/hooks/useUser';
 import '@app/styles/globals.css';
 import { polyfillIntl } from '@app/utils/polyfillIntl';
 import type { PublicSettingsResponse } from '@server/interfaces/api/settingsInterfaces';
@@ -114,30 +113,6 @@ const CoreApp: Omit<NextAppComponentType, 'origGetInitialProps'> = ({
     loadLocaleData(currentLocale).then(setMessages);
   }, [currentLocale]);
 
-  const { hasPermission } = useUser();
-
-  useEffect(() => {
-    const requestsCount = async () => {
-      const response = await axios.get('/api/v1/request/count');
-      return response.data;
-    };
-
-    //Set navigator to new variable with any type to prevent setAppBadge unknown error since it does actually exist on navigator
-    //eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const newNavigator: any = navigator;
-
-    if ('setAppBadge' in navigator) {
-      if (
-        !router.pathname.match(/(login|setup|resetpassword)/) &&
-        hasPermission(Permission.ADMIN)
-      ) {
-        requestsCount().then((data) => newNavigator.setAppBadge(data.pending));
-      } else {
-        newNavigator.clearAppBadge();
-      }
-    }
-  }, [hasPermission, router.pathname]);
-
   if (router.pathname.match(/(login|setup|resetpassword)/)) {
     component = <Component {...pageProps} />;
   } else {