From 588868a26b009a82b76fc39cfff40b41fb377ff2 Mon Sep 17 00:00:00 2001 From: MeowcaTheoRange Date: Thu, 6 Jul 2023 00:08:52 -0500 Subject: [PATCH] add quotes and fix the. partials --- src/lib/trollcall/convert/troll.ts | 4 ++-- src/pages/api/troll/[user]/[troll]/index.ts | 4 +--- src/types/client/quirks.ts | 6 ++++++ src/types/client/troll.ts | 8 ++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/lib/trollcall/convert/troll.ts b/src/lib/trollcall/convert/troll.ts index ced2ee1..5d93a83 100644 --- a/src/lib/trollcall/convert/troll.ts +++ b/src/lib/trollcall/convert/troll.ts @@ -36,8 +36,8 @@ export function SubmitTrollToServerTroll( quirks: submitTroll.quirks ? Object.fromEntries(submitTroll.quirks) : undefined, - owners: [], - flairs: [], + owners: undefined, + flairs: undefined, updatedDate: new Date() }; return serverTroll; diff --git a/src/pages/api/troll/[user]/[troll]/index.ts b/src/pages/api/troll/[user]/[troll]/index.ts index 25ad9ae..e5a8817 100644 --- a/src/pages/api/troll/[user]/[troll]/index.ts +++ b/src/pages/api/troll/[user]/[troll]/index.ts @@ -53,6 +53,7 @@ export default async function handler( }); if (thisUser == null || !compareCredentials(thisUser, cookies)) return res.status(403).end(); + console.log(getLevel(thisUser)); if (!compareLevels(getLevel(thisUser), "MODERATOR")) return res.status(403).end(); } @@ -68,6 +69,3 @@ export default async function handler( res.json(newTroll); } else return res.status(405).end(); } - -// 1119731948118605995 -// 1089603977131331584 diff --git a/src/types/client/quirks.ts b/src/types/client/quirks.ts index 8dd10dd..2902e73 100644 --- a/src/types/client/quirks.ts +++ b/src/types/client/quirks.ts @@ -17,3 +17,9 @@ export const SubmitQuirkHolderSchema = yup ); export type SubmitQuirkHolder = yup.InferType; + +export const PartialQuirkHolderSchema = yup + .array() + .of(yup.tuple([yup.string().lowercase(), QuirkSchema])); + +export type PartialQuirkHolder = yup.InferType; diff --git a/src/types/client/troll.ts b/src/types/client/troll.ts index 8693cea..01c4802 100644 --- a/src/types/client/troll.ts +++ b/src/types/client/troll.ts @@ -2,7 +2,7 @@ import { ColorSchema } from "@/types/assist/color"; import * as yup from "yup"; import { ClassKeys, TrueSignKeys } from "../assist/extended_zodiac"; import { PolicySchema } from "../assist/generics"; -import { SubmitQuirkHolderSchema } from "./quirks"; +import { PartialQuirkHolderSchema, SubmitQuirkHolderSchema } from "./quirks"; export const SubmitTrollSchema = yup .object({ @@ -122,7 +122,7 @@ export const SubmitTrollSchema = yup ), textColor: ColorSchema.notRequired(), // default to trueSign color if undefined, quirks: SubmitQuirkHolderSchema.required(), // DO NOT HANDLE RIGHT NOW. - // Handled! :D + quotes: yup.array().of(yup.string().max(1000)).required(), // Physical stuff species: yup @@ -238,8 +238,8 @@ export const PartialTrollSchema = yup yup.number().min(0).max(255), yup.number().min(0).max(255) ]), - quirks: SubmitQuirkHolderSchema, // DO NOT HANDLE RIGHT NOW. - // Handled! :D + quirks: PartialQuirkHolderSchema, // DO NOT HANDLE RIGHT NOW. + quotes: yup.array().of(yup.string().max(1000)), // Physical stuff species: yup