fix(notif/ui): Use custom application title in notifications & sign-i…

…n page (#849)
sct · Feb 5, 2021 · 38c76b5 · 38c76b5
1 parent eedadb8
commit 38c76b5
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 251 deletions.
diff --git a/server/api/plexapi.ts b/server/api/plexapi.ts
@@ -118,7 +118,7 @@ class PlexAPI {
       options: {
         identifier: settings.clientId,
         product: 'Overseerr',
-        deviceName: 'Overseerr',
+        deviceName: settings.main.applicationTitle,
         platform: 'Overseerr',
       },
     });

diff --git a/server/lib/notifications/agents/email.ts b/server/lib/notifications/agents/email.ts
@@ -36,7 +36,7 @@ class EmailAgent
 
   private async sendMediaRequestEmail(payload: NotificationPayload) {
     // This is getting main settings for the whole app
-    const applicationUrl = getSettings().main.applicationUrl;
+    const { applicationUrl, applicationTitle } = getSettings().main;
     try {
       const userRepository = getRepository(User);
       const users = await userRepository.find();
@@ -65,6 +65,7 @@ class EmailAgent
                 ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
                 : undefined,
               applicationUrl,
+              applicationTitle,
               requestType: 'New Request',
             },
           });
@@ -81,7 +82,7 @@ class EmailAgent
 
   private async sendMediaFailedEmail(payload: NotificationPayload) {
     // This is getting main settings for the whole app
-    const applicationUrl = getSettings().main.applicationUrl;
+    const { applicationUrl, applicationTitle } = getSettings().main;
     try {
       const userRepository = getRepository(User);
       const users = await userRepository.find();
@@ -111,6 +112,7 @@ class EmailAgent
                 ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
                 : undefined,
               applicationUrl,
+              applicationTitle,
               requestType: 'Failed Request',
             },
           });
@@ -127,7 +129,7 @@ class EmailAgent
 
   private async sendMediaApprovedEmail(payload: NotificationPayload) {
     // This is getting main settings for the whole app
-    const applicationUrl = getSettings().main.applicationUrl;
+    const { applicationUrl, applicationTitle } = getSettings().main;
     try {
       const email = new PreparedEmail();
 
@@ -149,6 +151,7 @@ class EmailAgent
             ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
             : undefined,
           applicationUrl,
+          applicationTitle,
           requestType: 'Request Approved',
         },
       });
@@ -164,7 +167,7 @@ class EmailAgent
 
   private async sendMediaDeclinedEmail(payload: NotificationPayload) {
     // This is getting main settings for the whole app
-    const applicationUrl = getSettings().main.applicationUrl;
+    const { applicationUrl, applicationTitle } = getSettings().main;
     try {
       const email = new PreparedEmail();
 
@@ -186,6 +189,7 @@ class EmailAgent
             ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
             : undefined,
           applicationUrl,
+          applicationTitle,
           requestType: 'Request Declined',
         },
       });
@@ -201,7 +205,7 @@ class EmailAgent
 
   private async sendMediaAvailableEmail(payload: NotificationPayload) {
     // This is getting main settings for the whole app
-    const applicationUrl = getSettings().main.applicationUrl;
+    const { applicationUrl, applicationTitle } = getSettings().main;
     try {
       const email = new PreparedEmail();
 
@@ -223,6 +227,7 @@ class EmailAgent
             ? `${applicationUrl}/${payload.media?.mediaType}/${payload.media?.tmdbId}`
             : undefined,
           applicationUrl,
+          applicationTitle,
           requestType: 'Now Available',
         },
       });
@@ -238,7 +243,7 @@ class EmailAgent
 
   private async sendTestEmail(payload: NotificationPayload) {
     // This is getting main settings for the whole app
-    const applicationUrl = getSettings().main.applicationUrl;
+    const { applicationUrl, applicationTitle } = getSettings().main;
     try {
       const email = new PreparedEmail();
 
@@ -250,6 +255,7 @@ class EmailAgent
         locals: {
           body: payload.message,
           applicationUrl,
+          applicationTitle,
         },
       });
       return true;

diff --git a/server/lib/notifications/agents/pushover.ts b/server/lib/notifications/agents/pushover.ts
@@ -66,7 +66,7 @@ class PushoverAgent
         message += `<b>Status</b>\nProcessing Request\n`;
         break;
       case Notification.MEDIA_AVAILABLE:
-        messageTitle = 'Now available!';
+        messageTitle = 'Now Available';
         message += `${title}\n\n`;
         message += `${plot}\n\n`;
         message += `<b>Requested By</b>\n${username}\n\n`;
@@ -81,15 +81,14 @@ class PushoverAgent
         break;
       case Notification.TEST_NOTIFICATION:
         messageTitle = 'Test Notification';
-        message += `${title}\n\n`;
         message += `${plot}\n\n`;
         message += `<b>Requested By</b>\n${username}\n`;
         break;
     }
 
     if (settings.main.applicationUrl && payload.media) {
       const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
-      message += `<a href="${actionUrl}">Open in Overseerr</a>`;
+      message += `<a href="${actionUrl}">Open in ${settings.main.applicationTitle}</a>`;
     }
 
     return { title: messageTitle, message };

diff --git a/server/lib/notifications/agents/slack.ts b/server/lib/notifications/agents/slack.ts
@@ -191,7 +191,7 @@ class SlackAgent
             value: 'open_overseerr',
             text: {
               type: 'plain_text',
-              text: 'Open Overseerr',
+              text: `Open ${settings.main.applicationTitle}`,
             },
           },
         ],

diff --git a/server/lib/notifications/agents/telegram.ts b/server/lib/notifications/agents/telegram.ts
@@ -98,7 +98,7 @@ class TelegramAgent
 
     if (settings.main.applicationUrl && payload.media) {
       const actionUrl = `${settings.main.applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
-      message += `\[Open in Overseerr\]\(${actionUrl}\)`;
+      message += `\[Open in ${settings.main.applicationTitle}\]\(${actionUrl}\)`;
     }
     /* eslint-enable */
 

diff --git a/server/templates/email/media-request/html.pug b/server/templates/email/media-request/html.pug
@@ -54,7 +54,7 @@ div(role='article' aria-roledescription='email' aria-label='' lang='en')
               color: #a8aaaf;\
               text-decoration: none;\
               ')
-                | Overseerr
+                | #{applicationTitle}
           tr
             td(style='width: 100%' width='100%')
               table.sm-w-full(align='center' style='\
@@ -92,7 +92,7 @@ div(role='article' aria-roledescription='email' aria-label='' lang='en')
         margin-bottom: 20px;\
         color: #51545e;\
         ')
-          a(href=actionUrl style='color: #3869d4') Open Media in Overseerr
+          a(href=actionUrl style='color: #3869d4') Open in #{applicationTitle}
 tr
   td
     table.sm-w-full(align='center' style='\
@@ -111,4 +111,4 @@ tr
           text-align: center;\
           color: #a8aaaf;\
           ')
-            | Overseerr.
+            | #{applicationTitle}