Merge branch 'trunk' into drizzle

src/client/ssr-view/server.tsx

@@ -25,7 +25,7 @@ import { createRoutes } from './routes';
 
 export const getFile = async (id: string) =>
   prisma.file.findFirst({
-    where: { name: id as string },
+    where: { name: decodeURIComponent(id) },
     select: {
       ...fileSelect,
       password: true,

src/components/pages/serverSettings/parts/Domains.tsx

@@ -7,7 +7,7 @@ import { useNavigate } from 'react-router-dom';
 import { settingsOnSubmit } from '../settingsOnSubmit';
 
 const DOMAIN_REGEX =
-  /^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$/gim;
+  /^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,30})$/gim;
 
 export default function Domains({
   swr: { data, isLoading },

src/lib/hooks/useTitle.ts

@@ -10,5 +10,5 @@ export function useTitle(title?: string) {
   useEffect(() => {
     if (!data || error || isLoading) return;
     document.title = title ? `${data.website.title} – ${title}` : data.website.title || 'Zipline';
-  }, [title, location]);
+  }, [title, location, data, isLoading]);
 }

src/server/routes/api/server/settings/index.ts

@@ -321,7 +321,7 @@ export default fastifyPlugin(
                 z
                   .string()
                   .regex(
-                    /^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$/gi,
+                    /^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,30})$/gi,
                     'Invalid Domain',
                   ),
               ),