From 96a6fe577e4d4a7cd85537898368bfb9ebdfb8b1 Mon Sep 17 00:00:00 2001
From: diced <pranaco2@gmail.com>
Date: Thu, 12 Sep 2024 16:33:40 -0700
Subject: [PATCH] fix: random type errors

---
 src/lib/config/read.ts               | 24 ------------------------
 src/lib/db/models/zipline.ts         |  4 +++-
 src/pages/view/[id].tsx              |  5 ++++-
 src/server/plugins/checkRateLimit.ts |  7 ++-----
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/lib/config/read.ts b/src/lib/config/read.ts
index cae88d59..539d5a68 100755
--- a/src/lib/config/read.ts
+++ b/src/lib/config/read.ts
@@ -153,30 +153,6 @@ export const PROP_TO_ENV = {
 
   'website.tos': 'WEBSITE_TOS',
 
-  // 'discord.onUpload.webhookUrl': 'DISCORD_ONUPLOAD_WEBHOOK_URL',
-  // 'discord.onUpload.username': 'DISCORD_ONUPLOAD_USERNAME',
-  // 'discord.onUpload.avatarUrl': 'DISCORD_ONUPLOAD_AVATAR_URL',
-  // 'discord.onUpload.content': 'DISCORD_ONUPLOAD_CONTENT',
-  // 'discord.onUpload.embed.title': 'DISCORD_ONUPLOAD_EMBED_TITLE',
-  // 'discord.onUpload.embed.description': 'DISCORD_ONUPLOAD_EMBED_DESCRIPTION',
-  // 'discord.onUpload.embed.footer': 'DISCORD_ONUPLOAD_EMBED_FOOTER',
-  // 'discord.onUpload.embed.color': 'DISCORD_ONUPLOAD_EMBED_COLOR',
-  // 'discord.onUpload.embed.thumbnail': 'DISCORD_ONUPLOAD_EMBED_THUMBNAIL',
-  // 'discord.onUpload.embed.timestamp': 'DISCORD_ONUPLOAD_EMBED_TIMESTAMP',
-  // 'discord.onUpload.embed.imageOrVideo': 'DISCORD_ONUPLOAD_EMBED_IMAGE_OR_VIDEO',
-  // 'discord.onUpload.embed.url': 'DISCORD_ONUPLOAD_EMBED_URL',
-
-  // 'discord.onShorten.webhookUrl': 'DISCORD_ONSHORTEN_WEBHOOK_URL',
-  // 'discord.onShorten.username': 'DISCORD_ONSHORTEN_USERNAME',
-  // 'discord.onShorten.avatarUrl': 'DISCORD_ONSHORTEN_AVATAR_URL',
-  // 'discord.onShorten.content': 'DISCORD_ONSHORTEN_CONTENT',
-  // 'discord.onShorten.embed.title': 'DISCORD_ONSHORTEN_EMBED_TITLE',
-  // 'discord.onShorten.embed.description': 'DISCORD_ONSHORTEN_EMBED_DESCRIPTION',
-  // 'discord.onShorten.embed.footer': 'DISCORD_ONSHORTEN_EMBED_FOOTER',
-  // 'discord.onShorten.embed.color': 'DISCORD_ONSHORTEN_EMBED_COLOR',
-  // 'discord.onShorten.embed.timestamp': 'DISCORD_ONSHORTEN_EMBED_TIMESTAMP',
-  // 'discord.onShorten.embed.url': 'DISCORD_ONSHORTEN_EMBED_URL',
-
   'ssl.key': 'SSL_KEY',
   'ssl.cert': 'SSL_CERT',
 };
diff --git a/src/lib/db/models/zipline.ts b/src/lib/db/models/zipline.ts
index 05a7c506..47e57bb2 100755
--- a/src/lib/db/models/zipline.ts
+++ b/src/lib/db/models/zipline.ts
@@ -4,7 +4,9 @@ export async function getZipline() {
   const zipline = await prisma.zipline.findFirst();
   if (!zipline) {
     return prisma.zipline.create({
-      data: {},
+      data: {
+        coreTempDirectory: '/tmp/zipline',
+      },
     });
   }
 
diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
index 64043452..7151bb91 100755
--- a/src/pages/view/[id].tsx
+++ b/src/pages/view/[id].tsx
@@ -313,6 +313,9 @@ export const getServerSideProps: GetServerSideProps<{
   const { id, pw } = context.query;
   if (!id) return { notFound: true };
 
+  const { config: libConfig, reloadSettings } = await import('@/lib/config');
+  if (!libConfig) await reloadSettings();
+
   const file = await prisma.file.findFirst({
     where: {
       name: id as string,
@@ -376,7 +379,7 @@ export const getServerSideProps: GetServerSideProps<{
   const password = !!file.password;
   delete (file as any).password;
 
-  const config = safeConfig();
+  const config = safeConfig(libConfig);
 
   await prisma.file.update({
     where: {
diff --git a/src/server/plugins/checkRateLimit.ts b/src/server/plugins/checkRateLimit.ts
index 8a406802..dcd612d6 100644
--- a/src/server/plugins/checkRateLimit.ts
+++ b/src/server/plugins/checkRateLimit.ts
@@ -1,13 +1,10 @@
-import { PROP_TO_ENV } from '@/lib/config/read';
 import { Config } from '@/lib/config/validate';
 
 export function checkRateLimit(config: Config) {
-  if (config.ratelimit.max <= 0) throw new Error(`${PROP_TO_ENV['ratelimit.max']} must be greater than 0`);
+  if (config.ratelimit.max <= 0) throw new Error('ratelimitMax must be greater than 0');
 
   if (config.ratelimit.window && !config.ratelimit.max)
-    throw new Error(
-      `${PROP_TO_ENV['ratelimit.max']} must be set if ${PROP_TO_ENV['ratelimit.window']} is set`,
-    );
+    throw new Error('ratelimitMax must be set if ratelimitWindow is set');
 
   return;
 }