From 9772711a2fedfe2dc74455c08d963fc4382cdfa8 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Wed, 29 Nov 2023 18:30:35 +0100
Subject: [PATCH] Fix url encoding in search + error page not showing any error
 info

---
 .../player/display/displayInterface.ts        |  2 +-
 src/hooks/useSearchQuery.ts                   |  8 +++++--
 src/pages/parts/errors/ErrorPart.tsx          | 24 +++++++++++++------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/player/display/displayInterface.ts b/src/components/player/display/displayInterface.ts
index 3109180b..c4c33d0d 100644
--- a/src/components/player/display/displayInterface.ts
+++ b/src/components/player/display/displayInterface.ts
@@ -1,7 +1,7 @@
 import { LoadableSource, SourceQuality } from "@/stores/player/utils/qualities";
 import { Listener } from "@/utils/events";
 
-export type DisplayErrorType = "hls" | "htmlvideo";
+export type DisplayErrorType = "hls" | "htmlvideo" | "global";
 export type DisplayError = {
   stackTrace?: string;
   message?: string;
diff --git a/src/hooks/useSearchQuery.ts b/src/hooks/useSearchQuery.ts
index ca60f70f..68171cc4 100644
--- a/src/hooks/useSearchQuery.ts
+++ b/src/hooks/useSearchQuery.ts
@@ -1,6 +1,10 @@
 import { useEffect, useState } from "react";
 import { generatePath, useHistory, useParams } from "react-router-dom";
 
+function decode(query: string | null | undefined) {
+  return query ? decodeURIComponent(query) : "";
+}
+
 export function useSearchQuery(): [
   string,
   (inp: string, force?: boolean) => void,
@@ -8,10 +12,10 @@ export function useSearchQuery(): [
 ] {
   const history = useHistory();
   const params = useParams<{ query: string }>();
-  const [search, setSearch] = useState(params.query ?? "");
+  const [search, setSearch] = useState(decode(params.query));
 
   useEffect(() => {
-    setSearch(params.query ?? "");
+    setSearch(decode(params.query));
   }, [params.query]);
 
   const updateParams = (inp: string, commitToUrl = false) => {
diff --git a/src/pages/parts/errors/ErrorPart.tsx b/src/pages/parts/errors/ErrorPart.tsx
index 90109232..e61ec744 100644
--- a/src/pages/parts/errors/ErrorPart.tsx
+++ b/src/pages/parts/errors/ErrorPart.tsx
@@ -3,25 +3,35 @@ import { useTranslation } from "react-i18next";
 import { ButtonPlain } from "@/components/buttons/Button";
 import { Icons } from "@/components/Icon";
 import { IconPill } from "@/components/layout/IconPill";
+import { DisplayError } from "@/components/player/display/displayInterface";
 import { Title } from "@/components/text/Title";
 import { Paragraph } from "@/components/utils/Text";
 import { ErrorContainer, ErrorLayout } from "@/pages/layouts/ErrorLayout";
+import { ErrorCard } from "@/pages/parts/errors/ErrorCard";
 
 export function ErrorPart(props: { error: any; errorInfo: any }) {
-  const data = JSON.stringify({
-    error: props.error,
-    errorInfo: props.errorInfo,
-  });
   const { t } = useTranslation();
 
+  const maxLineCount = 5;
+  const errorLines = (props.errorInfo.componentStack || "")
+    .split("\n")
+    .slice(0, maxLineCount);
+
+  const error: DisplayError = {
+    errorName: "What does this do",
+    type: "global",
+    message: errorLines.join("\n"),
+  };
+
   return (
-    <div className="relative flex flex-1 flex-col">
+    <div className="relative flex flex-1 flex-col min-h-screen">
       <div className="flex h-full flex-1 flex-col items-center justify-center p-5 text-center">
         <ErrorLayout>
-          <ErrorContainer>
+          <ErrorContainer maxWidth="max-w-2xl">
             <IconPill icon={Icons.EYE_SLASH}>{t("errors.badge")}</IconPill>
             <Title>{t("errors.title")}</Title>
-            <Paragraph>{data}</Paragraph>
+            <Paragraph>{props.error.toString()}</Paragraph>
+            <ErrorCard error={error} />
             <ButtonPlain
               theme="purple"
               className="mt-6 md:px-12 p-2.5"