Merge remote-tracking branch 'overseerr/develop' into develop

src/context/InteractionContext.tsx

@@ -1,15 +1,16 @@
+import useInteraction from '@app/hooks/useInteraction';
 import React from 'react';
-import useInteraction from '../hooks/useInteraction';
 
 interface InteractionContextProps {
-  isTouch: boolean;
+  isTouch?: boolean;
+  children?: React.ReactNode;
 }
 
 export const InteractionContext = React.createContext<InteractionContextProps>({
   isTouch: false,
 });
 
-export const InteractionProvider: React.FC = ({ children }) => {
+export const InteractionProvider = ({ children }: InteractionContextProps) => {
   const isTouch = useInteraction();
 
   return (

src/context/LanguageContext.tsx

@@ -1,6 +1,7 @@
-import React, { ReactNode } from 'react';
+import React from 'react';
 
 export type AvailableLocale =
+  | 'ar'
   | 'ca'
   | 'cs'
   | 'da'
@@ -8,10 +9,11 @@ export type AvailableLocale =
   | 'en'
   | 'el'
   | 'es'
-  | 'it'
-  | 'ja'
   | 'fr'
   | 'hu'
+  | 'it'
+  | 'ja'
+  | 'lt'
   | 'nb-NO'
   | 'nl'
   | 'pl'
@@ -62,6 +64,10 @@ export const availableLanguages: AvailableLanguageObject = {
     code: 'it',
     display: 'Italiano',
   },
+  lt: {
+    code: 'lt',
+    display: 'Lietuvių',
+  },
   hu: {
     code: 'hu',
     display: 'Magyar',
@@ -106,6 +112,10 @@ export const availableLanguages: AvailableLanguageObject = {
     code: 'sr',
     display: 'српски језик',
   },
+  ar: {
+    code: 'ar',
+    display: 'العربية',
+  },
   ja: {
     code: 'ja',
     display: '日本語',
@@ -122,7 +132,7 @@ export const availableLanguages: AvailableLanguageObject = {
 
 export interface LanguageContextProps {
   locale: AvailableLocale;
-  children: (locale: string) => ReactNode;
+  children: (locale: string) => React.ReactNode;
   setLocale?: React.Dispatch<React.SetStateAction<AvailableLocale>>;
 }
 

src/context/SettingsContext.tsx

@@ -1,10 +1,11 @@
+import { MediaServerType } from '@server/constants/server';
+import type { PublicSettingsResponse } from '@server/interfaces/api/settingsInterfaces';
 import React from 'react';
 import useSWR from 'swr';
-import { MediaServerType } from '../../server/constants/server';
-import { PublicSettingsResponse } from '../../server/interfaces/api/settingsInterfaces';
 
 export interface SettingsContextProps {
   currentSettings: PublicSettingsResponse;
+  children?: React.ReactNode;
 }
 
 const defaultSettings = {
@@ -31,10 +32,10 @@ export const SettingsContext = React.createContext<SettingsContextProps>({
   currentSettings: defaultSettings,
 });
 
-export const SettingsProvider: React.FC<SettingsContextProps> = ({
+export const SettingsProvider = ({
   children,
   currentSettings,
-}) => {
+}: SettingsContextProps) => {
   const { data, error } = useSWR<PublicSettingsResponse>(
     '/api/v1/settings/public',
     { fallbackData: currentSettings }

src/context/UserContext.tsx

@@ -1,9 +1,11 @@
+import type { User } from '@app/hooks/useUser';
+import { useUser } from '@app/hooks/useUser';
 import { useRouter } from 'next/dist/client/router';
-import React, { useEffect, useRef } from 'react';
-import { User, useUser } from '../hooks/useUser';
+import { useEffect, useRef } from 'react';
 
 interface UserContextProps {
   initialUser: User;
+  children?: React.ReactNode;
 }
 
 /**
@@ -11,10 +13,7 @@ interface UserContextProps {
  * cache on server side render. It also will handle redirecting the user to
  * the login page if their session ever becomes invalid.
  */
-export const UserContext: React.FC<UserContextProps> = ({
-  initialUser,
-  children,
-}) => {
+export const UserContext = ({ initialUser, children }: UserContextProps) => {
   const { user, error, revalidate } = useUser({ initialData: initialUser });
   const router = useRouter();
   const routing = useRef(false);