From f92e475703a71aa4ea3affe07aa3923e1c0a8c7c Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Tue, 10 Jun 2025 10:08:01 +1000
Subject: [PATCH] Combined fixes (#116)

* fix: missing CheckIcon import in LanguageSelector

* fix: #114 and error handling

* fix: #97

* fix: lint

* feat: #104

* fix: #72
---
 server/components/LanguageSelector.vue        |  5 ++-
 server/components/NewsArticleCreateButton.vue |  8 +++++
 server/error.vue                              |  7 +++-
 server/nuxt.config.ts                         |  1 +
 server/pages/account/notifications.vue        |  2 +-
 server/plugins/error-handler.ts               |  4 +--
 server/server/api/v1/admin/news/index.post.ts | 33 ++++++++++++-------
 .../server/internal/objects/transactional.ts  |  2 +-
 server/server/internal/tasks/index.ts         | 11 +++++--
 server/server/plugins/redirect.ts             | 27 ---------------
 10 files changed, 53 insertions(+), 47 deletions(-)
 delete mode 100644 server/server/plugins/redirect.ts

diff --git a/server/components/LanguageSelector.vue b/server/components/LanguageSelector.vue
index 523b8e48..496f8e13 100644
--- a/server/components/LanguageSelector.vue
+++ b/server/components/LanguageSelector.vue
@@ -107,7 +107,10 @@ import {
   ListboxOptions,
 } from "@headlessui/vue";
 import { ChevronUpDownIcon } from "@heroicons/vue/16/solid";
-import { ArrowTopRightOnSquareIcon } from "@heroicons/vue/24/outline";
+import {
+  ArrowTopRightOnSquareIcon,
+  CheckIcon,
+} from "@heroicons/vue/24/outline";
 import type { Locale } from "vue-i18n";
 
 const { locales, locale: currLocale, setLocale } = useI18n();
diff --git a/server/components/NewsArticleCreateButton.vue b/server/components/NewsArticleCreateButton.vue
index efe93129..5925d039 100644
--- a/server/components/NewsArticleCreateButton.vue
+++ b/server/components/NewsArticleCreateButton.vue
@@ -193,6 +193,7 @@
         <LoadingButton
           :loading="loading"
           class="bg-blue-600 text-white hover:bg-blue-500"
+          :disabled="!isValidArticle"
           @click="() => createArticle()"
         >
           {{ $t("news.article.submit") }}
@@ -235,6 +236,13 @@ const newArticle = ref({
   tags: [] as string[],
 });
 
+const isValidArticle = computed(
+  () =>
+    newArticle.value.title &&
+    newArticle.value.description &&
+    newArticle.value.content,
+);
+
 const markdownPreview = computed(() => {
   // TODO: maybe?? add https://github.com/cure53/DOMPurify
   // micromark says its safe, but this is straight html we are injecting
diff --git a/server/error.vue b/server/error.vue
index 3e2e31ab..94c0cf19 100644
--- a/server/error.vue
+++ b/server/error.vue
@@ -21,13 +21,18 @@ async function signIn() {
     redirect: `/auth/signin?redirect=${encodeURIComponent(route.fullPath)}`,
   });
 }
+switch (statusCode) {
+  case 401:
+  case 403:
+    await signIn();
+}
 
 useHead({
   title: t("errors.pageTitle", [statusCode ?? message]),
 });
 
 if (import.meta.client) {
-  console.log(props.error);
+  console.warn(props.error);
 }
 </script>
 
diff --git a/server/nuxt.config.ts b/server/nuxt.config.ts
index c0eeb5b6..f8725211 100644
--- a/server/nuxt.config.ts
+++ b/server/nuxt.config.ts
@@ -254,5 +254,6 @@ export default defineNuxtConfig({
     },
     rateLimiter: false,
     xssValidator: false,
+    requestSizeLimiter: false,
   },
 });
diff --git a/server/pages/account/notifications.vue b/server/pages/account/notifications.vue
index 7f691064..2a60d6d4 100644
--- a/server/pages/account/notifications.vue
+++ b/server/pages/account/notifications.vue
@@ -9,7 +9,7 @@
         </h2>
         <button
           :disabled="notifications.length === 0"
-          class="inline-flex items-center justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinc-100 shadow-sm transition-all duration-200 hover:bg-zinc-700 hover:scale-[1.02] hover:shadow-lg active:scale-95 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-zinc-600 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-zinc-800 disabled:hover:scale-100 disabled:hover:shadow-none"
+          class="inline-flex items-center justify-center gap-x-2 rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinc-100 shadow-sm transition-all duration-200 hover:bg-zinc-700 hover:scale-[1.02] hover:shadow-lg active:scale-95 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-zinc-600 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-zinc-800 disabled:hover:scale-100 disabled:hover:shadow-none"
           @click="markAllAsRead"
         >
           <CheckIcon class="size-4" />
diff --git a/server/plugins/error-handler.ts b/server/plugins/error-handler.ts
index 53657f25..4337928e 100644
--- a/server/plugins/error-handler.ts
+++ b/server/plugins/error-handler.ts
@@ -1,5 +1,5 @@
 export default defineNuxtPlugin((nuxtApp) => {
-  nuxtApp.vueApp.config.errorHandler = (error, instance, info) => {
+  nuxtApp.hook("vue:error", (error, instance, info) => {
     console.error(error, instance, info);
-  };
+  });
 });
diff --git a/server/server/api/v1/admin/news/index.post.ts b/server/server/api/v1/admin/news/index.post.ts
index abda24d1..1dd7cb15 100644
--- a/server/server/api/v1/admin/news/index.post.ts
+++ b/server/server/api/v1/admin/news/index.post.ts
@@ -1,8 +1,16 @@
+import { ArkErrors, type } from "arktype";
 import { defineEventHandler, createError } from "h3";
 import aclManager from "~/server/internal/acls";
 import newsManager from "~/server/internal/news";
 import { handleFileUpload } from "~/server/internal/utils/handlefileupload";
 
+const CreateNews = type({
+  title: "string",
+  description: "string",
+  content: "string",
+  tags: "string = '[]'",
+});
+
 export default defineEventHandler(async (h3) => {
   const allowed = await aclManager.allowSystemACL(h3, ["news:create"]);
   if (!allowed) throw createError({ statusCode: 403 });
@@ -23,24 +31,25 @@ export default defineEventHandler(async (h3) => {
 
   const [imageIds, options, pull, _dump] = uploadResult;
 
-  const title = options.title;
-  const description = options.description;
-  const content = options.content;
-  const tags = options.tags ? (JSON.parse(options.tags) as string[]) : [];
-  const imageId = imageIds.at(0);
+  const body = await CreateNews(options);
+  if (body instanceof ArkErrors)
+    throw createError({ statusCode: 400, statusMessage: body.summary });
 
-  if (!title || !description || !content)
+  const parsedTags = JSON.parse(body.tags);
+  if (typeof parsedTags !== "object" || !Array.isArray(parsedTags))
     throw createError({
       statusCode: 400,
-      statusMessage: "Missing or invalid title, description or content.",
+      statusMessage: "Tags must be an array",
     });
 
-  const article = await newsManager.create({
-    title: title,
-    description: description,
-    content: content,
+  const imageId = imageIds.at(0);
 
-    tags: tags,
+  const article = await newsManager.create({
+    title: body.title,
+    description: body.description,
+    content: body.content,
+
+    tags: parsedTags,
 
     ...(imageId && { image: imageId }),
     authorId: "system",
diff --git a/server/server/internal/objects/transactional.ts b/server/server/internal/objects/transactional.ts
index dc9134fe..080253df 100644
--- a/server/server/internal/objects/transactional.ts
+++ b/server/server/internal/objects/transactional.ts
@@ -39,7 +39,7 @@ export class ObjectTransactionalHandler {
       if (!transaction) return;
 
       let progress = 0;
-      const increment = (1 / transaction.size) * 100;
+      const increment = 100 / transaction.size;
 
       for (const [id, data] of transaction) {
         if (typeof data === "string") {
diff --git a/server/server/internal/tasks/index.ts b/server/server/internal/tasks/index.ts
index e5838c77..83a34469 100644
--- a/server/server/internal/tasks/index.ts
+++ b/server/server/internal/tasks/index.ts
@@ -374,8 +374,15 @@ export function wrapTaskContext(
 ): TaskRunContext {
   return {
     progress(progress) {
-      const scalar = 100 / (options.max - options.min);
-      const adjustedProgress = progress * scalar + options.min;
+      if (progress > 100 || progress < 0) {
+        console.warn("[wrapTaskContext] progress must be between 0 and 100");
+      }
+
+      // I was too tired to figure this out
+      // https://stackoverflow.com/a/929107
+      const oldRange = 100;
+      const newRange = options.max - options.min;
+      const adjustedProgress = (progress * newRange) / oldRange + options.min;
       return context.progress(adjustedProgress);
     },
     log(message) {
diff --git a/server/server/plugins/redirect.ts b/server/server/plugins/redirect.ts
deleted file mode 100644
index 8218a0cb..00000000
--- a/server/server/plugins/redirect.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { H3Error } from "h3";
-import sessionHandler from "../internal/session";
-
-export default defineNitroPlugin((nitro) => {
-  nitro.hooks.hook("error", async (error, { event }) => {
-    if (!event) return;
-
-    // Don't handle for API routes
-    if (event.path.startsWith("/api")) return;
-    if (event.path.startsWith("/auth")) return;
-
-    // Make sure it's a web error
-    if (!(error instanceof H3Error)) return;
-
-    switch (error.statusCode) {
-      case 401:
-      case 403: {
-        const user = await sessionHandler.getSession(event);
-        if (user) break;
-        return sendRedirect(
-          event,
-          `/auth/signin?redirect=${encodeURIComponent(event.path)}`,
-        );
-      }
-    }
-  });
-});