Merge branch 'trunk' into trunk

src/components/Layout.tsx

@@ -357,7 +357,9 @@ export default function Layout({ children, config }: { children: React.ReactNode
             }
           })}
 
-        <ScrollArea mah={200} mt='auto'>
+        <Divider mt='auto' />
+
+        <ScrollArea mah='auto'>
           <Box>
             {config.website.externalLinks.map(({ name, url }, i) => (
               <NavLink

src/components/pages/serverSettings/settingsOnSubmit.tsx

@@ -40,6 +40,7 @@ export function settingsOnSubmit(router: NextRouter, form: ReturnType<typeof use
       });
 
       await fetch('/reload');
+      await fetch('/api/reload');
       mutate('/api/server/settings', data);
       router.replace(router.asPath, undefined, { scroll: false });
     }

src/components/pages/settings/parts/SettingsServerUtil/ImportButton/index.tsx

@@ -95,6 +95,7 @@ export default function ImportButton() {
       });
 
       await fetch('/reload');
+      await fetch('/api/reload');
     }
   };
 

src/pages/api/reload.ts

@@ -0,0 +1,25 @@
+import { reloadSettings } from '@/lib/config';
+import { prisma } from '@/lib/db';
+import { isAdministrator } from '@/lib/role';
+import { getSession } from '@/server/session';
+import { NextApiRequest, NextApiResponse } from 'next/types';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const session = await getSession(req, res);
+  if (!session.id || !session.sessionId) return res.redirect(302, '/auth/login');
+
+  const user = await prisma.user.findFirst({
+    where: {
+      sessions: {
+        has: session.sessionId,
+      },
+    },
+  });
+
+  if (!user) return res.redirect(302, '/dashboard');
+  if (!isAdministrator(user.role)) return res.redirect(302, '/dashboard');
+
+  await reloadSettings();
+
+  return res.json({ success: true });
+}

src/pages/auth/login.tsx

@@ -296,17 +296,19 @@ export default function Login({ config }: InferGetServerSidePropsType<typeof get
               <Divider label='or' />
             )}
 
-            <Button
-              onClick={handlePasskeyLogin}
-              size='md'
-              fullWidth
-              variant='outline'
-              leftSection={<IconKey size='1rem' />}
-              color={passkeyErrored ? 'red' : undefined}
-              loading={passkeyLoading}
-            >
-              Login with passkey
-            </Button>
+            {config.mfa.passkeys && (
+              <Button
+                onClick={handlePasskeyLogin}
+                size='md'
+                fullWidth
+                variant='outline'
+                leftSection={<IconKey size='1rem' />}
+                color={passkeyErrored ? 'red' : undefined}
+                loading={passkeyLoading}
+              >
+                Login with passkey
+              </Button>
+            )}
 
             {config.features.userRegistration && (
               <Button