Merge branch 'develop' into fix-scaling-of-collection-names

.all-contributorsrc

@@ -908,6 +908,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "j0srisk",
+      "name": "Joseph Risk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
+      "profile": "http://josephrisk.com",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",

README.md

@@ -11,7 +11,7 @@
 <a href="https://hosted.weblate.org/engage/overseerr/"><img src="https://hosted.weblate.org/widgets/overseerr/-/overseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/sct/overseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/sct/overseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-99-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-100-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -202,6 +202,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/RemiRigal"><img src="https://avatars.githubusercontent.com/u/19256051?v=4?s=100" width="100px;" alt="RemiRigal"/><br /><sub><b>RemiRigal</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=RemiRigal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=j0srisk" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

server/lib/notifications/agents/pushover.ts

@@ -14,7 +14,12 @@ import {
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
 
-interface PushoverPayload {
+interface PushoverImagePayload {
+  attachment_base64: string;
+  attachment_type: string;
+}
+
+interface PushoverPayload extends PushoverImagePayload {
   token: string;
   user: string;
   title: string;
@@ -43,10 +48,36 @@ class PushoverAgent
     return true;
   }
 
-  private getNotificationPayload(
+  private async getImagePayload(
+    imageUrl: string
+  ): Promise<Partial<PushoverImagePayload>> {
+    try {
+      const response = await axios.get(imageUrl, {
+        responseType: 'arraybuffer',
+      });
+      const base64 = Buffer.from(response.data, 'binary').toString('base64');
+      const contentType = (
+        response.headers['Content-Type'] || response.headers['content-type']
+      )?.toString();
+
+      return {
+        attachment_base64: base64,
+        attachment_type: contentType,
+      };
+    } catch (e) {
+      logger.error('Error getting image payload', {
+        label: 'Notifications',
+        errorMessage: e.message,
+        response: e.response?.data,
+      });
+      return {};
+    }
+  }
+
+  private async getNotificationPayload(
     type: Notification,
     payload: NotificationPayload
-  ): Partial<PushoverPayload> {
+  ): Promise<Partial<PushoverPayload>> {
     const { applicationUrl, applicationTitle } = getSettings().main;
 
     const title = payload.event ?? payload.subject;
@@ -122,6 +153,16 @@ class PushoverAgent
       ? `View ${payload.issue ? 'Issue' : 'Media'} in ${applicationTitle}`
       : undefined;
 
+    let attachment_base64;
+    let attachment_type;
+    if (payload.image) {
+      const imagePayload = await this.getImagePayload(payload.image);
+      if (imagePayload.attachment_base64 && imagePayload.attachment_type) {
+        attachment_base64 = imagePayload.attachment_base64;
+        attachment_type = imagePayload.attachment_type;
+      }
+    }
+
     return {
       title,
       message,
@@ -129,6 +170,8 @@ class PushoverAgent
       url_title,
       priority,
       html: 1,
+      attachment_base64,
+      attachment_type,
     };
   }
 
@@ -138,7 +181,10 @@ class PushoverAgent
   ): Promise<boolean> {
     const settings = this.getSettings();
     const endpoint = 'https://api.pushover.net/1/messages.json';
-    const notificationPayload = this.getNotificationPayload(type, payload);
+    const notificationPayload = await this.getNotificationPayload(
+      type,
+      payload
+    );
 
     // Send system notification
     if (

server/routes/collection.ts

@@ -12,7 +12,7 @@ collectionRoutes.get<{ id: string }>('/:id', async (req, res, next) => {
   try {
     const collection = await tmdb.getCollection({
       collectionId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getRelatedMedia(

server/routes/discover.ts

@@ -164,7 +164,7 @@ discoverRoutes.get<{ language: string }>(
 
       const data = await tmdb.getDiscoverMovies({
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
         originalLanguage: req.params.language,
       });
 
@@ -208,7 +208,7 @@ discoverRoutes.get<{ genreId: string }>(
 
     try {
       const genres = await tmdb.getMovieGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
       });
 
       const genre = genres.find(
@@ -221,7 +221,7 @@ discoverRoutes.get<{ genreId: string }>(
 
       const data = await tmdb.getDiscoverMovies({
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
         genre: req.params.genreId as string,
       });
 
@@ -268,7 +268,7 @@ discoverRoutes.get<{ studioId: string }>(
 
       const data = await tmdb.getDiscoverMovies({
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
         studio: req.params.studioId as string,
       });
 
@@ -317,7 +317,7 @@ discoverRoutes.get('/movies/upcoming', async (req, res, next) => {
   try {
     const data = await tmdb.getDiscoverMovies({
       page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
       primaryReleaseDateGte: date,
     });
 
@@ -440,7 +440,7 @@ discoverRoutes.get<{ language: string }>(
 
       const data = await tmdb.getDiscoverTv({
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
         originalLanguage: req.params.language,
       });
 
@@ -484,7 +484,7 @@ discoverRoutes.get<{ genreId: string }>(
 
     try {
       const genres = await tmdb.getTvGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
       });
 
       const genre = genres.find(
@@ -497,7 +497,7 @@ discoverRoutes.get<{ genreId: string }>(
 
       const data = await tmdb.getDiscoverTv({
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
         genre: req.params.genreId,
       });
 
@@ -544,7 +544,7 @@ discoverRoutes.get<{ networkId: string }>(
 
       const data = await tmdb.getDiscoverTv({
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
         network: Number(req.params.networkId),
       });
 
@@ -593,7 +593,7 @@ discoverRoutes.get('/tv/upcoming', async (req, res, next) => {
   try {
     const data = await tmdb.getDiscoverTv({
       page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
       firstAirDateGte: date,
     });
 
@@ -632,7 +632,7 @@ discoverRoutes.get('/trending', async (req, res, next) => {
   try {
     const data = await tmdb.getAllTrending({
       page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getRelatedMedia(
@@ -686,7 +686,7 @@ discoverRoutes.get<{ keywordId: string }>(
       const data = await tmdb.getMoviesByKeyword({
         keywordId: Number(req.params.keywordId),
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
       });
 
       const media = await Media.getRelatedMedia(
@@ -730,7 +730,7 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
       const mappedGenres: GenreSliderItem[] = [];
 
       const genres = await tmdb.getMovieGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
       });
 
       await Promise.all(
@@ -774,7 +774,7 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
       const mappedGenres: GenreSliderItem[] = [];
 
       const genres = await tmdb.getTvGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
       });
 
       await Promise.all(

server/routes/index.ts

@@ -235,7 +235,7 @@ router.get('/genres/movie', isAuthenticated(), async (req, res, next) => {
 
   try {
     const genres = await tmdb.getMovieGenres({
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     return res.status(200).json(genres);
@@ -256,7 +256,7 @@ router.get('/genres/tv', isAuthenticated(), async (req, res, next) => {
 
   try {
     const genres = await tmdb.getTvGenres({
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     return res.status(200).json(genres);

server/routes/movie.ts

@@ -17,7 +17,7 @@ movieRoutes.get('/:id', async (req, res, next) => {
   try {
     const tmdbMovie = await tmdb.getMovie({
       movieId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);
@@ -43,7 +43,7 @@ movieRoutes.get('/:id/recommendations', async (req, res, next) => {
     const results = await tmdb.getMovieRecommendations({
       movieId: Number(req.params.id),
       page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getRelatedMedia(
@@ -84,7 +84,7 @@ movieRoutes.get('/:id/similar', async (req, res, next) => {
     const results = await tmdb.getMovieSimilar({
       movieId: Number(req.params.id),
       page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getRelatedMedia(

server/routes/person.ts

@@ -16,7 +16,7 @@ personRoutes.get('/:id', async (req, res, next) => {
   try {
     const person = await tmdb.getPerson({
       personId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
     return res.status(200).json(mapPersonDetails(person));
   } catch (e) {
@@ -38,7 +38,7 @@ personRoutes.get('/:id/combined_credits', async (req, res, next) => {
   try {
     const combinedCredits = await tmdb.getPersonCombinedCredits({
       personId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const castMedia = await Media.getRelatedMedia(

server/routes/search.ts

@@ -20,7 +20,7 @@ searchRoutes.get('/', async (req, res, next) => {
         .match(searchProvider.pattern) as RegExpMatchArray;
       results = await searchProvider.search({
         id,
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
         query: queryString,
       });
     } else {
@@ -29,7 +29,7 @@ searchRoutes.get('/', async (req, res, next) => {
       results = await tmdb.searchMulti({
         query: queryString,
         page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
       });
     }
 

server/routes/tv.ts

@@ -14,7 +14,7 @@ tvRoutes.get('/:id', async (req, res, next) => {
   try {
     const tv = await tmdb.getTvShow({
       tvId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getMedia(tv.id, MediaType.TV);
@@ -40,7 +40,7 @@ tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => {
     const season = await tmdb.getTvSeason({
       tvId: Number(req.params.id),
       seasonNumber: Number(req.params.seasonNumber),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     return res.status(200).json(mapSeasonWithEpisodes(season));
@@ -65,7 +65,7 @@ tvRoutes.get('/:id/recommendations', async (req, res, next) => {
     const results = await tmdb.getTvRecommendations({
       tvId: Number(req.params.id),
       page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getRelatedMedia(
@@ -105,7 +105,7 @@ tvRoutes.get('/:id/similar', async (req, res, next) => {
     const results = await tmdb.getTvSimilar({
       tvId: Number(req.params.id),
       page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
     });
 
     const media = await Media.getRelatedMedia(