refactor(settings): remove metadata providers logo

fix build after rebase

.prettierignore

@@ -9,11 +9,7 @@ cypress/config/settings.cypress.json
 # assets
 src/assets/
 public/
-!public/sw.js
 docs/
-!/public/
-/public/*
-!/public/sw.js
 
 # helm charts
 **/charts

jellyseerr-api.yml

@@ -1451,9 +1451,6 @@ components:
               type: string
             jsonPayload:
               type: string
-            supportVariables:
-              type: boolean
-              example: false
     TelegramSettings:
       type: object
       properties:
@@ -5198,12 +5195,6 @@ paths:
           schema:
             type: string
             example: 1,2
-        - in: query
-          name: excludeKeywords
-          schema:
-            type: string
-            example: 3,4
-          description: Comma-separated list of keyword IDs to exclude from results
         - in: query
           name: sortBy
           schema:
@@ -5524,12 +5515,6 @@ paths:
           schema:
             type: string
             example: 1,2
-        - in: query
-          name: excludeKeywords
-          schema:
-            type: string
-            example: 3,4
-          description: Comma-separated list of keyword IDs to exclude from results
         - in: query
           name: sortBy
           schema:

package.json

@@ -57,7 +57,7 @@
     "cronstrue": "2.23.0",
     "date-fns": "2.29.3",
     "dayjs": "1.11.7",
-    "dns-caching": "^0.2.7",
+    "dns-caching": "^0.2.5",
     "email-templates": "12.0.1",
     "email-validator": "2.0.4",
     "express": "4.21.2",

server/api/plextv.ts

@@ -113,7 +113,7 @@ interface MetadataResponse {
       ratingKey: string;
       type: 'movie' | 'show';
       title: string;
-      Guid?: {
+      Guid: {
         id: `imdb://tt${number}` | `tmdb://${number}` | `tvdb://${number}`;
       }[];
     }[];
@@ -312,32 +312,19 @@ class PlexTvAPI extends ExternalAPI {
       const watchlistDetails = await Promise.all(
         (cachedWatchlist?.response.MediaContainer.Metadata ?? []).map(
           async (watchlistItem) => {
-            let detailedResponse: MetadataResponse;
-            try {
-              detailedResponse = await this.getRolling<MetadataResponse>(
-                `/library/metadata/${watchlistItem.ratingKey}`,
-                {
-                  baseURL: 'https://discover.provider.plex.tv',
-                }
-              );
-            } catch (e) {
-              if (e.response?.status === 404) {
-                logger.warn(
-                  `Item with ratingKey ${watchlistItem.ratingKey} not found, it may have been removed from the server.`,
-                  { label: 'Plex.TV Metadata API' }
-                );
-                return null;
-              } else {
-                throw e;
+            const detailedResponse = await this.getRolling<MetadataResponse>(
+              `/library/metadata/${watchlistItem.ratingKey}`,
+              {
+                baseURL: 'https://discover.provider.plex.tv',
               }
-            }
+            );
 
             const metadata = detailedResponse.MediaContainer.Metadata[0];
 
-            const tmdbString = metadata.Guid?.find((guid) =>
+            const tmdbString = metadata.Guid.find((guid) =>
               guid.id.startsWith('tmdb')
             );
-            const tvdbString = metadata.Guid?.find((guid) =>
+            const tvdbString = metadata.Guid.find((guid) =>
               guid.id.startsWith('tvdb')
             );
 
@@ -356,9 +343,7 @@ class PlexTvAPI extends ExternalAPI {
         )
       );
 
-      const filteredList = watchlistDetails.filter(
-        (detail) => detail?.tmdbId
-      ) as PlexWatchlistItem[];
+      const filteredList = watchlistDetails.filter((detail) => detail.tmdbId);
 
       return {
         offset,

server/api/themoviedb/index.ts

@@ -86,7 +86,6 @@ interface DiscoverMovieOptions {
   genre?: string;
   studio?: string;
   keywords?: string;
-  excludeKeywords?: string;
   sortBy?: SortOptions;
   watchRegion?: string;
   watchProviders?: string;
@@ -112,7 +111,6 @@ interface DiscoverTvOptions {
   genre?: string;
   network?: number;
   keywords?: string;
-  excludeKeywords?: string;
   sortBy?: SortOptions;
   watchRegion?: string;
   watchProviders?: string;
@@ -497,7 +495,6 @@ class TheMovieDb extends ExternalAPI implements TvShowProvider {
     genre,
     studio,
     keywords,
-    excludeKeywords,
     withRuntimeGte,
     withRuntimeLte,
     voteAverageGte,
@@ -548,7 +545,6 @@ class TheMovieDb extends ExternalAPI implements TvShowProvider {
           with_genres: genre,
           with_companies: studio,
           with_keywords: keywords,
-          without_keywords: excludeKeywords,
           'with_runtime.gte': withRuntimeGte,
           'with_runtime.lte': withRuntimeLte,
           'vote_average.gte': voteAverageGte,
@@ -581,7 +577,6 @@ class TheMovieDb extends ExternalAPI implements TvShowProvider {
     genre,
     network,
     keywords,
-    excludeKeywords,
     withRuntimeGte,
     withRuntimeLte,
     voteAverageGte,
@@ -633,7 +628,6 @@ class TheMovieDb extends ExternalAPI implements TvShowProvider {
           with_genres: genre,
           with_networks: network,
           with_keywords: keywords,
-          without_keywords: excludeKeywords,
           'with_runtime.gte': withRuntimeGte,
           'with_runtime.lte': withRuntimeLte,
           'vote_average.gte': voteAverageGte,

server/api/tvdb/index.ts

@@ -7,13 +7,12 @@ import type {
   TmdbTvEpisodeResult,
   TmdbTvSeasonResult,
 } from '@server/api/themoviedb/interfaces';
-import {
-  convertTmdbLanguageToTvdbWithFallback,
-  type TvdbBaseResponse,
-  type TvdbEpisode,
-  type TvdbLoginResponse,
-  type TvdbSeasonDetails,
-  type TvdbTvDetails,
+import type {
+  TvdbBaseResponse,
+  TvdbEpisode,
+  TvdbLoginResponse,
+  TvdbSeasonDetails,
+  TvdbTvDetails,
 } from '@server/api/tvdb/interfaces';
 import cacheManager, { type AvailableCacheIds } from '@server/lib/cache';
 import logger from '@server/logger';
@@ -204,6 +203,10 @@ class Tvdb extends ExternalAPI implements TvShowProvider {
     seasonNumber: number;
     language?: string;
   }): Promise<TmdbSeasonWithEpisodes> {
+    if (seasonNumber === 0) {
+      return this.createEmptySeasonResponse(tvId);
+    }
+
     try {
       const tmdbTvShow = await this.tmdb.getTvShow({ tvId, language });
 
@@ -216,12 +219,7 @@ class Tvdb extends ExternalAPI implements TvShowProvider {
           return await this.tmdb.getTvSeason({ tvId, seasonNumber, language });
         }
 
-        return await this.getTvdbSeasonData(
-          tvdbId,
-          seasonNumber,
-          tvId,
-          language
-        );
+        return await this.getTvdbSeasonData(tvdbId, seasonNumber, tvId);
       } catch (error) {
         this.handleError('Failed to fetch TV season details', error);
         return await this.tmdb.getTvSeason({ tvId, seasonNumber, language });
@@ -277,12 +275,12 @@ class Tvdb extends ExternalAPI implements TvShowProvider {
     }
 
     const seasons = tvdbData.seasons
-      .filter((season) => season.type && season.type.type === 'official')
-      .sort((a, b) => a.number - b.number)
-      .map((season) => this.createSeasonData(season, tvdbData))
       .filter(
-        (season) => season && season.season_number >= 0
-      ) as TmdbTvSeasonResult[];
+        (season) =>
+          season.number > 0 && season.type && season.type.type === 'official'
+      )
+      .sort((a, b) => a.number - b.number)
+      .map((season) => this.createSeasonData(season, tvdbData));
 
     return seasons;
   }
@@ -291,14 +289,13 @@ class Tvdb extends ExternalAPI implements TvShowProvider {
     season: TvdbSeasonDetails,
     tvdbData: TvdbTvDetails
   ): TmdbTvSeasonResult {
-    const seasonNumber = season.number ?? -1;
-    if (seasonNumber < 0) {
+    if (!season.number) {
       return {
         id: 0,
         episode_count: 0,
         name: '',
         overview: '',
-        season_number: -1,
+        season_number: 0,
         poster_path: '',
         air_date: '',
       };
@@ -322,8 +319,8 @@ class Tvdb extends ExternalAPI implements TvShowProvider {
   private async getTvdbSeasonData(
     tvdbId: number,
     seasonNumber: number,
-    tvId: number,
-    language: string = Tvdb.DEFAULT_LANGUAGE
+    tvId: number
+    //language: string = Tvdb.DEFAULT_LANGUAGE
   ): Promise<TmdbSeasonWithEpisodes> {
     const tvdbData = await this.fetchTvdbShowData(tvdbId);
 
@@ -347,132 +344,6 @@ class Tvdb extends ExternalAPI implements TvShowProvider {
       return this.createEmptySeasonResponse(tvId);
     }
 
-    const wantedTranslation = convertTmdbLanguageToTvdbWithFallback(
-      language,
-      Tvdb.DEFAULT_LANGUAGE
-    );
-
-    // check if translation is available for the season
-    const availableTranslation = season.nameTranslations.filter(
-      (translation) =>
-        translation === wantedTranslation ||
-        translation === Tvdb.DEFAULT_LANGUAGE
-    );
-
-    if (!availableTranslation) {
-      return this.getSeasonWithOriginalLanguage(
-        tvdbId,
-        tvId,
-        seasonNumber,
-        season
-      );
-    }
-
-    return this.getSeasonWithTranslation(
-      tvdbId,
-      tvId,
-      seasonNumber,
-      season,
-      wantedTranslation
-    );
-  }
-
-  private async getSeasonWithTranslation(
-    tvdbId: number,
-    tvId: number,
-    seasonNumber: number,
-    season: TvdbSeasonDetails,
-    language: string
-  ): Promise<TmdbSeasonWithEpisodes> {
-    if (!season) {
-      logger.error(
-        `Failed to find season ${seasonNumber} for TVDB ID: ${tvdbId}`
-      );
-      return this.createEmptySeasonResponse(tvId);
-    }
-
-    const allEpisodes = [] as TvdbEpisode[];
-    let page = 0;
-    // Limit to max 50 pages to avoid infinite loops.
-    // 50 pages with 500 items per page = 25_000 episodes in a series which should be more than enough
-    const maxPages = 50;
-
-    while (page < maxPages) {
-      const resp = await this.get<TvdbBaseResponse<TvdbSeasonDetails>>(
-        `/series/${tvdbId}/episodes/default/${language}`,
-        {
-          headers: {
-            Authorization: `Bearer ${this.token}`,
-          },
-          params: {
-            page: page,
-          },
-        }
-      );
-
-      if (!resp?.data?.episodes) {
-        logger.warn(
-          `No episodes found for TVDB ID: ${tvdbId} on page ${page} for season ${seasonNumber}`
-        );
-        break;
-      }
-
-      const { episodes } = resp.data;
-
-      if (!episodes) {
-        logger.debug(
-          `No more episodes found for TVDB ID: ${tvdbId} on page ${page} for season ${seasonNumber}`
-        );
-        break;
-      }
-
-      allEpisodes.push(...episodes);
-
-      const hasNextPage = resp.links?.next && episodes.length > 0;
-
-      if (!hasNextPage) {
-        break;
-      }
-
-      page++;
-    }
-
-    if (page >= maxPages) {
-      logger.warn(
-        `Reached max pages (${maxPages}) for TVDB ID: ${tvdbId} on season ${seasonNumber} with language ${language}. There might be more episodes available.`
-      );
-    }
-
-    const episodes = this.processEpisodes(
-      { ...season, episodes: allEpisodes },
-      seasonNumber,
-      tvId
-    );
-
-    return {
-      episodes,
-      external_ids: { tvdb_id: tvdbId },
-      name: '',
-      overview: '',
-      id: season.id,
-      air_date: season.firstAired,
-      season_number: episodes.length,
-    };
-  }
-
-  private async getSeasonWithOriginalLanguage(
-    tvdbId: number,
-    tvId: number,
-    seasonNumber: number,
-    season: TvdbSeasonDetails
-  ): Promise<TmdbSeasonWithEpisodes> {
-    if (!season) {
-      logger.error(
-        `Failed to find season ${seasonNumber} for TVDB ID: ${tvdbId}`
-      );
-      return this.createEmptySeasonResponse(tvId);
-    }
-
     const resp = await this.get<TvdbBaseResponse<TvdbSeasonDetails>>(
       `/seasons/${season.id}/extended`,
       {
@@ -526,10 +397,7 @@ class Tvdb extends ExternalAPI implements TvShowProvider {
       season_number: episode.seasonNumber,
       production_code: '',
       show_id: tvId,
-      still_path:
-        episode.image && !episode.image.startsWith('https://')
-          ? 'https://artworks.thetvdb.com' + episode.image
-          : '',
+      still_path: episode.image ? episode.image : '',
       vote_average: 1,
       vote_count: 1,
     };

server/api/tvdb/interfaces.ts

@@ -1,17 +1,6 @@
-import { type AvailableLocale } from '@server/types/languages';
-
 export interface TvdbBaseResponse<T> {
   data: T;
   errors: string;
-  links?: TvdbPagination;
-}
-
-export interface TvdbPagination {
-  prev?: string;
-  self: string;
-  next?: string;
-  totalItems: number;
-  pageSize: number;
 }
 
 export interface TvdbLoginResponse {
@@ -153,64 +142,3 @@ export interface TvdbEpisodeTranslation {
   overview: string;
   language: string;
 }
-
-const TMDB_TO_TVDB_MAPPING: Record<string, string> & {
-  [key in AvailableLocale]: string;
-} = {
-  ar: 'ara', // Arabic
-  bg: 'bul', // Bulgarian
-  ca: 'cat', // Catalan
-  cs: 'ces', // Czech
-  da: 'dan', // Danish
-  de: 'deu', // German
-  el: 'ell', // Greek
-  en: 'eng', // English
-  es: 'spa', // Spanish
-  fi: 'fin', // Finnish
-  fr: 'fra', // French
-  he: 'heb', // Hebrew
-  hi: 'hin', // Hindi
-  hr: 'hrv', // Croatian
-  hu: 'hun', // Hungarian
-  it: 'ita', // Italian
-  ja: 'jpn', // Japanese
-  ko: 'kor', // Korean
-  lt: 'lit', // Lithuanian
-  nl: 'nld', // Dutch
-  pl: 'pol', // Polish
-  ro: 'ron', // Romanian
-  ru: 'rus', // Russian
-  sq: 'sqi', // Albanian
-  sr: 'srp', // Serbian
-  sv: 'swe', // Swedish
-  tr: 'tur', // Turkish
-  uk: 'ukr', // Ukrainian
-
-  'es-MX': 'spa', // Spanish (Latin America) -> Spanish
-  'nb-NO': 'nor', // Norwegian Bokmål -> Norwegian
-  'pt-BR': 'pt', // Portuguese (Brazil) -> Portuguese - Brazil (from TVDB data)
-  'pt-PT': 'por', // Portuguese (Portugal) -> Portuguese - Portugal (from TVDB data)
-  'zh-CN': 'zho', // Chinese (Simplified) -> Chinese - China
-  'zh-TW': 'zhtw', // Chinese (Traditional) -> Chinese - Taiwan
-};
-
-export function convertTMDBToTVDB(tmdbCode: string): string | null {
-  const normalizedCode = tmdbCode.toLowerCase();
-
-  return (
-    TMDB_TO_TVDB_MAPPING[tmdbCode] ||
-    TMDB_TO_TVDB_MAPPING[normalizedCode] ||
-    null
-  );
-}
-
-export function convertTmdbLanguageToTvdbWithFallback(
-  tmdbCode: string,
-  fallback: string
-): string {
-  // First try exact match
-  const tvdbCode = convertTMDBToTVDB(tmdbCode);
-  if (tvdbCode) return tvdbCode;
-
-  return tvdbCode || fallback || 'eng'; // Default to English if no match found
-}

server/index.ts

@@ -82,7 +82,7 @@ app
     }
 
     // Add DNS caching
-    if (settings.network.dnsCache?.enabled) {
+    if (settings.network.dnsCache) {
       initializeDnsCache({
         forceMinTtl: settings.network.dnsCache.forceMinTtl,
         forceMaxTtl: settings.network.dnsCache.forceMaxTtl,

server/lib/notifications/agents/discord.ts

@@ -109,9 +109,7 @@ class DiscordAgent
     type: Notification,
     payload: NotificationPayload
   ): DiscordRichEmbed {
-    const settings = getSettings();
-    const { applicationUrl } = settings.main;
-    const { embedPoster } = settings.notifications.agents.discord;
+    const { applicationUrl } = getSettings().main;
 
     const appUrl =
       applicationUrl || `http://localhost:${process.env.port || 5055}`;
@@ -225,11 +223,9 @@ class DiscordAgent
           }
         : undefined,
       fields,
-      thumbnail: embedPoster
-        ? {
-            url: payload.image,
-          }
-        : undefined,
+      thumbnail: {
+        url: payload.image,
+      },
     };
   }
 

server/lib/notifications/agents/email.ts

@@ -48,9 +48,7 @@ class EmailAgent
     recipientEmail: string,
     recipientName?: string
   ): EmailOptions | undefined {
-    const settings = getSettings();
-    const { applicationUrl, applicationTitle } = settings.main;
-    const { embedPoster } = settings.notifications.agents.email;
+    const { applicationUrl, applicationTitle } = getSettings().main;
 
     if (type === Notification.TEST_NOTIFICATION) {
       return {
@@ -131,7 +129,7 @@ class EmailAgent
           body,
           mediaName: payload.subject,
           mediaExtra: payload.extra ?? [],
-          imageUrl: embedPoster ? payload.image : undefined,
+          imageUrl: payload.image,
           timestamp: new Date().toTimeString(),
           requestedBy: payload.request.requestedBy.displayName,
           actionUrl: applicationUrl
@@ -178,7 +176,7 @@ class EmailAgent
           issueComment: payload.comment?.message,
           mediaName: payload.subject,
           extra: payload.extra ?? [],
-          imageUrl: embedPoster ? payload.image : undefined,
+          imageUrl: payload.image,
           timestamp: new Date().toTimeString(),
           actionUrl: applicationUrl
             ? `${applicationUrl}/issues/${payload.issue.id}`

server/lib/notifications/agents/ntfy.ts

@@ -22,9 +22,7 @@ class NtfyAgent
   }
 
   private buildPayload(type: Notification, payload: NotificationPayload) {
-    const settings = getSettings();
-    const { applicationUrl } = settings.main;
-    const { embedPoster } = settings.notifications.agents.ntfy;
+    const { applicationUrl } = getSettings().main;
 
     const topic = this.getSettings().options.topic;
     const priority = 3;
@@ -74,7 +72,7 @@ class NtfyAgent
       message += `\n\n**${extra.name}**\n${extra.value}`;
     }
 
-    const attach = embedPoster ? payload.image : undefined;
+    const attach = payload.image;
 
     let click;
     if (applicationUrl && payload.media) {

server/lib/notifications/agents/pushover.ts

@@ -78,9 +78,7 @@ class PushoverAgent
     type: Notification,
     payload: NotificationPayload
   ): Promise<Partial<PushoverPayload>> {
-    const settings = getSettings();
-    const { applicationUrl, applicationTitle } = settings.main;
-    const { embedPoster } = settings.notifications.agents.pushover;
+    const { applicationUrl, applicationTitle } = getSettings().main;
 
     const title = payload.event ?? payload.subject;
     let message = payload.event ? `<b>${payload.subject}</b>` : '';
@@ -157,7 +155,7 @@ class PushoverAgent
 
     let attachment_base64;
     let attachment_type;
-    if (embedPoster && payload.image) {
+    if (payload.image) {
       const imagePayload = await this.getImagePayload(payload.image);
       if (imagePayload.attachment_base64 && imagePayload.attachment_type) {
         attachment_base64 = imagePayload.attachment_base64;

server/lib/notifications/agents/slack.ts

@@ -63,9 +63,7 @@ class SlackAgent
     type: Notification,
     payload: NotificationPayload
   ): SlackBlockEmbed {
-    const settings = getSettings();
-    const { applicationUrl, applicationTitle } = settings.main;
-    const { embedPoster } = settings.notifications.agents.slack;
+    const { applicationUrl, applicationTitle } = getSettings().main;
 
     const fields: EmbedField[] = [];
 
@@ -161,14 +159,13 @@ class SlackAgent
           type: 'mrkdwn',
           text: payload.message,
         },
-        accessory:
-          embedPoster && payload.image
-            ? {
-                type: 'image',
-                image_url: payload.image,
-                alt_text: payload.subject,
-              }
-            : undefined,
+        accessory: payload.image
+          ? {
+              type: 'image',
+              image_url: payload.image,
+              alt_text: payload.subject,
+            }
+          : undefined,
       });
     }
 

server/lib/notifications/agents/telegram.ts

@@ -65,9 +65,7 @@ class TelegramAgent
     type: Notification,
     payload: NotificationPayload
   ): Partial<TelegramMessagePayload | TelegramPhotoPayload> {
-    const settings = getSettings();
-    const { applicationUrl, applicationTitle } = settings.main;
-    const { embedPoster } = settings.notifications.agents.telegram;
+    const { applicationUrl, applicationTitle } = getSettings().main;
 
     /* eslint-disable no-useless-escape */
     let message = `\*${this.escapeText(
@@ -144,7 +142,7 @@ class TelegramAgent
     }
     /* eslint-enable */
 
-    return embedPoster && payload.image
+    return payload.image
       ? {
           photo: payload.image,
           caption: message,
@@ -162,7 +160,7 @@ class TelegramAgent
   ): Promise<boolean> {
     const settings = this.getSettings();
     const endpoint = `${this.baseUrl}bot${settings.options.botAPI}/${
-      settings.embedPoster && payload.image ? 'sendPhoto' : 'sendMessage'
+      payload.image ? 'sendPhoto' : 'sendMessage'
     }`;
     const notificationPayload = this.getNotificationPayload(type, payload);
 

server/lib/notifications/agents/webhook.ts

@@ -177,27 +177,9 @@ class WebhookAgent
       subject: payload.subject,
     });
 
-    let webhookUrl = settings.options.webhookUrl;
-
-    if (settings.options.supportVariables) {
-      Object.keys(KeyMap).forEach((keymapKey) => {
-        const keymapValue = KeyMap[keymapKey as keyof typeof KeyMap];
-        const variableValue =
-          type === Notification.TEST_NOTIFICATION
-            ? 'test'
-            : typeof keymapValue === 'function'
-            ? keymapValue(payload, type)
-            : get(payload, keymapValue) || 'test';
-        webhookUrl = webhookUrl.replace(
-          new RegExp(`{{${keymapKey}}}`, 'g'),
-          encodeURIComponent(variableValue)
-        );
-      });
-    }
-
     try {
       await axios.post(
-        webhookUrl,
+        settings.options.webhookUrl,
         this.buildPayload(type, payload),
         settings.options.authHeader
           ? {

server/lib/notifications/agents/webpush.ts

@@ -42,8 +42,6 @@ class WebPushAgent
     type: Notification,
     payload: NotificationPayload
   ): PushNotificationPayload {
-    const { embedPoster } = getSettings().notifications.agents.webpush;
-
     const mediaType = payload.media
       ? payload.media.mediaType === MediaType.MOVIE
         ? 'movie'
@@ -130,7 +128,7 @@ class WebPushAgent
       notificationType: Notification[type],
       subject: payload.subject,
       message,
-      image: embedPoster ? payload.image : undefined,
+      image: payload.image,
       requestId: payload.request?.id,
       actionUrl,
       actionUrlTitle,

server/lib/settings/index.ts

@@ -207,7 +207,6 @@ interface FullPublicSettings extends PublicSettings {
 
 export interface NotificationAgentConfig {
   enabled: boolean;
-  embedPoster: boolean;
   types?: number;
   options: Record<string, unknown>;
 }
@@ -275,7 +274,6 @@ export interface NotificationAgentWebhook extends NotificationAgentConfig {
     webhookUrl: string;
     jsonPayload: string;
     authHeader?: string;
-    supportVariables?: boolean;
   };
 }
 
@@ -436,7 +434,6 @@ class Settings {
         agents: {
           email: {
             enabled: false,
-            embedPoster: true,
             options: {
               userEmailRequired: false,
               emailFrom: '',
@@ -451,7 +448,6 @@ class Settings {
           },
           discord: {
             enabled: false,
-            embedPoster: true,
             types: 0,
             options: {
               webhookUrl: '',
@@ -461,7 +457,6 @@ class Settings {
           },
           slack: {
             enabled: false,
-            embedPoster: true,
             types: 0,
             options: {
               webhookUrl: '',
@@ -469,7 +464,6 @@ class Settings {
           },
           telegram: {
             enabled: false,
-            embedPoster: true,
             types: 0,
             options: {
               botAPI: '',
@@ -480,7 +474,6 @@ class Settings {
           },
           pushbullet: {
             enabled: false,
-            embedPoster: false,
             types: 0,
             options: {
               accessToken: '',
@@ -488,7 +481,6 @@ class Settings {
           },
           pushover: {
             enabled: false,
-            embedPoster: true,
             types: 0,
             options: {
               accessToken: '',
@@ -498,7 +490,6 @@ class Settings {
           },
           webhook: {
             enabled: false,
-            embedPoster: true,
             types: 0,
             options: {
               webhookUrl: '',
@@ -508,12 +499,10 @@ class Settings {
           },
           webpush: {
             enabled: false,
-            embedPoster: true,
             options: {},
           },
           gotify: {
             enabled: false,
-            embedPoster: false,
             types: 0,
             options: {
               url: '',
@@ -523,7 +512,6 @@ class Settings {
           },
           ntfy: {
             enabled: false,
-            embedPoster: true,
             types: 0,
             options: {
               url: '',

server/routes/discover.ts

@@ -61,7 +61,6 @@ const QueryFilterOptions = z.object({
   studio: z.coerce.string().optional(),
   genre: z.coerce.string().optional(),
   keywords: z.coerce.string().optional(),
-  excludeKeywords: z.coerce.string().optional(),
   language: z.coerce.string().optional(),
   withRuntimeGte: z.coerce.string().optional(),
   withRuntimeLte: z.coerce.string().optional(),
@@ -91,7 +90,6 @@ discoverRoutes.get('/movies', async (req, res, next) => {
   try {
     const query = ApiQuerySchema.parse(req.query);
     const keywords = query.keywords;
-    const excludeKeywords = query.excludeKeywords;
 
     const data = await tmdb.getDiscoverMovies({
       page: Number(query.page),
@@ -107,7 +105,6 @@ discoverRoutes.get('/movies', async (req, res, next) => {
         ? new Date(query.primaryReleaseDateGte).toISOString().split('T')[0]
         : undefined,
       keywords,
-      excludeKeywords,
       withRuntimeGte: query.withRuntimeGte,
       withRuntimeLte: query.withRuntimeLte,
       voteAverageGte: query.voteAverageGte,
@@ -384,7 +381,6 @@ discoverRoutes.get('/tv', async (req, res, next) => {
   try {
     const query = ApiQuerySchema.parse(req.query);
     const keywords = query.keywords;
-    const excludeKeywords = query.excludeKeywords;
     const data = await tmdb.getDiscoverTv({
       page: Number(query.page),
       sortBy: query.sortBy as SortOptions,
@@ -399,7 +395,6 @@ discoverRoutes.get('/tv', async (req, res, next) => {
         : undefined,
       originalLanguage: query.language,
       keywords,
-      excludeKeywords,
       withRuntimeGte: query.withRuntimeGte,
       withRuntimeLte: query.withRuntimeLte,
       voteAverageGte: query.voteAverageGte,

server/routes/issue.ts

@@ -54,7 +54,6 @@ issueRoutes.get<Record<string, string>, IssueResultsResponse>(
       .leftJoinAndSelect('issue.createdBy', 'createdBy')
       .leftJoinAndSelect('issue.media', 'media')
       .leftJoinAndSelect('issue.modifiedBy', 'modifiedBy')
-      .leftJoinAndSelect('issue.comments', 'comments')
       .where('issue.status IN (:...issueStatus)', {
         issueStatus: statusFilter,
       });

server/routes/settings/notifications.ts

@@ -270,7 +270,6 @@ notificationRoutes.get('/webhook', (_req, res) => {
 
   const response: typeof webhookSettings = {
     enabled: webhookSettings.enabled,
-    embedPoster: webhookSettings.embedPoster,
     types: webhookSettings.types,
     options: {
       ...webhookSettings.options,
@@ -279,7 +278,6 @@ notificationRoutes.get('/webhook', (_req, res) => {
           'utf8'
         )
       ),
-      supportVariables: webhookSettings.options.supportVariables ?? false,
     },
   };
 
@@ -293,7 +291,6 @@ notificationRoutes.post('/webhook', async (req, res, next) => {
 
     settings.notifications.agents.webhook = {
       enabled: req.body.enabled,
-      embedPoster: req.body.embedPoster,
       types: req.body.types,
       options: {
         jsonPayload: Buffer.from(req.body.options.jsonPayload).toString(
@@ -301,7 +298,6 @@ notificationRoutes.post('/webhook', async (req, res, next) => {
         ),
         webhookUrl: req.body.options.webhookUrl,
         authHeader: req.body.options.authHeader,
-        supportVariables: req.body.options.supportVariables ?? false,
       },
     };
     await settings.save();
@@ -325,7 +321,6 @@ notificationRoutes.post('/webhook/test', async (req, res, next) => {
 
     const testBody = {
       enabled: req.body.enabled,
-      embedPoster: req.body.embedPoster,
       types: req.body.types,
       options: {
         jsonPayload: Buffer.from(req.body.options.jsonPayload).toString(
@@ -333,7 +328,6 @@ notificationRoutes.post('/webhook/test', async (req, res, next) => {
         ),
         webhookUrl: req.body.options.webhookUrl,
         authHeader: req.body.options.authHeader,
-        supportVariables: req.body.options.supportVariables ?? false,
       },
     };
 

server/routes/tv.ts

@@ -80,7 +80,6 @@ tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => {
     const season = await metadataProvider.getTvSeason({
       tvId: Number(req.params.id),
       seasonNumber: Number(req.params.seasonNumber),
-      language: (req.query.language as string) ?? req.locale,
     });
 
     return res.status(200).json(mapSeasonWithEpisodes(season));

server/templates/email/media-request/html.pug

@@ -53,11 +53,10 @@ div(style='display: block; background-color: #111827; padding: 2.5rem 0;')
                       b(style='color: #9ca3af; font-weight: 700;')
                         | #{extra.name} 
                       | #{extra.value}
-              if imageUrl
-                td(rowspan='2' style='width: 7rem;')
-                  a(style='display: block; width: 7rem; overflow: hidden; border-radius: .375rem;' href=actionUrl)
-                    div(style='overflow: hidden; box-sizing: border-box; margin: 0px;')
-                      img(alt='' src=imageUrl style='box-sizing: border-box; padding: 0px; border: none; margin: auto; display: block; min-width: 100%; max-width: 100%; min-height: 100%; max-height: 100%;')
+              td(rowspan='2' style='width: 7rem;')
+                a(style='display: block; width: 7rem; overflow: hidden; border-radius: .375rem;' href=actionUrl)
+                  div(style='overflow: hidden; box-sizing: border-box; margin: 0px;')
+                    img(alt='' src=imageUrl style='box-sizing: border-box; padding: 0px; border: none; margin: auto; display: block; min-width: 100%; max-width: 100%; min-height: 100%; max-height: 100%;')
             tr
               td(style='font-size: .85em; color: #9ca3af; line-height: 1em; vertical-align: bottom; margin-right: 1rem')
                 span

server/types/languages.d.ts

@@ -1,35 +0,0 @@
-export type AvailableLocale =
-  | 'ar'
-  | 'bg'
-  | 'ca'
-  | 'cs'
-  | 'da'
-  | 'de'
-  | 'en'
-  | 'el'
-  | 'es'
-  | 'es-MX'
-  | 'fi'
-  | 'fr'
-  | 'hr'
-  | 'he'
-  | 'hi'
-  | 'hu'
-  | 'it'
-  | 'ja'
-  | 'ko'
-  | 'lt'
-  | 'nb-NO'
-  | 'nl'
-  | 'pl'
-  | 'pt-BR'
-  | 'pt-PT'
-  | 'ro'
-  | 'ru'
-  | 'sq'
-  | 'sr'
-  | 'sv'
-  | 'tr'
-  | 'uk'
-  | 'zh-CN'
-  | 'zh-TW';

src/components/Discover/FilterSlideover/index.tsx

@@ -33,7 +33,6 @@ const messages = defineMessages('components.Discover.FilterSlideover', {
   studio: 'Studio',
   genres: 'Genres',
   keywords: 'Keywords',
-  excludeKeywords: 'Exclude Keywords',
   originalLanguage: 'Original Language',
   runtimeText: '{minValue}-{maxValue} minute runtime',
   ratingText: 'Ratings between {minValue} and {maxValue}',
@@ -182,19 +181,6 @@ const FilterSlideover = ({
             updateQueryParams('keywords', value?.map((v) => v.value).join(','));
           }}
         />
-        <span className="text-lg font-semibold">
-          {intl.formatMessage(messages.excludeKeywords)}
-        </span>
-        <KeywordSelector
-          defaultValue={currentFilters.excludeKeywords}
-          isMulti
-          onChange={(value) => {
-            updateQueryParams(
-              'excludeKeywords',
-              value?.map((v) => v.value).join(',')
-            );
-          }}
-        />
         <span className="text-lg font-semibold">
           {intl.formatMessage(messages.originalLanguage)}
         </span>

src/components/Discover/constants.ts

@@ -99,7 +99,6 @@ export const QueryFilterOptions = z.object({
   studio: z.string().optional(),
   genre: z.string().optional(),
   keywords: z.string().optional(),
-  excludeKeywords: z.string().optional(),
   language: z.string().optional(),
   withRuntimeGte: z.string().optional(),
   withRuntimeLte: z.string().optional(),
@@ -162,10 +161,6 @@ export const prepareFilterValues = (
     filterValues.keywords = values.keywords;
   }
 
-  if (values.excludeKeywords) {
-    filterValues.excludeKeywords = values.excludeKeywords;
-  }
-
   if (values.language) {
     filterValues.language = values.language;
   }

src/components/IssueList/IssueItem/index.tsx

@@ -1,7 +1,6 @@
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
-import Tooltip from '@app/components/Common/Tooltip';
 import { issueOptions } from '@app/components/IssueModal/constants';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
@@ -27,7 +26,6 @@ const messages = defineMessages('components.IssueList.IssueItem', {
   opened: 'Opened',
   viewissue: 'View Issue',
   unknownissuetype: 'Unknown',
-  descriptionpreview: 'Issue Description',
 });
 
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
@@ -109,15 +107,8 @@ const IssueItem = ({ issue }: IssueItemProps) => {
     }
   }
 
-  const description = issue.comments?.[0]?.message || '';
-  const maxDescriptionLength = 120;
-  const shouldTruncate = description.length > maxDescriptionLength;
-  const truncatedDescription = shouldTruncate
-    ? description.substring(0, maxDescriptionLength) + '...'
-    : description;
-
   return (
-    <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:flex-row">
+    <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
       {title.backdropPath && (
         <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
           <CachedImage
@@ -177,38 +168,8 @@ const IssueItem = ({ issue }: IssueItemProps) => {
             >
               {isMovie(title) ? title.title : title.name}
             </Link>
-            {description && (
-              <div className="mt-1 max-w-full">
-                <div className="overflow-hidden text-sm text-gray-300">
-                  {shouldTruncate ? (
-                    <Tooltip
-                      content={
-                        <div className="max-w-sm p-3">
-                          <div className="mb-1 text-sm font-medium text-gray-200">
-                            Issue Description
-                          </div>
-                          <div className="whitespace-pre-wrap text-sm leading-relaxed text-gray-300">
-                            {description}
-                          </div>
-                        </div>
-                      }
-                      tooltipConfig={{
-                        placement: 'top',
-                        offset: [0, 8],
-                      }}
-                    >
-                      <span className="block cursor-help truncate transition-colors hover:text-gray-200">
-                        {truncatedDescription}
-                      </span>
-                    </Tooltip>
-                  ) : (
-                    <span className="block break-words">{description}</span>
-                  )}
-                </div>
-              </div>
-            )}
             {problemSeasonEpisodeLine.length > 0 && (
-              <div className="card-field mt-1">
+              <div className="card-field">
                 {problemSeasonEpisodeLine.map((t, k) => (
                   <span key={k}>{t}</span>
                 ))}

src/components/Layout/LanguagePicker/index.tsx

@@ -1,10 +1,10 @@
+import type { AvailableLocale } from '@app/context/LanguageContext';
 import { availableLanguages } from '@app/context/LanguageContext';
 import useClickOutside from '@app/hooks/useClickOutside';
 import useLocale from '@app/hooks/useLocale';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import { LanguageIcon } from '@heroicons/react/24/solid';
-import type { AvailableLocale } from '@server/types/languages';
 import { useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 

src/components/Layout/index.tsx

@@ -3,11 +3,11 @@ import PullToRefresh from '@app/components/Layout/PullToRefresh';
 import SearchInput from '@app/components/Layout/SearchInput';
 import Sidebar from '@app/components/Layout/Sidebar';
 import UserDropdown from '@app/components/Layout/UserDropdown';
+import type { AvailableLocale } from '@app/context/LanguageContext';
 import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
 import { ArrowLeftIcon, Bars3BottomLeftIcon } from '@heroicons/react/24/solid';
-import type { AvailableLocale } from '@server/types/languages';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
 import useSWR from 'swr';

src/components/Settings/Notifications/NotificationsDiscord.tsx

@@ -15,7 +15,6 @@ import * as Yup from 'yup';
 
 const messages = defineMessages('components.Settings.Notifications', {
   agentenabled: 'Enable Agent',
-  embedPoster: 'Embed Poster',
   botUsername: 'Bot Username',
   botAvatarUrl: 'Bot Avatar URL',
   webhookUrl: 'Webhook URL',
@@ -75,7 +74,6 @@ const NotificationsDiscord = () => {
     <Formik
       initialValues={{
         enabled: data.enabled,
-        embedPoster: data.embedPoster,
         types: data.types,
         botUsername: data?.options.botUsername,
         botAvatarUrl: data?.options.botAvatarUrl,
@@ -88,7 +86,6 @@ const NotificationsDiscord = () => {
         try {
           await axios.post('/api/v1/settings/notifications/discord', {
             enabled: values.enabled,
-            embedPoster: values.embedPoster,
             types: values.types,
             options: {
               botUsername: values.botUsername,
@@ -138,7 +135,6 @@ const NotificationsDiscord = () => {
             );
             await axios.post('/api/v1/settings/notifications/discord/test', {
               enabled: true,
-              embedPoster: values.embedPoster,
               types: values.types,
               options: {
                 botUsername: values.botUsername,
@@ -180,14 +176,6 @@ const NotificationsDiscord = () => {
                 <Field type="checkbox" id="enabled" name="enabled" />
               </div>
             </div>
-            <div className="form-row">
-              <label htmlFor="embedPoster" className="checkbox-label">
-                {intl.formatMessage(messages.embedPoster)}
-              </label>
-              <div className="form-input-area">
-                <Field type="checkbox" id="embedPoster" name="embedPoster" />
-              </div>
-            </div>
             <div className="form-row">
               <label htmlFor="name" className="text-label">
                 {intl.formatMessage(messages.webhookUrl)}

src/components/Settings/Notifications/NotificationsEmail.tsx

@@ -17,7 +17,6 @@ const messages = defineMessages('components.Settings.Notifications', {
   validationSmtpHostRequired: 'You must provide a valid hostname or IP address',
   validationSmtpPortRequired: 'You must provide a valid port number',
   agentenabled: 'Enable Agent',
-  embedPoster: 'Embed Poster',
   userEmailRequired: 'Require user email',
   emailsender: 'Sender Address',
   smtpHost: 'SMTP Host',
@@ -123,7 +122,6 @@ const NotificationsEmail = () => {
     <Formik
       initialValues={{
         enabled: data.enabled,
-        embedPoster: data.embedPoster,
         userEmailRequired: data.options.userEmailRequired,
         emailFrom: data.options.emailFrom,
         smtpHost: data.options.smtpHost,
@@ -147,7 +145,6 @@ const NotificationsEmail = () => {
         try {
           await axios.post('/api/v1/settings/notifications/email', {
             enabled: values.enabled,
-            embedPoster: values.embedPoster,
             options: {
               userEmailRequired: values.userEmailRequired,
               emailFrom: values.emailFrom,
@@ -197,7 +194,6 @@ const NotificationsEmail = () => {
             );
             await axios.post('/api/v1/settings/notifications/email/test', {
               enabled: true,
-              embedPoster: values.embedPoster,
               options: {
                 emailFrom: values.emailFrom,
                 smtpHost: values.smtpHost,
@@ -245,14 +241,6 @@ const NotificationsEmail = () => {
                 <Field type="checkbox" id="enabled" name="enabled" />
               </div>
             </div>
-            <div className="form-row">
-              <label htmlFor="embedPoster" className="checkbox-label">
-                {intl.formatMessage(messages.embedPoster)}
-              </label>
-              <div className="form-input-area">
-                <Field type="checkbox" id="embedPoster" name="embedPoster" />
-              </div>
-            </div>
             <div className="form-row">
               <label htmlFor="userEmailRequired" className="checkbox-label">
                 {intl.formatMessage(messages.userEmailRequired)}

src/components/Settings/Notifications/NotificationsNtfy/index.tsx

@@ -19,7 +19,6 @@ const messages = defineMessages(
   'components.Settings.Notifications.NotificationsNtfy',
   {
     agentenabled: 'Enable Agent',
-    embedPoster: 'Embed Poster',
     url: 'Server root URL',
     topic: 'Topic',
     usernamePasswordAuth: 'Username + Password authentication',
@@ -81,7 +80,6 @@ const NotificationsNtfy = () => {
     <Formik
       initialValues={{
         enabled: data?.enabled,
-        embedPoster: data?.embedPoster,
         types: data?.types,
         url: data?.options.url,
         topic: data?.options.topic,
@@ -96,7 +94,6 @@ const NotificationsNtfy = () => {
         try {
           await axios.post('/api/v1/settings/notifications/ntfy', {
             enabled: values.enabled,
-            embedPoster: values.embedPoster,
             types: values.types,
             options: {
               url: values.url,
@@ -191,14 +188,6 @@ const NotificationsNtfy = () => {
                 <Field type="checkbox" id="enabled" name="enabled" />
               </div>
             </div>
-            <div className="form-row">
-              <label htmlFor="embedPoster" className="checkbox-label">
-                {intl.formatMessage(messages.embedPoster)}
-              </label>
-              <div className="form-input-area">
-                <Field type="checkbox" id="embedPoster" name="embedPoster" />
-              </div>
-            </div>
             <div className="form-row">
               <label htmlFor="url" className="text-label">
                 {intl.formatMessage(messages.url)}

src/components/Settings/Notifications/NotificationsPushover/index.tsx

@@ -17,7 +17,6 @@ const messages = defineMessages(
   'components.Settings.Notifications.NotificationsPushover',
   {
     agentenabled: 'Enable Agent',
-    embedPoster: 'Embed Poster',
     accessToken: 'Application API Token',
     accessTokenTip:
       '<ApplicationRegistrationLink>Register an application</ApplicationRegistrationLink> for use with Jellyseerr',
@@ -87,7 +86,6 @@ const NotificationsPushover = () => {
     <Formik
       initialValues={{
         enabled: data?.enabled,
-        embedPoster: data?.embedPoster,
         types: data?.types,
         accessToken: data?.options.accessToken,
         userToken: data?.options.userToken,
@@ -98,7 +96,6 @@ const NotificationsPushover = () => {
         try {
           await axios.post('/api/v1/settings/notifications/pushover', {
             enabled: values.enabled,
-            embedPoster: values.embedPoster,
             types: values.types,
             options: {
               accessToken: values.accessToken,
@@ -145,7 +142,6 @@ const NotificationsPushover = () => {
             );
             await axios.post('/api/v1/settings/notifications/pushover/test', {
               enabled: true,
-              embedPoster: values.embedPoster,
               types: values.types,
               options: {
                 accessToken: values.accessToken,
@@ -185,14 +181,6 @@ const NotificationsPushover = () => {
                 <Field type="checkbox" id="enabled" name="enabled" />
               </div>
             </div>
-            <div className="form-row">
-              <label htmlFor="embedPoster" className="checkbox-label">
-                {intl.formatMessage(messages.embedPoster)}
-              </label>
-              <div className="form-input-area">
-                <Field type="checkbox" id="embedPoster" name="embedPoster" />
-              </div>
-            </div>
             <div className="form-row">
               <label htmlFor="accessToken" className="text-label">
                 {intl.formatMessage(messages.accessToken)}

src/components/Settings/Notifications/NotificationsSlack/index.tsx

@@ -16,7 +16,6 @@ const messages = defineMessages(
   'components.Settings.Notifications.NotificationsSlack',
   {
     agentenabled: 'Enable Agent',
-    embedPoster: 'Embed Poster',
     webhookUrl: 'Webhook URL',
     webhookUrlTip:
       'Create an <WebhookLink>Incoming Webhook</WebhookLink> integration',
@@ -60,7 +59,6 @@ const NotificationsSlack = () => {
     <Formik
       initialValues={{
         enabled: data.enabled,
-        embedPoster: data.embedPoster,
         types: data.types,
         webhookUrl: data.options.webhookUrl,
       }}
@@ -69,7 +67,6 @@ const NotificationsSlack = () => {
         try {
           await axios.post('/api/v1/settings/notifications/slack', {
             enabled: values.enabled,
-            embedPoster: values.embedPoster,
             types: values.types,
             options: {
               webhookUrl: values.webhookUrl,
@@ -114,7 +111,6 @@ const NotificationsSlack = () => {
             );
             await axios.post('/api/v1/settings/notifications/slack/test', {
               enabled: true,
-              embedPoster: values.embedPoster,
               types: values.types,
               options: {
                 webhookUrl: values.webhookUrl,
@@ -152,14 +148,6 @@ const NotificationsSlack = () => {
                 <Field type="checkbox" id="enabled" name="enabled" />
               </div>
             </div>
-            <div className="form-row">
-              <label htmlFor="embedPoster" className="checkbox-label">
-                {intl.formatMessage(messages.embedPoster)}
-              </label>
-              <div className="form-input-area">
-                <Field type="checkbox" id="embedPoster" name="embedPoster" />
-              </div>
-            </div>
             <div className="form-row">
               <label htmlFor="name" className="text-label">
                 {intl.formatMessage(messages.webhookUrl)}

src/components/Settings/Notifications/NotificationsTelegram.tsx

@@ -15,7 +15,6 @@ import * as Yup from 'yup';
 
 const messages = defineMessages('components.Settings.Notifications', {
   agentenabled: 'Enable Agent',
-  embedPoster: 'Embed Poster',
   botUsername: 'Bot Username',
   botUsernameTip:
     'Allow users to also start a chat with your bot and configure their own notifications',
@@ -90,7 +89,6 @@ const NotificationsTelegram = () => {
     <Formik
       initialValues={{
         enabled: data?.enabled,
-        embedPoster: data?.embedPoster,
         types: data?.types,
         botUsername: data?.options.botUsername,
         botAPI: data?.options.botAPI,
@@ -103,7 +101,6 @@ const NotificationsTelegram = () => {
         try {
           await axios.post('/api/v1/settings/notifications/telegram', {
             enabled: values.enabled,
-            embedPoster: values.embedPoster,
             types: values.types,
             options: {
               botAPI: values.botAPI,
@@ -194,14 +191,6 @@ const NotificationsTelegram = () => {
                 <Field type="checkbox" id="enabled" name="enabled" />
               </div>
             </div>
-            <div className="form-row">
-              <label htmlFor="embedPoster" className="checkbox-label">
-                {intl.formatMessage(messages.embedPoster)}
-              </label>
-              <div className="form-input-area">
-                <Field type="checkbox" id="embedPoster" name="embedPoster" />
-              </div>
-            </div>
             <div className="form-row">
               <label htmlFor="botAPI" className="text-label">
                 {intl.formatMessage(messages.botAPI)}

src/components/Settings/Notifications/NotificationsWebPush/index.tsx

@@ -15,7 +15,6 @@ const messages = defineMessages(
   'components.Settings.Notifications.NotificationsWebPush',
   {
     agentenabled: 'Enable Agent',
-    embedPoster: 'Embed Poster',
     webpushsettingssaved: 'Web push notification settings saved successfully!',
     webpushsettingsfailed: 'Web push notification settings failed to save.',
     toastWebPushTestSending: 'Sending web push test notification…',
@@ -56,13 +55,11 @@ const NotificationsWebPush = () => {
       <Formik
         initialValues={{
           enabled: data.enabled,
-          embedPoster: data.embedPoster,
         }}
         onSubmit={async (values) => {
           try {
             await axios.post('/api/v1/settings/notifications/webpush', {
               enabled: values.enabled,
-              embedPoster: values.embedPoster,
               options: {},
             });
             mutate('/api/v1/settings/public');
@@ -80,7 +77,7 @@ const NotificationsWebPush = () => {
           }
         }}
       >
-        {({ isSubmitting, values }) => {
+        {({ isSubmitting }) => {
           const testSettings = async () => {
             setIsTesting(true);
             let toastId: string | undefined;
@@ -97,7 +94,6 @@ const NotificationsWebPush = () => {
               );
               await axios.post('/api/v1/settings/notifications/webpush/test', {
                 enabled: true,
-                embedPoster: values.embedPoster,
                 options: {},
               });
 
@@ -132,15 +128,6 @@ const NotificationsWebPush = () => {
                   <Field type="checkbox" id="enabled" name="enabled" />
                 </div>
               </div>
-              <div className="form-row">
-                <label htmlFor="embedPoster" className="checkbox-label">
-                  {intl.formatMessage(messages.embedPoster)}
-                  <span className="label-required">*</span>
-                </label>
-                <div className="form-input-area">
-                  <Field type="checkbox" id="embedPoster" name="embedPoster" />
-                </div>
-              </div>
               <div className="actions">
                 <div className="flex justify-end">
                   <span className="ml-3 inline-flex rounded-md shadow-sm">

src/components/Settings/Notifications/NotificationsWebhook/index.tsx

@@ -1,7 +1,6 @@
 import Button from '@app/components/Common/Button';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
-import SettingsBadge from '@app/components/Settings/SettingsBadge';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { isValidURL } from '@app/utils/urlValidationHelper';
@@ -74,11 +73,6 @@ const messages = defineMessages(
   {
     agentenabled: 'Enable Agent',
     webhookUrl: 'Webhook URL',
-    webhookUrlTip:
-      'Test Notification URL is set to {testUrl} instead of the actual webhook URL.',
-    supportVariables: 'Support URL Variables',
-    supportVariablesTip:
-      'Available variables are documented in the webhook template variables section',
     authheader: 'Authorization Header',
     validationJsonPayloadRequired: 'You must provide a valid JSON payload',
     webhooksettingssaved: 'Webhook notification settings saved successfully!',
@@ -117,14 +111,8 @@ const NotificationsWebhook = () => {
       .test(
         'valid-url',
         intl.formatMessage(messages.validationWebhookUrl),
-        function (value) {
-          const { supportVariables } = this.parent;
-          return supportVariables || isValidURL(value);
-        }
+        isValidURL
       ),
-
-    supportVariables: Yup.boolean(),
-
     jsonPayload: Yup.string()
       .when('enabled', {
         is: true,
@@ -159,7 +147,6 @@ const NotificationsWebhook = () => {
         webhookUrl: data.options.webhookUrl,
         jsonPayload: data.options.jsonPayload,
         authHeader: data.options.authHeader,
-        supportVariables: data.options.supportVariables ?? false,
       }}
       validationSchema={NotificationsWebhookSchema}
       onSubmit={async (values) => {
@@ -171,7 +158,6 @@ const NotificationsWebhook = () => {
               webhookUrl: values.webhookUrl,
               jsonPayload: JSON.stringify(values.jsonPayload),
               authHeader: values.authHeader,
-              supportVariables: values.supportVariables,
             },
           });
           addToast(intl.formatMessage(messages.webhooksettingssaved), {
@@ -229,7 +215,6 @@ const NotificationsWebhook = () => {
                 webhookUrl: values.webhookUrl,
                 jsonPayload: JSON.stringify(values.jsonPayload),
                 authHeader: values.authHeader,
-                supportVariables: values.supportVariables ?? false,
               },
             });
 
@@ -264,59 +249,10 @@ const NotificationsWebhook = () => {
                 <Field type="checkbox" id="enabled" name="enabled" />
               </div>
             </div>
-            <div className="form-row">
-              <label htmlFor="supportVariables" className="checkbox-label">
-                <span className="mr-2">
-                  {intl.formatMessage(messages.supportVariables)}
-                </span>
-                <SettingsBadge badgeType="experimental" />
-                <span className="label-tip">
-                  {intl.formatMessage(messages.supportVariablesTip)}
-                </span>
-              </label>
-              <div className="form-input-area">
-                <Field
-                  type="checkbox"
-                  id="supportVariables"
-                  name="supportVariables"
-                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                    setFieldValue('supportVariables', e.target.checked)
-                  }
-                />
-              </div>
-            </div>
-            {values.supportVariables && (
-              <div className="mt-2">
-                <Link
-                  href="https://docs.jellyseerr.dev/using-jellyseerr/notifications/webhook#template-variables"
-                  passHref
-                  legacyBehavior
-                >
-                  <Button
-                    as="a"
-                    buttonSize="sm"
-                    target="_blank"
-                    rel="noreferrer"
-                  >
-                    <QuestionMarkCircleIcon />
-                    <span>
-                      {intl.formatMessage(messages.templatevariablehelp)}
-                    </span>
-                  </Button>
-                </Link>
-              </div>
-            )}
             <div className="form-row">
               <label htmlFor="webhookUrl" className="text-label">
                 {intl.formatMessage(messages.webhookUrl)}
                 <span className="label-required">*</span>
-                {values.supportVariables && (
-                  <div className="label-tip">
-                    {intl.formatMessage(messages.webhookUrlTip, {
-                      testUrl: '/test',
-                    })}
-                  </div>
-                )}
               </label>
               <div className="form-input-area">
                 <div className="form-input-field">
@@ -376,7 +312,7 @@ const NotificationsWebhook = () => {
                     <span>{intl.formatMessage(messages.resetPayload)}</span>
                   </Button>
                   <Link
-                    href="https://docs.jellyseerr.dev/using-jellyseerr/notifications/webhook#template-variables"
+                    href="https://docs.overseerr.dev/using-overseerr/notifications/webhooks#template-variables"
                     passHref
                     legacyBehavior
                   >

src/components/Settings/SettingsMain/index.tsx

@@ -7,6 +7,7 @@ import LanguageSelector from '@app/components/LanguageSelector';
 import RegionSelector from '@app/components/RegionSelector';
 import CopyButton from '@app/components/Settings/CopyButton';
 import SettingsBadge from '@app/components/Settings/SettingsBadge';
+import type { AvailableLocale } from '@app/context/LanguageContext';
 import { availableLanguages } from '@app/context/LanguageContext';
 import useLocale from '@app/hooks/useLocale';
 import { Permission, useUser } from '@app/hooks/useUser';
@@ -17,7 +18,6 @@ import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import { ArrowPathIcon } from '@heroicons/react/24/solid';
 import type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces';
 import type { MainSettings } from '@server/lib/settings';
-import type { AvailableLocale } from '@server/types/languages';
 import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useIntl } from 'react-intl';

src/components/Settings/SettingsNetwork/index.tsx

@@ -126,7 +126,7 @@ const SettingsNetwork = () => {
                 proxy: {
                   enabled: values.proxyEnabled,
                   hostname: values.proxyHostname,
-                  port: Number(values.proxyPort),
+                  port: values.proxyPort,
                   useSsl: values.proxySsl,
                   user: values.proxyUser,
                   password: values.proxyPassword,

src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx

@@ -5,6 +5,7 @@ import PageTitle from '@app/components/Common/PageTitle';
 import LanguageSelector from '@app/components/LanguageSelector';
 import QuotaSelector from '@app/components/QuotaSelector';
 import RegionSelector from '@app/components/RegionSelector';
+import type { AvailableLocale } from '@app/context/LanguageContext';
 import { availableLanguages } from '@app/context/LanguageContext';
 import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
@@ -15,7 +16,6 @@ import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import { ApiErrorCode } from '@server/constants/error';
 import type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces';
-import type { AvailableLocale } from '@server/types/languages';
 import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useRouter } from 'next/router';

src/context/LanguageContext.tsx

@@ -1,6 +1,41 @@
-import { type AvailableLocale } from '@server/types/languages';
 import React from 'react';
 
+export type AvailableLocale =
+  | 'ar'
+  | 'bg'
+  | 'ca'
+  | 'cs'
+  | 'da'
+  | 'de'
+  | 'en'
+  | 'el'
+  | 'es'
+  | 'es-MX'
+  | 'fi'
+  | 'fr'
+  | 'hr'
+  | 'he'
+  | 'hi'
+  | 'hu'
+  | 'it'
+  | 'ja'
+  | 'ko'
+  | 'lt'
+  | 'nb-NO'
+  | 'nl'
+  | 'pl'
+  | 'pt-BR'
+  | 'pt-PT'
+  | 'ro'
+  | 'ru'
+  | 'sq'
+  | 'sr'
+  | 'sv'
+  | 'tr'
+  | 'uk'
+  | 'zh-CN'
+  | 'zh-TW';
+
 type AvailableLanguageObject = Record<
   string,
   { code: AvailableLocale; display: string }

src/i18n/locale/en.json

@@ -78,7 +78,6 @@
   "components.Discover.FilterSlideover.activefilters": "{count, plural, one {# Active Filter} other {# Active Filters}}",
   "components.Discover.FilterSlideover.certification": "Content Rating",
   "components.Discover.FilterSlideover.clearfilters": "Clear Active Filters",
-  "components.Discover.FilterSlideover.excludeKeywords": "Exclude Keywords",
   "components.Discover.FilterSlideover.filters": "Filters",
   "components.Discover.FilterSlideover.firstAirDate": "First Air Date",
   "components.Discover.FilterSlideover.from": "From",
@@ -181,7 +180,6 @@
   "components.IssueDetails.toaststatusupdated": "Issue status updated successfully!",
   "components.IssueDetails.toaststatusupdatefailed": "Something went wrong while updating the issue status.",
   "components.IssueDetails.unknownissuetype": "Unknown",
-  "components.IssueList.IssueItem.descriptionpreview": "Issue Description",
   "components.IssueList.IssueItem.episodes": "{episodeCount, plural, one {Episode} other {Episodes}}",
   "components.IssueList.IssueItem.issuestatus": "Status",
   "components.IssueList.IssueItem.issuetype": "Type",
@@ -625,7 +623,6 @@
   "components.Settings.Notifications.NotificationsGotify.validationUrlRequired": "You must provide a valid URL",
   "components.Settings.Notifications.NotificationsGotify.validationUrlTrailingSlash": "URL must not end in a trailing slash",
   "components.Settings.Notifications.NotificationsNtfy.agentenabled": "Enable Agent",
-  "components.Settings.Notifications.NotificationsNtfy.embedPoster": "Embed Poster",
   "components.Settings.Notifications.NotificationsNtfy.ntfysettingsfailed": "Ntfy notification settings failed to save.",
   "components.Settings.Notifications.NotificationsNtfy.ntfysettingssaved": "Ntfy notification settings saved successfully!",
   "components.Settings.Notifications.NotificationsNtfy.password": "Password",
@@ -656,7 +653,6 @@
   "components.Settings.Notifications.NotificationsPushover.accessTokenTip": "<ApplicationRegistrationLink>Register an application</ApplicationRegistrationLink> for use with Jellyseerr",
   "components.Settings.Notifications.NotificationsPushover.agentenabled": "Enable Agent",
   "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Device Default",
-  "components.Settings.Notifications.NotificationsPushover.embedPoster": "Embed Poster",
   "components.Settings.Notifications.NotificationsPushover.pushoversettingsfailed": "Pushover notification settings failed to save.",
   "components.Settings.Notifications.NotificationsPushover.pushoversettingssaved": "Pushover notification settings saved successfully!",
   "components.Settings.Notifications.NotificationsPushover.sound": "Notification Sound",
@@ -669,7 +665,6 @@
   "components.Settings.Notifications.NotificationsPushover.validationTypes": "You must select at least one notification type",
   "components.Settings.Notifications.NotificationsPushover.validationUserTokenRequired": "You must provide a valid user or group key",
   "components.Settings.Notifications.NotificationsSlack.agentenabled": "Enable Agent",
-  "components.Settings.Notifications.NotificationsSlack.embedPoster": "Embed Poster",
   "components.Settings.Notifications.NotificationsSlack.slacksettingsfailed": "Slack notification settings failed to save.",
   "components.Settings.Notifications.NotificationsSlack.slacksettingssaved": "Slack notification settings saved successfully!",
   "components.Settings.Notifications.NotificationsSlack.toastSlackTestFailed": "Slack test notification failed to send.",
@@ -684,8 +679,6 @@
   "components.Settings.Notifications.NotificationsWebhook.customJson": "JSON Payload",
   "components.Settings.Notifications.NotificationsWebhook.resetPayload": "Reset to Default",
   "components.Settings.Notifications.NotificationsWebhook.resetPayloadSuccess": "JSON payload reset successfully!",
-  "components.Settings.Notifications.NotificationsWebhook.supportVariables": "Support URL Variables",
-  "components.Settings.Notifications.NotificationsWebhook.supportVariablesTip": "Available variables are documented in the webhook template variables section",
   "components.Settings.Notifications.NotificationsWebhook.templatevariablehelp": "Template Variable Help",
   "components.Settings.Notifications.NotificationsWebhook.toastWebhookTestFailed": "Webhook test notification failed to send.",
   "components.Settings.Notifications.NotificationsWebhook.toastWebhookTestSending": "Sending webhook test notification…",
@@ -694,11 +687,9 @@
   "components.Settings.Notifications.NotificationsWebhook.validationTypes": "You must select at least one notification type",
   "components.Settings.Notifications.NotificationsWebhook.validationWebhookUrl": "You must provide a valid URL",
   "components.Settings.Notifications.NotificationsWebhook.webhookUrl": "Webhook URL",
-  "components.Settings.Notifications.NotificationsWebhook.webhookUrlTip": "Test Notification URL is set to {testUrl} instead of the actual webhook URL.",
   "components.Settings.Notifications.NotificationsWebhook.webhooksettingsfailed": "Webhook notification settings failed to save.",
   "components.Settings.Notifications.NotificationsWebhook.webhooksettingssaved": "Webhook notification settings saved successfully!",
   "components.Settings.Notifications.NotificationsWebPush.agentenabled": "Enable Agent",
-  "components.Settings.Notifications.NotificationsWebPush.embedPoster": "Embed Poster",
   "components.Settings.Notifications.NotificationsWebPush.httpsRequirement": "In order to receive web push notifications, Jellyseerr must be served over HTTPS.",
   "components.Settings.Notifications.NotificationsWebPush.toastWebPushTestFailed": "Web push test notification failed to send.",
   "components.Settings.Notifications.NotificationsWebPush.toastWebPushTestSending": "Sending web push test notification…",
@@ -721,7 +712,6 @@
   "components.Settings.Notifications.emailsender": "Sender Address",
   "components.Settings.Notifications.emailsettingsfailed": "Email notification settings failed to save.",
   "components.Settings.Notifications.emailsettingssaved": "Email notification settings saved successfully!",
-  "components.Settings.Notifications.embedPoster": "Embed Poster",
   "components.Settings.Notifications.enableMentions": "Enable Mentions",
   "components.Settings.Notifications.encryption": "Encryption Method",
   "components.Settings.Notifications.encryptionDefault": "Use STARTTLS if available",
@@ -1167,7 +1157,6 @@
   "components.Settings.menuServices": "Services",
   "components.Settings.menuUsers": "Users",
   "components.Settings.metadataProviderSelection": "Metadata Provider Selection",
-  "components.Settings.metadataProviderSettings": "Metadata Providers",
   "components.Settings.metadataSettings": "Settings for metadata provider",
   "components.Settings.metadataSettingsSaved": "Metadata provider settings saved",
   "components.Settings.no": "No",

src/pages/_app.tsx

@@ -6,6 +6,7 @@ import StatusChecker from '@app/components/StatusChecker';
 import Toast from '@app/components/Toast';
 import ToastContainer from '@app/components/ToastContainer';
 import { InteractionProvider } from '@app/context/InteractionContext';
+import type { AvailableLocale } from '@app/context/LanguageContext';
 import { LanguageContext } from '@app/context/LanguageContext';
 import { SettingsProvider } from '@app/context/SettingsContext';
 import { UserContext } from '@app/context/UserContext';
@@ -15,7 +16,6 @@ import '@app/styles/globals.css';
 import { polyfillIntl } from '@app/utils/polyfillIntl';
 import { MediaServerType } from '@server/constants/server';
 import type { PublicSettingsResponse } from '@server/interfaces/api/settingsInterfaces';
-import type { AvailableLocale } from '@server/types/languages';
 import axios from 'axios';
 import type { AppInitialProps, AppProps } from 'next/app';
 import App from 'next/app';