From 7c890443e0104e6e41d02cf1c43948710cf94e0d Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Fri, 30 Jun 2023 11:43:11 +0200
Subject: [PATCH 01/20] update routes for multisearch

---
 src/setup/App.tsx | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/setup/App.tsx b/src/setup/App.tsx
index 53f3c131..135237e7 100644
--- a/src/setup/App.tsx
+++ b/src/setup/App.tsx
@@ -10,7 +10,6 @@ import {
 
 import { convertLegacyUrl, isLegacyUrl } from "@/backend/metadata/getmeta";
 import { generateQuickSearchMediaUrl } from "@/backend/metadata/tmdb";
-import { MWMediaType } from "@/backend/metadata/types/mw";
 import { BannerContextProvider } from "@/hooks/useBanner";
 import { Layout } from "@/setup/Layout";
 import { BookmarkContextProvider } from "@/state/bookmark";
@@ -64,9 +63,6 @@ function App() {
               <Switch>
                 {/* functional routes */}
                 <Route exact path="/v2-migration" component={V2MigrationView} />
-                <Route exact path="/">
-                  <Redirect to={`/search/${MWMediaType.MOVIE}`} />
-                </Route>
                 <Route exact path="/s/:query">
                   <QuickSearch />
                 </Route>
@@ -82,11 +78,16 @@ function App() {
                     <MediaView />
                   </LegacyUrlView>
                 </Route>
-                <Route
-                  exact
-                  path="/search/:type/:query?"
-                  component={SearchView}
-                />
+                <Route exact path="/search/:type/:query?">
+                  <Redirect to="/browse/:query" />
+                </Route>
+                <Route exact path="/search/:type">
+                  <Redirect to="/browse" />
+                </Route>
+                <Route exact path="/browse/:query?" component={SearchView} />
+                <Route exact path="/">
+                  <Redirect to="/browse" />
+                </Route>
 
                 {/* other */}
                 <Route

From 95f03db5b2237cefc5b7126e3dc6648c19df8a18 Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Fri, 30 Jun 2023 12:20:01 +0200
Subject: [PATCH 02/20] refactor search

---
 src/backend/metadata/getmeta.ts    |  3 +-
 src/backend/metadata/search.ts     | 15 ++----
 src/backend/metadata/tmdb.ts       | 82 ++++++++++--------------------
 src/backend/metadata/types/tmdb.ts | 57 +++------------------
 src/components/SearchBar.tsx       | 44 +---------------
 src/state/watched/migrations/v3.ts |  6 ++-
 6 files changed, 45 insertions(+), 162 deletions(-)

diff --git a/src/backend/metadata/getmeta.ts b/src/backend/metadata/getmeta.ts
index 6081e5ad..b2a84433 100644
--- a/src/backend/metadata/getmeta.ts
+++ b/src/backend/metadata/getmeta.ts
@@ -19,6 +19,7 @@ import {
 } from "./types/justwatch";
 import { MWMediaMeta, MWMediaType } from "./types/mw";
 import {
+  TMDBContentTypes,
   TMDBMediaResult,
   TMDBMovieData,
   TMDBSeasonMetaResult,
@@ -177,7 +178,7 @@ export async function convertLegacyUrl(
   const urlParts = url.split("/").slice(2);
   const [, type, id] = urlParts[0].split("-", 3);
 
-  const mediaType = TMDBMediaToMediaType(type);
+  const mediaType = TMDBMediaToMediaType(type as TMDBContentTypes);
   const meta = await getLegacyMetaFromId(mediaType, id);
 
   if (!meta) return undefined;
diff --git a/src/backend/metadata/search.ts b/src/backend/metadata/search.ts
index 0d8f561f..9ae985e7 100644
--- a/src/backend/metadata/search.ts
+++ b/src/backend/metadata/search.ts
@@ -1,11 +1,6 @@
 import { SimpleCache } from "@/utils/cache";
 
-import {
-  formatTMDBMeta,
-  formatTMDBSearchResult,
-  mediaTypeToTMDB,
-  searchMedia,
-} from "./tmdb";
+import { formatTMDBMeta, formatTMDBSearchResult, multiSearch } from "./tmdb";
 import { MWMediaMeta, MWQuery } from "./types/mw";
 
 const cache = new SimpleCache<MWQuery, MWMediaMeta[]>();
@@ -16,11 +11,11 @@ cache.initialize();
 
 export async function searchForMedia(query: MWQuery): Promise<MWMediaMeta[]> {
   if (cache.has(query)) return cache.get(query) as MWMediaMeta[];
-  const { searchQuery, type } = query;
+  const { searchQuery } = query;
 
-  const data = await searchMedia(searchQuery, mediaTypeToTMDB(type));
-  const results = data.results.map((v) => {
-    const formattedResult = formatTMDBSearchResult(v, mediaTypeToTMDB(type));
+  const data = await multiSearch(searchQuery);
+  const results = data.map((v) => {
+    const formattedResult = formatTMDBSearchResult(v, v.media_type);
     return formatTMDBMeta(formattedResult);
   });
 
diff --git a/src/backend/metadata/tmdb.ts b/src/backend/metadata/tmdb.ts
index 64304900..9f42ce4d 100644
--- a/src/backend/metadata/tmdb.ts
+++ b/src/backend/metadata/tmdb.ts
@@ -11,29 +11,25 @@ import {
   TMDBMediaResult,
   TMDBMovieData,
   TMDBMovieExternalIds,
-  TMDBMovieResponse,
-  TMDBMovieResult,
   TMDBMovieSearchResult,
   TMDBSearchResult,
   TMDBSeason,
   TMDBSeasonMetaResult,
   TMDBShowData,
   TMDBShowExternalIds,
-  TMDBShowResponse,
-  TMDBShowResult,
   TMDBShowSearchResult,
 } from "./types/tmdb";
 import { mwFetch } from "../helpers/fetch";
 
 export function mediaTypeToTMDB(type: MWMediaType): TMDBContentTypes {
-  if (type === MWMediaType.MOVIE) return "movie";
-  if (type === MWMediaType.SERIES) return "show";
+  if (type === MWMediaType.MOVIE) return TMDBContentTypes.MOVIE;
+  if (type === MWMediaType.SERIES) return TMDBContentTypes.TV;
   throw new Error("unsupported type");
 }
 
-export function TMDBMediaToMediaType(type: string): MWMediaType {
-  if (type === "movie") return MWMediaType.MOVIE;
-  if (type === "show") return MWMediaType.SERIES;
+export function TMDBMediaToMediaType(type: TMDBContentTypes): MWMediaType {
+  if (type === TMDBContentTypes.MOVIE) return MWMediaType.MOVIE;
+  if (type === TMDBContentTypes.TV) return MWMediaType.SERIES;
   throw new Error("unsupported type");
 }
 
@@ -103,7 +99,7 @@ export function decodeTMDBId(
   if (prefix !== "tmdb") return null;
   let mediaType;
   try {
-    mediaType = TMDBMediaToMediaType(type);
+    mediaType = TMDBMediaToMediaType(type as TMDBContentTypes);
   } catch {
     return null;
   }
@@ -131,36 +127,6 @@ async function get<T>(url: string, params?: object): Promise<T> {
   return res;
 }
 
-export async function searchMedia(
-  query: string,
-  type: TMDBContentTypes
-): Promise<TMDBMovieResponse | TMDBShowResponse> {
-  let data;
-
-  switch (type) {
-    case "movie":
-      data = await get<TMDBMovieResponse>("search/movie", {
-        query,
-        include_adult: false,
-        language: "en-US",
-        page: 1,
-      });
-      break;
-    case "show":
-      data = await get<TMDBShowResponse>("search/tv", {
-        query,
-        include_adult: false,
-        language: "en-US",
-        page: 1,
-      });
-      break;
-    default:
-      throw new Error("Invalid media type");
-  }
-
-  return data;
-}
-
 export async function multiSearch(
   query: string
 ): Promise<(TMDBMovieSearchResult | TMDBShowSearchResult)[]> {
@@ -172,7 +138,9 @@ export async function multiSearch(
   });
   // filter out results that aren't movies or shows
   const results = data.results.filter(
-    (r) => r.media_type === "movie" || r.media_type === "tv"
+    (r) =>
+      r.media_type === TMDBContentTypes.MOVIE ||
+      r.media_type === TMDBContentTypes.TV
   );
   return results;
 }
@@ -183,31 +151,32 @@ export async function generateQuickSearchMediaUrl(
   const data = await multiSearch(query);
   if (data.length === 0) return undefined;
   const result = data[0];
-  const type = result.media_type === "movie" ? "movie" : "show";
-  const title = result.media_type === "movie" ? result.title : result.name;
+  const title =
+    result.media_type === TMDBContentTypes.MOVIE ? result.title : result.name;
 
   return `/media/${TMDBIdToUrlId(
-    TMDBMediaToMediaType(type),
+    TMDBMediaToMediaType(result.media_type),
     result.id.toString(),
     title
   )}`;
 }
 
 // Conditional type which for inferring the return type based on the content type
-type MediaDetailReturn<T extends TMDBContentTypes> = T extends "movie"
-  ? TMDBMovieData
-  : T extends "show"
-  ? TMDBShowData
-  : never;
+type MediaDetailReturn<T extends TMDBContentTypes> =
+  T extends TMDBContentTypes.MOVIE
+    ? TMDBMovieData
+    : T extends TMDBContentTypes.TV
+    ? TMDBShowData
+    : never;
 
 export function getMediaDetails<
   T extends TMDBContentTypes,
   TReturn = MediaDetailReturn<T>
 >(id: string, type: T): Promise<TReturn> {
-  if (type === "movie") {
+  if (type === TMDBContentTypes.MOVIE) {
     return get<TReturn>(`/movie/${id}`);
   }
-  if (type === "show") {
+  if (type === TMDBContentTypes.TV) {
     return get<TReturn>(`/tv/${id}`);
   }
   throw new Error("Invalid media type");
@@ -236,10 +205,10 @@ export async function getExternalIds(
   let data;
 
   switch (type) {
-    case "movie":
+    case TMDBContentTypes.MOVIE:
       data = await get<TMDBMovieExternalIds>(`/movie/${id}/external_ids`);
       break;
-    case "show":
+    case TMDBContentTypes.TV:
       data = await get<TMDBShowExternalIds>(`/tv/${id}/external_ids`);
       break;
     default:
@@ -263,12 +232,12 @@ export async function getMovieFromExternalId(
 }
 
 export function formatTMDBSearchResult(
-  result: TMDBShowResult | TMDBMovieResult,
+  result: TMDBMovieSearchResult | TMDBShowSearchResult,
   mediatype: TMDBContentTypes
 ): TMDBMediaResult {
   const type = TMDBMediaToMediaType(mediatype);
   if (type === MWMediaType.SERIES) {
-    const show = result as TMDBShowResult;
+    const show = result as TMDBShowSearchResult;
     return {
       title: show.name,
       poster: getMediaPoster(show.poster_path),
@@ -277,7 +246,8 @@ export function formatTMDBSearchResult(
       object_type: mediatype,
     };
   }
-  const movie = result as TMDBMovieResult;
+
+  const movie = result as TMDBMovieSearchResult;
 
   return {
     title: movie.title,
diff --git a/src/backend/metadata/types/tmdb.ts b/src/backend/metadata/types/tmdb.ts
index 8f6bf14b..12cc0d1a 100644
--- a/src/backend/metadata/types/tmdb.ts
+++ b/src/backend/metadata/types/tmdb.ts
@@ -1,4 +1,7 @@
-export type TMDBContentTypes = "movie" | "show";
+export enum TMDBContentTypes {
+  MOVIE = "movie",
+  TV = "tv",
+}
 
 export type TMDBSeasonShort = {
   title: string;
@@ -183,54 +186,6 @@ export interface TMDBEpisodeResult {
   };
 }
 
-export interface TMDBShowResult {
-  adult: boolean;
-  backdrop_path: string | null;
-  genre_ids: number[];
-  id: number;
-  origin_country: string[];
-  original_language: string;
-  original_name: string;
-  overview: string;
-  popularity: number;
-  poster_path: string | null;
-  first_air_date: string;
-  name: string;
-  vote_average: number;
-  vote_count: number;
-}
-
-export interface TMDBShowResponse {
-  page: number;
-  results: TMDBShowResult[];
-  total_pages: number;
-  total_results: number;
-}
-
-export interface TMDBMovieResult {
-  adult: boolean;
-  backdrop_path: string | null;
-  genre_ids: number[];
-  id: number;
-  original_language: string;
-  original_title: string;
-  overview: string;
-  popularity: number;
-  poster_path: string | null;
-  release_date: string;
-  title: string;
-  video: boolean;
-  vote_average: number;
-  vote_count: number;
-}
-
-export interface TMDBMovieResponse {
-  page: number;
-  results: TMDBMovieResult[];
-  total_pages: number;
-  total_results: number;
-}
-
 export interface TMDBEpisode {
   air_date: string;
   episode_number: number;
@@ -316,7 +271,7 @@ export interface TMDBMovieSearchResult {
   original_title: string;
   overview: string;
   poster_path: string;
-  media_type: "movie";
+  media_type: TMDBContentTypes.MOVIE;
   genre_ids: number[];
   popularity: number;
   release_date: string;
@@ -334,7 +289,7 @@ export interface TMDBShowSearchResult {
   original_name: string;
   overview: string;
   poster_path: string;
-  media_type: "tv";
+  media_type: TMDBContentTypes.TV;
   genre_ids: number[];
   popularity: number;
   first_air_date: string;
diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar.tsx
index 431de337..1d2ce354 100644
--- a/src/components/SearchBar.tsx
+++ b/src/components/SearchBar.tsx
@@ -1,14 +1,9 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
+import { MWQuery } from "@/backend/metadata/types/mw";
 
-import { MWMediaType, MWQuery } from "@/backend/metadata/types/mw";
-
-import { DropdownButton } from "./buttons/DropdownButton";
 import { Icon, Icons } from "./Icon";
 import { TextInputControl } from "./text-inputs/TextInputControl";
 
 export interface SearchBarProps {
-  buttonText?: string;
   placeholder?: string;
   onChange: (value: MWQuery, force: boolean) => void;
   onUnFocus: () => void;
@@ -16,9 +11,6 @@ export interface SearchBarProps {
 }
 
 export function SearchBarInput(props: SearchBarProps) {
-  const { t } = useTranslation();
-
-  const [dropdownOpen, setDropdownOpen] = useState(false);
   function setSearch(value: string) {
     props.onChange(
       {
@@ -28,15 +20,6 @@ export function SearchBarInput(props: SearchBarProps) {
       false
     );
   }
-  function setType(type: string) {
-    props.onChange(
-      {
-        ...props.value,
-        type: type as MWMediaType,
-      },
-      true
-    );
-  }
 
   return (
     <div className="relative flex flex-col rounded-[28px] bg-denim-400 transition-colors focus-within:bg-denim-400 hover:bg-denim-500 sm:flex-row sm:items-center">
@@ -51,31 +34,6 @@ export function SearchBarInput(props: SearchBarProps) {
         className="w-full flex-1 bg-transparent px-4 py-4 pl-12 text-white  placeholder-denim-700 focus:outline-none sm:py-4 sm:pr-2"
         placeholder={props.placeholder}
       />
-
-      <div className="px-4 py-4 pt-0 sm:px-2 sm:py-2">
-        <DropdownButton
-          icon={Icons.SEARCH}
-          open={dropdownOpen}
-          setOpen={(val) => setDropdownOpen(val)}
-          selectedItem={props.value.type}
-          setSelectedItem={(val) => setType(val)}
-          options={[
-            {
-              id: MWMediaType.MOVIE,
-              name: t("searchBar.movie"),
-              icon: Icons.FILM,
-            },
-            {
-              id: MWMediaType.SERIES,
-              name: t("searchBar.series"),
-              icon: Icons.CLAPPER_BOARD,
-            },
-          ]}
-          onClick={() => setDropdownOpen((old) => !old)}
-        >
-          {props.buttonText || t("searchBar.search")}
-        </DropdownButton>
-      </div>
     </div>
   );
 }
diff --git a/src/state/watched/migrations/v3.ts b/src/state/watched/migrations/v3.ts
index dffae637..f546c943 100644
--- a/src/state/watched/migrations/v3.ts
+++ b/src/state/watched/migrations/v3.ts
@@ -5,6 +5,7 @@ import {
   getMovieFromExternalId,
 } from "@/backend/metadata/tmdb";
 import { MWMediaType } from "@/backend/metadata/types/mw";
+import { TMDBContentTypes } from "@/backend/metadata/types/tmdb";
 import { BookmarkStoreData } from "@/state/bookmark/types";
 import { isNotNull } from "@/utils/typeguard";
 
@@ -59,7 +60,10 @@ export async function migrateV3Videos(
         clone.item.meta.id = migratedId;
         if (clone.item.series) {
           const series = clone.item.series;
-          const details = await getMediaDetails(migratedId, "show");
+          const details = await getMediaDetails(
+            migratedId,
+            TMDBContentTypes.TV
+          );
 
           const season = details.seasons.find(
             (v) => v.season_number === series.season

From 5a4a9f01f37839ef791d31f7a93a634d4d182edd Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Fri, 30 Jun 2023 12:57:29 +0200
Subject: [PATCH 03/20] cleanup and overlooked refactoring

---
 src/backend/metadata/getmeta.ts    | 21 +++++++++++++++++----
 src/backend/metadata/tmdb.ts       | 29 +++--------------------------
 src/backend/metadata/types/tmdb.ts | 30 ++++++------------------------
 3 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/src/backend/metadata/getmeta.ts b/src/backend/metadata/getmeta.ts
index b2a84433..199efccb 100644
--- a/src/backend/metadata/getmeta.ts
+++ b/src/backend/metadata/getmeta.ts
@@ -6,7 +6,6 @@ import {
   TMDBMediaToMediaType,
   formatTMDBMeta,
   getEpisodes,
-  getExternalIds,
   getMediaDetails,
   getMediaPoster,
   getMovieFromExternalId,
@@ -75,8 +74,7 @@ export async function getMetaFromId(
 
   if (!details) return null;
 
-  const externalIds = await getExternalIds(id, mediaTypeToTMDB(type));
-  const imdbId = externalIds.imdb_id ?? undefined;
+  const imdbId = details.external_ids.imdb_id ?? undefined;
 
   let seasonData: TMDBSeasonMetaResult | undefined;
 
@@ -166,7 +164,13 @@ export async function getLegacyMetaFromId(
 }
 
 export function isLegacyUrl(url: string): boolean {
-  if (url.startsWith("/media/JW")) return true;
+  if (url.startsWith("/media/JW") || url.startsWith("/media/tmdb-show"))
+    return true;
+  return false;
+}
+
+export function isLegacyMediaType(url: string): boolean {
+  if (url.startsWith("/media/tmdb-show")) return true;
   return false;
 }
 
@@ -178,6 +182,15 @@ export async function convertLegacyUrl(
   const urlParts = url.split("/").slice(2);
   const [, type, id] = urlParts[0].split("-", 3);
 
+  if (isLegacyMediaType(url)) {
+    const details = await getMediaDetails(id, TMDBContentTypes.TV);
+    return `/media/${TMDBIdToUrlId(
+      MWMediaType.SERIES,
+      details.id.toString(),
+      details.name
+    )}`;
+  }
+
   const mediaType = TMDBMediaToMediaType(type as TMDBContentTypes);
   const meta = await getLegacyMetaFromId(mediaType, id);
 
diff --git a/src/backend/metadata/tmdb.ts b/src/backend/metadata/tmdb.ts
index 9f42ce4d..d4e75e57 100644
--- a/src/backend/metadata/tmdb.ts
+++ b/src/backend/metadata/tmdb.ts
@@ -7,16 +7,13 @@ import {
   ExternalIdMovieSearchResult,
   TMDBContentTypes,
   TMDBEpisodeShort,
-  TMDBExternalIds,
   TMDBMediaResult,
   TMDBMovieData,
-  TMDBMovieExternalIds,
   TMDBMovieSearchResult,
   TMDBSearchResult,
   TMDBSeason,
   TMDBSeasonMetaResult,
   TMDBShowData,
-  TMDBShowExternalIds,
   TMDBShowSearchResult,
 } from "./types/tmdb";
 import { mwFetch } from "../helpers/fetch";
@@ -130,7 +127,7 @@ async function get<T>(url: string, params?: object): Promise<T> {
 export async function multiSearch(
   query: string
 ): Promise<(TMDBMovieSearchResult | TMDBShowSearchResult)[]> {
-  const data = await get<TMDBSearchResult>(`search/multi`, {
+  const data = await get<TMDBSearchResult>("search/multi", {
     query,
     include_adult: false,
     language: "en-US",
@@ -174,10 +171,10 @@ export function getMediaDetails<
   TReturn = MediaDetailReturn<T>
 >(id: string, type: T): Promise<TReturn> {
   if (type === TMDBContentTypes.MOVIE) {
-    return get<TReturn>(`/movie/${id}`);
+    return get<TReturn>(`/movie/${id}`, { append_to_response: "external_ids" });
   }
   if (type === TMDBContentTypes.TV) {
-    return get<TReturn>(`/tv/${id}`);
+    return get<TReturn>(`/tv/${id}`, { append_to_response: "external_ids" });
   }
   throw new Error("Invalid media type");
 }
@@ -198,26 +195,6 @@ export async function getEpisodes(
   }));
 }
 
-export async function getExternalIds(
-  id: string,
-  type: TMDBContentTypes
-): Promise<TMDBExternalIds> {
-  let data;
-
-  switch (type) {
-    case TMDBContentTypes.MOVIE:
-      data = await get<TMDBMovieExternalIds>(`/movie/${id}/external_ids`);
-      break;
-    case TMDBContentTypes.TV:
-      data = await get<TMDBShowExternalIds>(`/tv/${id}/external_ids`);
-      break;
-    default:
-      throw new Error("Invalid media type");
-  }
-
-  return data;
-}
-
 export async function getMovieFromExternalId(
   imdbId: string
 ): Promise<string | undefined> {
diff --git a/src/backend/metadata/types/tmdb.ts b/src/backend/metadata/types/tmdb.ts
index 12cc0d1a..19a85c54 100644
--- a/src/backend/metadata/types/tmdb.ts
+++ b/src/backend/metadata/types/tmdb.ts
@@ -124,6 +124,9 @@ export interface TMDBShowData {
   type: string;
   vote_average: number;
   vote_count: number;
+  external_ids: {
+    imdb_id: string | null;
+  };
 }
 
 export interface TMDBMovieData {
@@ -172,6 +175,9 @@ export interface TMDBMovieData {
   video: boolean;
   vote_average: number;
   vote_count: number;
+  external_ids: {
+    imdb_id: string | null;
+  };
 }
 
 export interface TMDBEpisodeResult {
@@ -214,30 +220,6 @@ export interface TMDBSeason {
   season_number: number;
 }
 
-export interface TMDBShowExternalIds {
-  id: number;
-  imdb_id: null | string;
-  freebase_mid: null | string;
-  freebase_id: null | string;
-  tvdb_id: number;
-  tvrage_id: null | string;
-  wikidata_id: null | string;
-  facebook_id: null | string;
-  instagram_id: null | string;
-  twitter_id: null | string;
-}
-
-export interface TMDBMovieExternalIds {
-  id: number;
-  imdb_id: null | string;
-  wikidata_id: null | string;
-  facebook_id: null | string;
-  instagram_id: null | string;
-  twitter_id: null | string;
-}
-
-export type TMDBExternalIds = TMDBShowExternalIds | TMDBMovieExternalIds;
-
 export interface ExternalIdMovieSearchResult {
   movie_results: {
     adult: boolean;

From 915c69a4340084fd82f9d150016bd767face45cd Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Fri, 30 Jun 2023 21:33:59 +0200
Subject: [PATCH 04/20] add non dynamic opensearch :(

---
 index.html            | 3 +++
 public/opensearch.xml | 9 +++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 public/opensearch.xml

diff --git a/index.html b/index.html
index 23063c5a..515f227a 100644
--- a/index.html
+++ b/index.html
@@ -33,6 +33,9 @@
     <meta name="referrer" content="no-referrer" />
 
     <title>movie-web</title>
+
+	<!-- OpenSearch -->
+    <link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="/opensearch.xml">
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
diff --git a/public/opensearch.xml b/public/opensearch.xml
new file mode 100644
index 00000000..30d3e0ec
--- /dev/null
+++ b/public/opensearch.xml
@@ -0,0 +1,9 @@
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>movie-web</ShortName>
+  <Description>The place for your favorite movies &amp; shows</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <!-- <Url type="text/html" template="https://movie-web.app/browse/{searchTerms}" /> -->
+  <Url type="text/html" template="https://dev.movie-web.app/browse/{searchTerms}" />
+  <!-- <Url type="text/html" template="http://localhost:5173/#/browse/{searchTerms}" /> -->
+  <Url type="application/opensearchdescription+xml" rel="self" template="https://movie-web.app/opensearch.xml" />
+</OpenSearchDescription>

From 7cbe8e1d00a95b0b72b9f7f8879f8d02ee6b1af8 Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Fri, 30 Jun 2023 21:42:54 +0200
Subject: [PATCH 05/20] add google sitelinks

---
 index.html            | 17 +++++++++++++++++
 public/opensearch.xml |  1 -
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 515f227a..2587227e 100644
--- a/index.html
+++ b/index.html
@@ -36,6 +36,23 @@
 
 	<!-- OpenSearch -->
     <link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="/opensearch.xml">
+
+	<!-- Google Sitelinks -->
+	<script type="application/ld+json">
+		{
+		  "@context": "https://schema.org",
+		  "@type": "WebSite",
+		  "url": "https://movie-web.app/",
+		  "potentialAction": {
+			"@type": "SearchAction",
+			"target": {
+			  "@type": "EntryPoint",
+			  "urlTemplate": "https://movie-web.app/browse/{search_term_string}"
+			},
+			"query-input": "required name=search_term_string"
+		  }
+		}
+		</script>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
diff --git a/public/opensearch.xml b/public/opensearch.xml
index 30d3e0ec..9ecd3643 100644
--- a/public/opensearch.xml
+++ b/public/opensearch.xml
@@ -4,6 +4,5 @@
   <InputEncoding>UTF-8</InputEncoding>
   <!-- <Url type="text/html" template="https://movie-web.app/browse/{searchTerms}" /> -->
   <Url type="text/html" template="https://dev.movie-web.app/browse/{searchTerms}" />
-  <!-- <Url type="text/html" template="http://localhost:5173/#/browse/{searchTerms}" /> -->
   <Url type="application/opensearchdescription+xml" rel="self" template="https://movie-web.app/opensearch.xml" />
 </OpenSearchDescription>

From 21a0757af05162029a0e19864d7e2b9c8eb7fdb5 Mon Sep 17 00:00:00 2001
From: adrifcastr <adrifcastr@gmail.com>
Date: Tue, 4 Jul 2023 14:33:11 +0200
Subject: [PATCH 06/20] update routes

---
 src/setup/App.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/setup/App.tsx b/src/setup/App.tsx
index 135237e7..4a08e980 100644
--- a/src/setup/App.tsx
+++ b/src/setup/App.tsx
@@ -84,11 +84,7 @@ function App() {
                 <Route exact path="/search/:type">
                   <Redirect to="/browse" />
                 </Route>
-                <Route exact path="/browse/:query?" component={SearchView} />
-                <Route exact path="/">
-                  <Redirect to="/browse" />
-                </Route>
-
+                <Route path={["/", "/browse/:query"]} component={SearchView} />
                 {/* other */}
                 <Route
                   exact

From dadc77f57c308c2aa96fb7d8f4d7ef69fd890eb4 Mon Sep 17 00:00:00 2001
From: adrifcastr <adrifcastr@gmail.com>
Date: Tue, 4 Jul 2023 14:34:47 +0200
Subject: [PATCH 07/20] move opensearch xml

---
 {public => src/assets}/opensearch.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename {public => src/assets}/opensearch.xml (67%)

diff --git a/public/opensearch.xml b/src/assets/opensearch.xml
similarity index 67%
rename from public/opensearch.xml
rename to src/assets/opensearch.xml
index 9ecd3643..8ecab895 100644
--- a/public/opensearch.xml
+++ b/src/assets/opensearch.xml
@@ -2,7 +2,6 @@
   <ShortName>movie-web</ShortName>
   <Description>The place for your favorite movies &amp; shows</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <!-- <Url type="text/html" template="https://movie-web.app/browse/{searchTerms}" /> -->
-  <Url type="text/html" template="https://dev.movie-web.app/browse/{searchTerms}" />
+  <Url type="text/html" template="https://movie-web.app/browse/{searchTerms}" />
   <Url type="application/opensearchdescription+xml" rel="self" template="https://movie-web.app/opensearch.xml" />
 </OpenSearchDescription>

From 30a8ecf2bbd15863c4ef89049580a69b200977d5 Mon Sep 17 00:00:00 2001
From: adrifcastr <adrifcastr@gmail.com>
Date: Tue, 4 Jul 2023 14:38:10 +0200
Subject: [PATCH 08/20] no need for the self update tag

---
 src/assets/opensearch.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/assets/opensearch.xml b/src/assets/opensearch.xml
index 8ecab895..720fc4b9 100644
--- a/src/assets/opensearch.xml
+++ b/src/assets/opensearch.xml
@@ -3,5 +3,4 @@
   <Description>The place for your favorite movies &amp; shows</Description>
   <InputEncoding>UTF-8</InputEncoding>
   <Url type="text/html" template="https://movie-web.app/browse/{searchTerms}" />
-  <Url type="application/opensearchdescription+xml" rel="self" template="https://movie-web.app/opensearch.xml" />
 </OpenSearchDescription>

From c4a8b30b60de6d49ea70ad51127f1a9a6c61a2f3 Mon Sep 17 00:00:00 2001
From: adrifcastr <adrifcastr@gmail.com>
Date: Tue, 4 Jul 2023 14:38:55 +0200
Subject: [PATCH 09/20] update href

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 2587227e..e3593d62 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@
     <title>movie-web</title>
 
 	<!-- OpenSearch -->
-    <link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="/opensearch.xml">
+    <link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="src/assets/opensearch.xml">
 
 	<!-- Google Sitelinks -->
 	<script type="application/ld+json">

From 531974a9fcff61cc110ac8a24acebeb4d2a5196c Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Sat, 15 Jul 2023 15:53:43 +0200
Subject: [PATCH 10/20] Add handlebars templating support

---
 .eslintrc.js            |  36 ++++-----
 index.html              |   1 +
 package.json            |   3 +
 plugins/handlebars.ts   |  41 ++++++++++
 src/assets/test.txt.hbs |   1 +
 vite.config.ts          |   6 ++
 yarn.lock               | 172 ++++++++++++++++++++++++++++++++++++++--
 7 files changed, 236 insertions(+), 24 deletions(-)
 create mode 100644 plugins/handlebars.ts
 create mode 100644 src/assets/test.txt.hbs

diff --git a/.eslintrc.js b/.eslintrc.js
index d75c57d9..c1a2b2a7 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,26 +8,26 @@ const a11yOff = Object.keys(require("eslint-plugin-jsx-a11y").rules).reduce(
 
 module.exports = {
   env: {
-    browser: true,
+    browser: true
   },
   extends: [
     "airbnb",
     "airbnb/hooks",
     "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended",
+    "plugin:prettier/recommended"
   ],
-  ignorePatterns: ["public/*", "dist/*", "/*.js", "/*.ts"],
+  ignorePatterns: ["public/*", "dist/*", "/*.js", "/*.ts", "/plugins/*.ts"],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     project: "./tsconfig.json",
-    tsconfigRootDir: "./",
+    tsconfigRootDir: "./"
   },
   settings: {
     "import/resolver": {
       typescript: {
-        project: "./tsconfig.json",
-      },
-    },
+        project: "./tsconfig.json"
+      }
+    }
   },
   plugins: ["@typescript-eslint", "import", "prettier"],
   rules: {
@@ -55,15 +55,15 @@ module.exports = {
     "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }],
     "react/jsx-filename-extension": [
       "error",
-      { extensions: [".js", ".tsx", ".jsx"] },
+      { extensions: [".js", ".tsx", ".jsx"] }
     ],
     "import/extensions": [
       "error",
       "ignorePackages",
       {
         ts: "never",
-        tsx: "never",
-      },
+        tsx: "never"
+      }
     ],
     "import/order": [
       "error",
@@ -74,14 +74,14 @@ module.exports = {
           "internal",
           ["sibling", "parent"],
           "index",
-          "unknown",
+          "unknown"
         ],
         "newlines-between": "always",
         alphabetize: {
           order: "asc",
-          caseInsensitive: true,
-        },
-      },
+          caseInsensitive: true
+        }
+      }
     ],
     "sort-imports": [
       "error",
@@ -90,9 +90,9 @@ module.exports = {
         ignoreDeclarationSort: true,
         ignoreMemberSort: false,
         memberSyntaxSortOrder: ["none", "all", "multiple", "single"],
-        allowSeparatedGroups: true,
-      },
+        allowSeparatedGroups: true
+      }
     ],
-    ...a11yOff,
-  },
+    ...a11yOff
+  }
 };
diff --git a/index.html b/index.html
index e3593d62..7f879e60 100644
--- a/index.html
+++ b/index.html
@@ -55,6 +55,7 @@
 		</script>
   </head>
   <body>
+    <p>{{ message }}</p>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <script type="module" src="/src/index.tsx"></script>
diff --git a/package.json b/package.json
index d315bd23..cd3529eb 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,8 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "7.29.4",
     "eslint-plugin-react-hooks": "4.3.0",
+    "glob": "^10.3.3",
+    "handlebars": "^4.7.7",
     "jsdom": "^21.1.0",
     "postcss": "^8.4.20",
     "prettier": "^2.5.1",
@@ -99,6 +101,7 @@
     "vite-plugin-checker": "^0.5.6",
     "vite-plugin-package-version": "^1.0.2",
     "vite-plugin-pwa": "^0.14.4",
+    "vite-plugin-static-copy": "^0.16.0",
     "vitest": "^0.28.5",
     "workbox-build": "^6.5.4",
     "workbox-window": "^6.5.4"
diff --git a/plugins/handlebars.ts b/plugins/handlebars.ts
new file mode 100644
index 00000000..a8ab0170
--- /dev/null
+++ b/plugins/handlebars.ts
@@ -0,0 +1,41 @@
+import { globSync } from "glob";
+import { viteStaticCopy } from 'vite-plugin-static-copy'
+import { PluginOption } from "vite";
+import Handlebars from "handlebars";
+import path from "path";
+
+export const handlebars = (options: { vars?: Record<string, any> } = {}): PluginOption[] => {
+  const files = globSync("src/assets/**/**.hbs");
+
+  function render(content: string): string {
+    const template = Handlebars.compile(content);
+    return template(options?.vars ?? {});
+  }
+
+  return [
+    {
+      name: 'hbs-templating',
+      enforce: "pre",
+      transformIndexHtml: {
+        order: 'pre',
+        handler(html) {
+          return render(html);
+        }
+      },
+    },
+    viteStaticCopy({
+      silent: true,
+      targets: files.map(file => ({
+        src: file,
+        dest: '',
+        rename: path.basename(file).slice(0, -4), // remove .hbs file extension
+        transform: {
+          encoding: 'utf8',
+          handler(content: string) {
+            return render(content);
+          }
+        }
+      }))
+    })
+  ]
+}
diff --git a/src/assets/test.txt.hbs b/src/assets/test.txt.hbs
new file mode 100644
index 00000000..c9198963
--- /dev/null
+++ b/src/assets/test.txt.hbs
@@ -0,0 +1 @@
+msg: '{{ message }}'!
diff --git a/vite.config.ts b/vite.config.ts
index 77a83ad2..b16ec0a9 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,9 +4,15 @@ import loadVersion from "vite-plugin-package-version";
 import { VitePWA } from "vite-plugin-pwa";
 import checker from "vite-plugin-checker";
 import path from "path";
+import { handlebars } from "./plugins/handlebars";
 
 export default defineConfig({
   plugins: [
+    handlebars({
+      vars: {
+        message: "HELLOWORLD"
+      },
+    }),
     react({
       babel: {
         presets: [
diff --git a/yarn.lock b/yarn.lock
index 5d687f2a..4d4d450f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1141,6 +1141,18 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
@@ -1207,6 +1219,11 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@react-spring/animated@~9.7.2":
   version "9.7.2"
   resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.7.2.tgz#0119db8075e91d693ec45c42575541e01b104a70"
@@ -1836,7 +1853,7 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.1.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -1848,7 +1865,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.0.0:
+ansi-styles@^6.0.0, ansi-styles@^6.1.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
@@ -2238,7 +2255,7 @@ core-js@^3.29.1, core-js@^3.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.1.tgz#fc9c5adcc541d8e9fa3e381179433cbf795628ba"
   integrity sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==
 
-cross-spawn@^7.0.2:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2453,6 +2470,11 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.369.tgz#a98d838cdd79be4471cd04e9b4dffe891d037874"
   integrity sha512-LfxbHXdA/S+qyoTEA4EbhxGjrxx7WK2h6yb5K2v0UCOufUKX+VZaHbl3svlzZfv9sGseym/g3Ne4DpsgRULmqg==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emoji-regex@^9.2.2:
   version "9.2.2"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
@@ -2866,6 +2888,17 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
+fast-glob@^3.2.11:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
+  integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-glob@^3.2.12, fast-glob@^3.2.7, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
@@ -2958,6 +2991,14 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -3089,6 +3130,17 @@ glob@7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^10.3.3:
+  version "10.3.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b"
+  integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.0.3"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
 glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -3149,6 +3201,18 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+handlebars@^4.7.7:
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
@@ -3397,6 +3461,11 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-fullwidth-code-point@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
@@ -3541,6 +3610,15 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
+jackspeak@^2.0.3:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.1.tgz#655e8cf025d872c9c03d3eb63e8f0c024fef16a6"
+  integrity sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
@@ -3815,6 +3893,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+"lru-cache@^9.1.1 || ^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
+  integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
+
 magic-string@^0.25.0, magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
@@ -3878,11 +3961,23 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.6:
+minimatch@^9.0.1:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e"
+  integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==
+
 mlly@^1.1.0, mlly@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.2.0.tgz#f0f6c2fc8d2d12ea6907cd869066689b5031b613"
@@ -3946,6 +4041,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
+neo-async@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 node-fetch-native@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.1.0.tgz#a530f5c4cadb49b382dcf81d8f5f19ed0f457fbe"
@@ -4151,6 +4251,14 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
+  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+  dependencies:
+    lru-cache "^9.1.1 || ^10.0.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
@@ -4751,6 +4859,11 @@ siginfo@^2.0.0:
   resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
   integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
 
+signal-exit@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
+  integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -4850,7 +4963,16 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-string-width@^5.0.0:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
@@ -4909,7 +5031,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5241,6 +5363,11 @@ ufo@^1.1.0, ufo@^1.1.1:
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.1.tgz#e70265e7152f3aba425bd013d150b2cdf4056d7c"
   integrity sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==
 
+uglify-js@^3.1.4:
+  version "3.17.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
+  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -5388,6 +5515,16 @@ vite-plugin-pwa@^0.14.4:
     workbox-build "^6.5.4"
     workbox-window "^6.5.4"
 
+vite-plugin-static-copy@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.16.0.tgz#2f65227037f17fc99c0782fd0b344e962935e69e"
+  integrity sha512-dMVEg5Z2SwYRgQnHZaeokvSKB4p/TOTf65JU4sP3U6ccSBsukqdtDOjpmT+xzTFHAA8WJjcS31RMLjUdWQCBzw==
+  dependencies:
+    chokidar "^3.5.3"
+    fast-glob "^3.2.11"
+    fs-extra "^11.1.0"
+    picocolors "^1.0.0"
+
 "vite@^3.0.0 || ^4.0.0", vite@^4.0.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.1.tgz#9badb1377f995632cdcf05f32103414db6fbb95a"
@@ -5577,6 +5714,11 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
+
 workbox-background-sync@6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9"
@@ -5735,6 +5877,24 @@ workbox-window@6.5.4, workbox-window@^6.5.4:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.5.4"
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

From 5e92bef66a0f9cf290744a3ba4840994086801a4 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Sat, 15 Jul 2023 15:54:43 +0200
Subject: [PATCH 11/20] remove line clamp plugin, its now in base tailwind

---
 package.json       | 1 -
 tailwind.config.js | 2 +-
 yarn.lock          | 6 +-----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index cd3529eb..71fef462 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,6 @@
     "@babel/core": "^7.21.3",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.21.0",
-    "@tailwindcss/line-clamp": "^0.4.2",
     "@types/chromecast-caf-sender": "^1.0.5",
     "@types/crypto-js": "^4.1.1",
     "@types/dompurify": "^2.4.0",
diff --git a/tailwind.config.js b/tailwind.config.js
index e22b3b3a..3a6816a6 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -42,5 +42,5 @@ module.exports = {
       animation: { "loading-pin": "loading-pin 1.8s ease-in-out infinite" }
     }
   },
-  plugins: [require("tailwind-scrollbar"), require("@tailwindcss/line-clamp")]
+  plugins: [require("tailwind-scrollbar")]
 };
diff --git a/yarn.lock b/yarn.lock
index 4d4d450f..8b7759b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1408,11 +1408,6 @@
     magic-string "^0.25.0"
     string.prototype.matchall "^4.0.6"
 
-"@tailwindcss/line-clamp@^0.4.2":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@tailwindcss/line-clamp/-/line-clamp-0.4.4.tgz#767cf8e5d528a5d90c9740ca66eb079f5e87d423"
-  integrity sha512-5U6SY5z8N42VtrCrKlsTAA35gy2VSyYtHWCsg1H87NU1SXnEfekTVlrga9fzUDrrHcGi2Lb5KenUWb4lRQT5/g==
-
 "@tootallnate/once@2":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
@@ -4964,6 +4959,7 @@ stop-iteration-iterator@^1.0.0:
     internal-slot "^1.0.4"
 
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==

From 21fb3386312219276e37b5db0ffb94cebcf27699 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Sat, 15 Jul 2023 15:57:32 +0200
Subject: [PATCH 12/20] Fix linting

---
 src/components/media/MediaCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/media/MediaCard.tsx b/src/components/media/MediaCard.tsx
index e05fbebb..828f6bd7 100644
--- a/src/components/media/MediaCard.tsx
+++ b/src/components/media/MediaCard.tsx
@@ -117,7 +117,7 @@ function MediaCardContent({
             />
           </div>
         </div>
-        <h1 className="mb-1 max-h-[4.5rem] text-ellipsis break-words font-bold text-white line-clamp-3">
+        <h1 className="mb-1 line-clamp-3 max-h-[4.5rem] text-ellipsis break-words font-bold text-white">
           <span>{media.title}</span>
         </h1>
         <DotList className="text-xs" content={dotListContent} />

From d3713211166185e332647687f0be65123c6c2334 Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Sat, 22 Jul 2023 21:15:52 +0200
Subject: [PATCH 13/20] dynamic opensearch xml

---
 index.html                                        | 1 -
 package.json                                      | 1 +
 src/assets/{opensearch.xml => opensearch.xml.hbs} | 2 +-
 src/assets/test.txt.hbs                           | 1 -
 vite.config.ts                                    | 6 ++++--
 yarn.lock                                         | 5 +++++
 6 files changed, 11 insertions(+), 5 deletions(-)
 rename src/assets/{opensearch.xml => opensearch.xml.hbs} (75%)
 delete mode 100644 src/assets/test.txt.hbs

diff --git a/index.html b/index.html
index 7f879e60..e3593d62 100644
--- a/index.html
+++ b/index.html
@@ -55,7 +55,6 @@
 		</script>
   </head>
   <body>
-    <p>{{ message }}</p>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <script type="module" src="/src/index.tsx"></script>
diff --git a/package.json b/package.json
index 71fef462..2f6c3919 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "core-js": "^3.29.1",
     "crypto-js": "^4.1.1",
     "dompurify": "^3.0.1",
+    "dotenv": "^16.3.1",
     "fscreen": "^1.2.0",
     "fuse.js": "^6.4.6",
     "hls.js": "^1.0.7",
diff --git a/src/assets/opensearch.xml b/src/assets/opensearch.xml.hbs
similarity index 75%
rename from src/assets/opensearch.xml
rename to src/assets/opensearch.xml.hbs
index 720fc4b9..3f188d6f 100644
--- a/src/assets/opensearch.xml
+++ b/src/assets/opensearch.xml.hbs
@@ -2,5 +2,5 @@
   <ShortName>movie-web</ShortName>
   <Description>The place for your favorite movies &amp; shows</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Url type="text/html" template="https://movie-web.app/browse/{searchTerms}" />
+  <Url type="text/html" template="{{ appdomain }}/browse/{searchTerms}" />
 </OpenSearchDescription>
diff --git a/src/assets/test.txt.hbs b/src/assets/test.txt.hbs
deleted file mode 100644
index c9198963..00000000
--- a/src/assets/test.txt.hbs
+++ /dev/null
@@ -1 +0,0 @@
-msg: '{{ message }}'!
diff --git a/vite.config.ts b/vite.config.ts
index b16ec0a9..ad3ee9ec 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,12 +5,14 @@ import { VitePWA } from "vite-plugin-pwa";
 import checker from "vite-plugin-checker";
 import path from "path";
 import { handlebars } from "./plugins/handlebars";
+import dotenv from 'dotenv';
+dotenv.config();
 
 export default defineConfig({
-  plugins: [
+  plugins:[
     handlebars({
       vars: {
-        message: "HELLOWORLD"
+        appdomain: process.env.APP_DOMAIN,
       },
     }),
     react({
diff --git a/yarn.lock b/yarn.lock
index 8b7759b5..33546103 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2448,6 +2448,11 @@ dompurify@^3.0.1:
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.2.tgz#bc4c7c011c825e7704341a285461d8d407d9429a"
   integrity sha512-B8c6JdiEpxAKnd8Dm++QQxJL4lfuc757scZtcapj6qjTjrQzyq5iAyznLKVvK+77eYNiFblHBlt7MM0fOeqoKw==
 
+dotenv@^16.3.1:
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
+  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
+
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"

From dce6dff9a19cecb7a9ca7182164611822c852f34 Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Sat, 22 Jul 2023 21:41:15 +0200
Subject: [PATCH 14/20] use vite env

---
 example.env    |   1 +
 package.json   |   1 -
 vite.config.ts | 185 +++++++++++++++++++++++++------------------------
 yarn.lock      |   5 --
 4 files changed, 94 insertions(+), 98 deletions(-)

diff --git a/example.env b/example.env
index d191d741..c764e92f 100644
--- a/example.env
+++ b/example.env
@@ -1,3 +1,4 @@
 # make sure the cors proxy url does NOT have a slash at the end
 VITE_CORS_PROXY_URL=...
 VITE_TMDB_READ_API_KEY=...
+VITE_APP_DOMAIN="http://localhost:5173"
diff --git a/package.json b/package.json
index 2f6c3919..71fef462 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
     "core-js": "^3.29.1",
     "crypto-js": "^4.1.1",
     "dompurify": "^3.0.1",
-    "dotenv": "^16.3.1",
     "fscreen": "^1.2.0",
     "fuse.js": "^6.4.6",
     "hls.js": "^1.0.7",
diff --git a/vite.config.ts b/vite.config.ts
index ad3ee9ec..dcef4c5f 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,98 +5,99 @@ import { VitePWA } from "vite-plugin-pwa";
 import checker from "vite-plugin-checker";
 import path from "path";
 import { handlebars } from "./plugins/handlebars";
-import dotenv from 'dotenv';
-dotenv.config();
+import { loadEnv } from "vite"
 
-export default defineConfig({
-  plugins:[
-    handlebars({
-      vars: {
-        appdomain: process.env.APP_DOMAIN,
-      },
-    }),
-    react({
-      babel: {
-        presets: [
-          "@babel/preset-typescript",
-          [
-            "@babel/preset-env",
-            {
-              modules: false,
-              useBuiltIns: "entry",
-              corejs: {
-                version: "3.29",
-              },
-            },
-          ],
-        ],
-      },
-    }),
-    VitePWA({
-      registerType: "autoUpdate",
-      workbox: {
-        globIgnores: ["**ping.txt**"],
-      },
-      includeAssets: [
-        "favicon.ico",
-        "apple-touch-icon.png",
-        "safari-pinned-tab.svg",
-      ],
-      manifest: {
-        name: "movie-web",
-        short_name: "movie-web",
-        description: "The place for your favourite movies & shows",
-        theme_color: "#120f1d",
-        background_color: "#120f1d",
-        display: "standalone",
-        start_url: "/",
-        icons: [
-          {
-            src: "android-chrome-192x192.png",
-            sizes: "192x192",
-            type: "image/png",
-            purpose: "any",
-          },
-          {
-            src: "android-chrome-512x512.png",
-            sizes: "512x512",
-            type: "image/png",
-            purpose: "any",
-          },
-          {
-            src: "android-chrome-192x192.png",
-            sizes: "192x192",
-            type: "image/png",
-            purpose: "maskable",
-          },
-          {
-            src: "android-chrome-512x512.png",
-            sizes: "512x512",
-            type: "image/png",
-            purpose: "maskable",
-          },
-        ],
-      },
-    }),
-    loadVersion(),
-    checker({
-      typescript: true, // check typescript build errors in dev server
-      eslint: {
-        // check lint errors in dev server
-        lintCommand: "eslint --ext .tsx,.ts src",
-        dev: {
-          logLevel: ["error"],
-        },
-      },
-    }),
-  ],
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./src"),
-    },
-  },
+export default defineConfig(({ mode }) => {
+	return {
+	  plugins:[
+		handlebars({
+		vars: {
+			appdomain: loadEnv(mode, process.cwd()).VITE_APP_DOMAIN,
+		},
+		}),
+		react({
+		babel: {
+			presets: [
+			"@babel/preset-typescript",
+			[
+				"@babel/preset-env",
+				{
+				modules: false,
+				useBuiltIns: "entry",
+				corejs: {
+					version: "3.29",
+				},
+				},
+			],
+			],
+		},
+		}),
+		VitePWA({
+		registerType: "autoUpdate",
+		workbox: {
+			globIgnores: ["**ping.txt**"],
+		},
+		includeAssets: [
+			"favicon.ico",
+			"apple-touch-icon.png",
+			"safari-pinned-tab.svg",
+		],
+		manifest: {
+			name: "movie-web",
+			short_name: "movie-web",
+			description: "The place for your favourite movies & shows",
+			theme_color: "#120f1d",
+			background_color: "#120f1d",
+			display: "standalone",
+			start_url: "/",
+			icons: [
+			{
+				src: "android-chrome-192x192.png",
+				sizes: "192x192",
+				type: "image/png",
+				purpose: "any",
+			},
+			{
+				src: "android-chrome-512x512.png",
+				sizes: "512x512",
+				type: "image/png",
+				purpose: "any",
+			},
+			{
+				src: "android-chrome-192x192.png",
+				sizes: "192x192",
+				type: "image/png",
+				purpose: "maskable",
+			},
+			{
+				src: "android-chrome-512x512.png",
+				sizes: "512x512",
+				type: "image/png",
+				purpose: "maskable",
+			},
+			],
+		},
+		}),
+		loadVersion(),
+		checker({
+		typescript: true, // check typescript build errors in dev server
+		eslint: {
+			// check lint errors in dev server
+			lintCommand: "eslint --ext .tsx,.ts src",
+			dev: {
+			logLevel: ["error"],
+			},
+		},
+		}),
+	],
+	resolve: {
+		alias: {
+		"@": path.resolve(__dirname, "./src"),
+		},
+	},
 
-  test: {
-    environment: "jsdom",
-  },
+	test: {
+		environment: "jsdom",
+	},
+	};
 });
diff --git a/yarn.lock b/yarn.lock
index 33546103..8b7759b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2448,11 +2448,6 @@ dompurify@^3.0.1:
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.2.tgz#bc4c7c011c825e7704341a285461d8d407d9429a"
   integrity sha512-B8c6JdiEpxAKnd8Dm++QQxJL4lfuc757scZtcapj6qjTjrQzyq5iAyznLKVvK+77eYNiFblHBlt7MM0fOeqoKw==
 
-dotenv@^16.3.1:
-  version "16.3.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
-  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
-
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"

From 855ed60e37c216532f56953560e44675033221d6 Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Sat, 22 Jul 2023 21:53:55 +0200
Subject: [PATCH 15/20] make opensearch optional

---
 example.env    | 1 +
 index.html     | 2 +-
 vite.config.ts | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/example.env b/example.env
index c764e92f..27e4f03d 100644
--- a/example.env
+++ b/example.env
@@ -1,4 +1,5 @@
 # make sure the cors proxy url does NOT have a slash at the end
 VITE_CORS_PROXY_URL=...
 VITE_TMDB_READ_API_KEY=...
+VITE_OPENSEARCH_ENABLED=false
 VITE_APP_DOMAIN="http://localhost:5173"
diff --git a/index.html b/index.html
index e3593d62..543c3e95 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@
     <title>movie-web</title>
 
 	<!-- OpenSearch -->
-    <link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="src/assets/opensearch.xml">
+    {{{ opensearch }}}
 
 	<!-- Google Sitelinks -->
 	<script type="application/ld+json">
diff --git a/vite.config.ts b/vite.config.ts
index dcef4c5f..b420c6d6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -8,12 +8,14 @@ import { handlebars } from "./plugins/handlebars";
 import { loadEnv } from "vite"
 
 export default defineConfig(({ mode }) => {
+	const env = loadEnv(mode, process.cwd())
 	return {
 	  plugins:[
 		handlebars({
-		vars: {
-			appdomain: loadEnv(mode, process.cwd()).VITE_APP_DOMAIN,
-		},
+			vars: {
+				opensearch: env.VITE_OPENSEARCH_ENABLED ? '<link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="src/assets/opensearch.xml">' : "",
+				appdomain: env.VITE_APP_DOMAIN,
+			},
 		}),
 		react({
 		babel: {

From e86a9c2698e1f8c6ef0c24979ccb61cbff976b0a Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Sat, 22 Jul 2023 22:37:47 +0200
Subject: [PATCH 16/20] use spaces as indents, damn you vsc settings

---
 vite.config.ts | 188 ++++++++++++++++++++++++-------------------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index b420c6d6..61cfc6d1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,101 +5,101 @@ import { VitePWA } from "vite-plugin-pwa";
 import checker from "vite-plugin-checker";
 import path from "path";
 import { handlebars } from "./plugins/handlebars";
-import { loadEnv } from "vite"
+import { loadEnv } from "vite";
 
 export default defineConfig(({ mode }) => {
-	const env = loadEnv(mode, process.cwd())
-	return {
-	  plugins:[
-		handlebars({
-			vars: {
-				opensearch: env.VITE_OPENSEARCH_ENABLED ? '<link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="src/assets/opensearch.xml">' : "",
-				appdomain: env.VITE_APP_DOMAIN,
-			},
-		}),
-		react({
-		babel: {
-			presets: [
-			"@babel/preset-typescript",
-			[
-				"@babel/preset-env",
-				{
-				modules: false,
-				useBuiltIns: "entry",
-				corejs: {
-					version: "3.29",
-				},
-				},
-			],
-			],
-		},
-		}),
-		VitePWA({
-		registerType: "autoUpdate",
-		workbox: {
-			globIgnores: ["**ping.txt**"],
-		},
-		includeAssets: [
-			"favicon.ico",
-			"apple-touch-icon.png",
-			"safari-pinned-tab.svg",
-		],
-		manifest: {
-			name: "movie-web",
-			short_name: "movie-web",
-			description: "The place for your favourite movies & shows",
-			theme_color: "#120f1d",
-			background_color: "#120f1d",
-			display: "standalone",
-			start_url: "/",
-			icons: [
-			{
-				src: "android-chrome-192x192.png",
-				sizes: "192x192",
-				type: "image/png",
-				purpose: "any",
-			},
-			{
-				src: "android-chrome-512x512.png",
-				sizes: "512x512",
-				type: "image/png",
-				purpose: "any",
-			},
-			{
-				src: "android-chrome-192x192.png",
-				sizes: "192x192",
-				type: "image/png",
-				purpose: "maskable",
-			},
-			{
-				src: "android-chrome-512x512.png",
-				sizes: "512x512",
-				type: "image/png",
-				purpose: "maskable",
-			},
-			],
-		},
-		}),
-		loadVersion(),
-		checker({
-		typescript: true, // check typescript build errors in dev server
-		eslint: {
-			// check lint errors in dev server
-			lintCommand: "eslint --ext .tsx,.ts src",
-			dev: {
-			logLevel: ["error"],
-			},
-		},
-		}),
-	],
-	resolve: {
-		alias: {
-		"@": path.resolve(__dirname, "./src"),
-		},
-	},
+  const env = loadEnv(mode, process.cwd());
+  return {
+    plugins: [
+      handlebars({
+        vars: {
+          opensearch: env.VITE_OPENSEARCH_ENABLED ? '<link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="src/assets/opensearch.xml">' : "",
+          appdomain: env.VITE_APP_DOMAIN,
+        },
+      }),
+      react({
+        babel: {
+          presets: [
+            "@babel/preset-typescript",
+            [
+              "@babel/preset-env",
+              {
+                modules: false,
+                useBuiltIns: "entry",
+                corejs: {
+                  version: "3.29",
+                },
+              },
+            ],
+          ],
+        },
+      }),
+      VitePWA({
+        registerType: "autoUpdate",
+        workbox: {
+          globIgnores: ["**ping.txt**"],
+        },
+        includeAssets: [
+          "favicon.ico",
+          "apple-touch-icon.png",
+          "safari-pinned-tab.svg",
+        ],
+        manifest: {
+          name: "movie-web",
+          short_name: "movie-web",
+          description: "The place for your favourite movies & shows",
+          theme_color: "#120f1d",
+          background_color: "#120f1d",
+          display: "standalone",
+          start_url: "/",
+          icons: [
+            {
+              src: "android-chrome-192x192.png",
+              sizes: "192x192",
+              type: "image/png",
+              purpose: "any",
+            },
+            {
+              src: "android-chrome-512x512.png",
+              sizes: "512x512",
+              type: "image/png",
+              purpose: "any",
+            },
+            {
+              src: "android-chrome-192x192.png",
+              sizes: "192x192",
+              type: "image/png",
+              purpose: "maskable",
+            },
+            {
+              src: "android-chrome-512x512.png",
+              sizes: "512x512",
+              type: "image/png",
+              purpose: "maskable",
+            },
+          ],
+        },
+      }),
+      loadVersion(),
+      checker({
+        typescript: true, // check typescript build errors in dev server
+        eslint: {
+          // check lint errors in dev server
+          lintCommand: "eslint --ext .tsx,.ts src",
+          dev: {
+            logLevel: ["error"],
+          },
+        },
+      }),
+    ],
+    resolve: {
+      alias: {
+        "@": path.resolve(__dirname, "./src"),
+      },
+    },
 
-	test: {
-		environment: "jsdom",
-	},
-	};
+    test: {
+      environment: "jsdom",
+    },
+  };
 });

From 386afd21eaddacf748219fd186cb554d398f53c0 Mon Sep 17 00:00:00 2001
From: castdrian <adrifcastr@gmail.com>
Date: Sat, 22 Jul 2023 22:42:16 +0200
Subject: [PATCH 17/20] adjust routes

---
 src/setup/App.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/setup/App.tsx b/src/setup/App.tsx
index 4a08e980..e8fd3695 100644
--- a/src/setup/App.tsx
+++ b/src/setup/App.tsx
@@ -84,7 +84,8 @@ function App() {
                 <Route exact path="/search/:type">
                   <Redirect to="/browse" />
                 </Route>
-                <Route path={["/", "/browse/:query"]} component={SearchView} />
+                <Route exact path="/browse/:query" component={SearchView} />
+                <Route exact path="/" component={SearchView} />
                 {/* other */}
                 <Route
                   exact

From 7d6d41fb480d14c6acbd440f3f4d3467cc7077f3 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Sun, 23 Jul 2023 12:18:20 +0200
Subject: [PATCH 18/20] use handlebars if statements in templating

---
 example.env                   |  9 ++++++---
 index.html                    | 38 ++++++++++++++++++-----------------
 src/assets/opensearch.xml.hbs |  2 +-
 vite.config.ts                |  6 ++++--
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/example.env b/example.env
index 27e4f03d..38c690a5 100644
--- a/example.env
+++ b/example.env
@@ -1,5 +1,8 @@
-# make sure the cors proxy url does NOT have a slash at the end
-VITE_CORS_PROXY_URL=...
 VITE_TMDB_READ_API_KEY=...
 VITE_OPENSEARCH_ENABLED=false
-VITE_APP_DOMAIN="http://localhost:5173"
+
+# make sure the cors proxy url does NOT have a slash at the end
+VITE_CORS_PROXY_URL=...
+
+# make sure the domain does NOT have a slash at the end
+VITE_APP_DOMAIN=http://localhost:5173
diff --git a/index.html b/index.html
index 543c3e95..5c674b2f 100644
--- a/index.html
+++ b/index.html
@@ -34,25 +34,27 @@
 
     <title>movie-web</title>
 
-	<!-- OpenSearch -->
-    {{{ opensearch }}}
+    {{#if opensearchEnabled }}
+      <!-- OpenSearch -->
+      <link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="/opensearch.xml">
 
-	<!-- Google Sitelinks -->
-	<script type="application/ld+json">
-		{
-		  "@context": "https://schema.org",
-		  "@type": "WebSite",
-		  "url": "https://movie-web.app/",
-		  "potentialAction": {
-			"@type": "SearchAction",
-			"target": {
-			  "@type": "EntryPoint",
-			  "urlTemplate": "https://movie-web.app/browse/{search_term_string}"
-			},
-			"query-input": "required name=search_term_string"
-		  }
-		}
-		</script>
+      <!-- Google Sitelinks -->
+      <script type="application/ld+json">
+        {
+          "@context": "https://schema.org",
+          "@type": "WebSite",
+          "url": "{{ routeDomain }}",
+          "potentialAction": {
+          "@type": "SearchAction",
+          "target": {
+            "@type": "EntryPoint",
+            "urlTemplate": "{{ routeDomain }}/browse/?q={search_term_string}"
+          },
+          "query-input": "required name=search_term_string"
+          }
+        }
+      </script>
+    {{/if}}
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
diff --git a/src/assets/opensearch.xml.hbs b/src/assets/opensearch.xml.hbs
index 3f188d6f..e0ce3a5a 100644
--- a/src/assets/opensearch.xml.hbs
+++ b/src/assets/opensearch.xml.hbs
@@ -2,5 +2,5 @@
   <ShortName>movie-web</ShortName>
   <Description>The place for your favorite movies &amp; shows</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Url type="text/html" template="{{ appdomain }}/browse/{searchTerms}" />
+  <Url type="text/html" template="{{ routeDomain }}/browse/?q={searchTerms}" />
 </OpenSearchDescription>
diff --git a/vite.config.ts b/vite.config.ts
index 61cfc6d1..ce5746ad 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,8 +13,10 @@ export default defineConfig(({ mode }) => {
     plugins: [
       handlebars({
         vars: {
-          opensearch: env.VITE_OPENSEARCH_ENABLED ? '<link rel="search" type="application/opensearchdescription+xml" title="movie-web" href="src/assets/opensearch.xml">' : "",
-          appdomain: env.VITE_APP_DOMAIN,
+          opensearchEnabled: env.VITE_OPENSEARCH_ENABLED === "true",
+          routeDomain: env.VITE_APP_DOMAIN + (env.VITE_NORMAL_ROUTER !== 'true' ? "/#" : ""),
+          domain: env.VITE_APP_DOMAIN,
+          env,
         },
       }),
       react({

From 8b84ff114dfe60236738a0e0d7f6a58ab5fb3a34 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Sun, 23 Jul 2023 12:34:59 +0200
Subject: [PATCH 19/20] Fix routing

---
 src/backend/metadata/search.ts         |  2 +-
 src/backend/metadata/types/mw.ts       |  1 -
 src/hooks/useSearchQuery.ts            | 44 +++++++++++++++-----------
 src/setup/App.tsx                      |  8 +++--
 src/state/watched/migrations/v2.ts     |  1 -
 src/views/search/SearchLoadingView.tsx | 11 +------
 6 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/backend/metadata/search.ts b/src/backend/metadata/search.ts
index 9ae985e7..6f6ecc99 100644
--- a/src/backend/metadata/search.ts
+++ b/src/backend/metadata/search.ts
@@ -5,7 +5,7 @@ import { MWMediaMeta, MWQuery } from "./types/mw";
 
 const cache = new SimpleCache<MWQuery, MWMediaMeta[]>();
 cache.setCompare((a, b) => {
-  return a.type === b.type && a.searchQuery.trim() === b.searchQuery.trim();
+  return a.searchQuery.trim() === b.searchQuery.trim();
 });
 cache.initialize();
 
diff --git a/src/backend/metadata/types/mw.ts b/src/backend/metadata/types/mw.ts
index e7cc26fe..3f0f452f 100644
--- a/src/backend/metadata/types/mw.ts
+++ b/src/backend/metadata/types/mw.ts
@@ -43,7 +43,6 @@ export type MWMediaMeta = MWMediaMetaBase & MWMediaMetaSpecific;
 
 export interface MWQuery {
   searchQuery: string;
-  type: MWMediaType;
 }
 
 export interface DetailedMeta {
diff --git a/src/hooks/useSearchQuery.ts b/src/hooks/useSearchQuery.ts
index cb8c3171..fe2b451e 100644
--- a/src/hooks/useSearchQuery.ts
+++ b/src/hooks/useSearchQuery.ts
@@ -1,14 +1,16 @@
 import { useState } from "react";
-import { generatePath, useHistory, useRouteMatch } from "react-router-dom";
+import { generatePath, useHistory, useParams } from "react-router-dom";
 
-import { MWMediaType, MWQuery } from "@/backend/metadata/types/mw";
+import { MWQuery } from "@/backend/metadata/types/mw";
+import { useQueryParams } from "@/hooks/useQueryParams";
 
-function getInitialValue(params: { type: string; query: string }) {
-  const type =
-    Object.values(MWMediaType).find((v) => params.type === v) ||
-    MWMediaType.MOVIE;
-  const searchQuery = decodeURIComponent(params.query || "");
-  return { type, searchQuery };
+function getInitialValue(
+  query: Record<string, string>,
+  params: Record<string, string>
+) {
+  let searchQuery = decodeURIComponent(params.query || "");
+  if (query.q) searchQuery = query.q;
+  return { searchQuery };
 }
 
 export function useSearchQuery(): [
@@ -17,28 +19,34 @@ export function useSearchQuery(): [
   () => void
 ] {
   const history = useHistory();
-  const { path, params } = useRouteMatch<{ type: string; query: string }>();
-  const [search, setSearch] = useState<MWQuery>(getInitialValue(params));
+  const query = useQueryParams();
+  const params = useParams<{ query: string }>();
+  const [search, setSearch] = useState<MWQuery>(getInitialValue(query, params));
 
   const updateParams = (inp: Partial<MWQuery>, force: boolean) => {
-    const copySearch: MWQuery = { ...search };
+    const copySearch = { ...search };
     Object.assign(copySearch, inp);
     setSearch(copySearch);
     if (!force) return;
+    if (copySearch.searchQuery.length === 0) {
+      history.replace("/");
+      return;
+    }
     history.replace(
-      generatePath(path, {
-        query:
-          copySearch.searchQuery.length === 0 ? undefined : inp.searchQuery,
-        type: copySearch.type,
+      generatePath("/browse/:query", {
+        query: copySearch.searchQuery,
       })
     );
   };
 
   const onUnFocus = () => {
+    if (search.searchQuery.length === 0) {
+      history.replace("/");
+      return;
+    }
     history.replace(
-      generatePath(path, {
-        query: search.searchQuery.length === 0 ? undefined : search.searchQuery,
-        type: search.type,
+      generatePath("/browse/:query", {
+        query: search.searchQuery,
       })
     );
   };
diff --git a/src/setup/App.tsx b/src/setup/App.tsx
index e8fd3695..6bb6b957 100644
--- a/src/setup/App.tsx
+++ b/src/setup/App.tsx
@@ -84,8 +84,12 @@ function App() {
                 <Route exact path="/search/:type">
                   <Redirect to="/browse" />
                 </Route>
-                <Route exact path="/browse/:query" component={SearchView} />
-                <Route exact path="/" component={SearchView} />
+                <Route
+                  exact
+                  path={["/browse/:query?", "/"]}
+                  component={SearchView}
+                />
+
                 {/* other */}
                 <Route
                   exact
diff --git a/src/state/watched/migrations/v2.ts b/src/state/watched/migrations/v2.ts
index 94f1141b..2e92224e 100644
--- a/src/state/watched/migrations/v2.ts
+++ b/src/state/watched/migrations/v2.ts
@@ -48,7 +48,6 @@ async function getMetas(
       const year = Number(item.year.toString().split("-")[0]);
       const data = await searchForMedia({
         searchQuery: `${item.title} ${year}`,
-        type: item.mediaType,
       });
       const relevantItem = data.find(
         (res) =>
diff --git a/src/views/search/SearchLoadingView.tsx b/src/views/search/SearchLoadingView.tsx
index 45971860..0c59f5d9 100644
--- a/src/views/search/SearchLoadingView.tsx
+++ b/src/views/search/SearchLoadingView.tsx
@@ -1,19 +1,10 @@
 import { useTranslation } from "react-i18next";
 
 import { Loading } from "@/components/layout/Loading";
-import { useSearchQuery } from "@/hooks/useSearchQuery";
 
 export function SearchLoadingView() {
   const { t } = useTranslation();
-  const [query] = useSearchQuery();
   return (
-    <Loading
-      className="mb-24 mt-40 "
-      text={
-        t(`search.loading_${query.type}`) ||
-        t("search.loading") ||
-        "Fetching your favourite shows..."
-      }
-    />
+    <Loading className="mb-24 mt-40 " text={t("search.loading") || "..."} />
   );
 }

From ab126b483d6832f2eb263bf2418530dac725ff33 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Sun, 23 Jul 2023 12:36:43 +0200
Subject: [PATCH 20/20] update locale files

---
 src/setup/locales/cs/translation.json     | 2 --
 src/setup/locales/de/translation.json     | 2 --
 src/setup/locales/en/translation.json     | 4 +---
 src/setup/locales/fr/translation.json     | 2 --
 src/setup/locales/it/translation.json     | 4 +---
 src/setup/locales/nl/translation.json     | 2 --
 src/setup/locales/pirate/translation.json | 2 --
 src/setup/locales/pl/translation.json     | 4 +---
 src/setup/locales/tr/translation.json     | 6 ++----
 src/setup/locales/vi/translation.json     | 2 --
 src/setup/locales/zh/translation.json     | 2 --
 11 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/setup/locales/cs/translation.json b/src/setup/locales/cs/translation.json
index a7e5e826..f2b1b3f1 100644
--- a/src/setup/locales/cs/translation.json
+++ b/src/setup/locales/cs/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Načítání Vašich oblíbených seriálů...",
-    "loading_movie": "Načítání Vašich oblíbených filmů...",
     "loading": "Načítání...",
     "allResults": "To je vše co máme!",
     "noResults": "Nemohli jsme nic najít!",
diff --git a/src/setup/locales/de/translation.json b/src/setup/locales/de/translation.json
index d58923c0..fa24c345 100644
--- a/src/setup/locales/de/translation.json
+++ b/src/setup/locales/de/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Auf der Suche nach deiner Lieblingsserie...",
-    "loading_movie": "Auf der Suche nach deinen Lieblingsfilmen...",
     "loading": "Wird geladen...",
     "allResults": "Das ist alles, was wir haben!",
     "noResults": "Wir haben nichts gefunden!",
diff --git a/src/setup/locales/en/translation.json b/src/setup/locales/en/translation.json
index d90b568b..8f48a9d6 100644
--- a/src/setup/locales/en/translation.json
+++ b/src/setup/locales/en/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Fetching your favourite series...",
-    "loading_movie": "Fetching your favourite movies...",
     "loading": "Loading...",
     "allResults": "That's all we have!",
     "noResults": "We couldn't find anything!",
@@ -73,7 +71,7 @@
       "sources": "Sources",
       "close": "Close",
       "seasons": {
-        "title":"Seasons",
+        "title": "Seasons",
         "other": "Other seasons",
         "noSeason": "No season"
       },
diff --git a/src/setup/locales/fr/translation.json b/src/setup/locales/fr/translation.json
index 408570df..84e81495 100644
--- a/src/setup/locales/fr/translation.json
+++ b/src/setup/locales/fr/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Recherche de votre série préférée...",
-    "loading_movie": "Recherche de vos films préférés...",
     "loading": "Chargement...",
     "allResults": "C'est tout ce que nous avons!",
     "noResults": "Nous n'avons rien trouvé!",
diff --git a/src/setup/locales/it/translation.json b/src/setup/locales/it/translation.json
index 7c28992c..fbd5bf3c 100644
--- a/src/setup/locales/it/translation.json
+++ b/src/setup/locales/it/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Recupero delle tue serie preferite...",
-    "loading_movie": "Recupero dei tuoi film preferiti...",
     "loading": "Caricamento...",
     "allResults": "Ecco tutto ciò che abbiamo!",
     "noResults": "Non abbiamo trovato nulla!",
@@ -88,7 +86,7 @@
       "customCaption": "Sottotitolo personalizzato",
       "uploadCustomCaption": "Carica sottotitolo",
       "noEmbeds": "Nessun embed è stato trovato per questa fonte",
-      
+
       "errors": {
         "loadingWentWong": "Si è verificato un problema durante il caricamento degli episodi per {{seasonTitle}}",
         "embedsError": "Si è verificato un problema durante il caricamento degli embed per questa cosa che ti piace"
diff --git a/src/setup/locales/nl/translation.json b/src/setup/locales/nl/translation.json
index 23ecb618..5a97ae13 100644
--- a/src/setup/locales/nl/translation.json
+++ b/src/setup/locales/nl/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "We zoeken je favoriete series...",
-    "loading_movie": "We zoeken je favoriete films...",
     "loading": "Aan het zoeken...",
     "allResults": "Dat is het!",
     "noResults": "We konden helaas niets vinden.",
diff --git a/src/setup/locales/pirate/translation.json b/src/setup/locales/pirate/translation.json
index a4a92117..949d05ad 100644
--- a/src/setup/locales/pirate/translation.json
+++ b/src/setup/locales/pirate/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Fetchin' yer favorite series...",
-    "loading_movie": "Fetchin' yer favorite movies...",
     "loadin'": "Loadin'...",
     "allResults": "That be all we 'ave, me hearty!",
     "noResults": "We couldn't find anythin' that matches yer search!",
diff --git a/src/setup/locales/pl/translation.json b/src/setup/locales/pl/translation.json
index a85d9c70..b9fda283 100644
--- a/src/setup/locales/pl/translation.json
+++ b/src/setup/locales/pl/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Szukamy twoich ulubionych seriali...",
-    "loading_movie": "Szukamy twoich ulubionych filmów...",
     "loading": "Wczytywanie...",
     "allResults": "To wszystko co mamy!",
     "noResults": "Nie mogliśmy niczego znaleźć!",
@@ -71,7 +69,7 @@
     "popouts": {
       "close": "Zamknąć",
       "seasons": {
-        "title":"Sezony",
+        "title": "Sezony",
         "other": "Inne sezony",
         "noSeason": "Brak sezonu"
       },
diff --git a/src/setup/locales/tr/translation.json b/src/setup/locales/tr/translation.json
index bab6cd1d..7b22a1c4 100644
--- a/src/setup/locales/tr/translation.json
+++ b/src/setup/locales/tr/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Favori dizileriniz aranıyor...",
-    "loading_movie": "Favori filmleriniz aranıyor...",
     "loading": "Yükleniyor...",
     "allResults": "Bu kadarını bulabildik!",
     "noResults": "Hiçbir şey bulamadık!",
@@ -71,9 +69,9 @@
     "popouts": {
       "back": "Geri git",
       "sources": "Kaynaklar",
-      "close":"Kapat",
+      "close": "Kapat",
       "seasons": {
-        "title":"Sezonlar",
+        "title": "Sezonlar",
         "other": "Diğer sezonlar",
         "noSeason": "Sezon yok"
       },
diff --git a/src/setup/locales/vi/translation.json b/src/setup/locales/vi/translation.json
index d56b3595..d0c70768 100644
--- a/src/setup/locales/vi/translation.json
+++ b/src/setup/locales/vi/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "Đang tìm chương trình yêu thích của bạn...",
-    "loading_movie": "Đang tìm bộ phim yêu thích của bạn...",
     "loading": "Đang tải...",
     "allResults": "Đó là tất cả chúng tôi có!",
     "noResults": "Chúng tôi không thể tìm thấy gì!",
diff --git a/src/setup/locales/zh/translation.json b/src/setup/locales/zh/translation.json
index 39b0998d..83f7e8a7 100644
--- a/src/setup/locales/zh/translation.json
+++ b/src/setup/locales/zh/translation.json
@@ -3,8 +3,6 @@
     "name": "movie-web"
   },
   "search": {
-    "loading_series": "正在获取您最喜欢的连续剧……",
-    "loading_movie": "正在获取您最喜欢的影片……",
     "loading": "载入中……",
     "allResults": "以上是我们能找到的所有结果！",
     "noResults": "我们找不到任何结果！",