diff --git a/src/components/mii/list/filter-menu.tsx b/src/components/mii/list/filter-menu.tsx index 8778bd6..3081737 100644 --- a/src/components/mii/list/filter-menu.tsx +++ b/src/components/mii/list/filter-menu.tsx @@ -128,11 +128,6 @@ export default function FilterMenu() { )} -
-
- Other -
-
)} diff --git a/src/components/mii/list/index.tsx b/src/components/mii/list/index.tsx index 283762a..6ac9a1a 100644 --- a/src/components/mii/list/index.tsx +++ b/src/components/mii/list/index.tsx @@ -1,7 +1,4 @@ -import Link from "next/link"; - import { Prisma } from "@prisma/client"; -import { Icon } from "@iconify/react"; import crypto from "crypto"; import seedrandom from "seedrandom"; @@ -11,9 +8,6 @@ import { auth } from "@/lib/auth"; import { prisma } from "@/lib/prisma"; import SortSelect from "./sort-select"; -import Carousel from "../../carousel"; -import LikeButton from "../../like-button"; -import DeleteMiiButton from "../delete-mii-button"; import Pagination from "./pagination"; import FilterMenu from "./filter-menu"; import MiiGrid from "./mii-grid"; @@ -61,7 +55,7 @@ export default async function MiiList({ searchParams, userId, inLikesPage }: Pro // Makeup ...(makeup && { makeup: { equals: makeup } }), // Quarantined - ...(!quarantined && { quarantined: false }), + ...(!quarantined && !userId && { quarantined: false }), // Profiles ...(userId && { userId }), }; diff --git a/src/components/mii/list/other-filters.tsx b/src/components/mii/list/other-filters.tsx index 6ccec92..fac98b2 100644 --- a/src/components/mii/list/other-filters.tsx +++ b/src/components/mii/list/other-filters.tsx @@ -1,13 +1,13 @@ "use client"; -import { Icon } from "@iconify/react"; import { MiiPlatform } from "@prisma/client"; -import { useRouter, useSearchParams } from "next/navigation"; +import { usePathname, useRouter, useSearchParams } from "next/navigation"; import { ChangeEvent, useState, useTransition } from "react"; export default function OtherFilters() { const router = useRouter(); const searchParams = useSearchParams(); + const pathname = usePathname(); const [, startTransition] = useTransition(); const platform = (searchParams.get("platform") as MiiPlatform) || undefined; @@ -48,22 +48,35 @@ export default function OtherFilters() { }); }; + const showAllowCopying = platform !== "SWITCH"; + const showQuarantined = !pathname.startsWith("/profile"); + + if (!showAllowCopying && !showQuarantined) return null; + return ( <> - {platform === "THREE_DS" && ( -
+
+
+ Other +
+
+ + {showAllowCopying && ( +
)} -
- - -
+ {showQuarantined && ( +
+ + +
+ )} ); } diff --git a/src/components/submit-form/mii-editor/tabs/misc.tsx b/src/components/submit-form/mii-editor/tabs/misc.tsx index 34c6e70..caa02bd 100644 --- a/src/components/submit-form/mii-editor/tabs/misc.tsx +++ b/src/components/submit-form/mii-editor/tabs/misc.tsx @@ -181,7 +181,7 @@ export default function HeadTab({ instructions }: Props) { type="number" id="age" min={1} - max={100} + max={1000} className="pill input text-sm py-1! px-3! w-full" value={birthday.age ?? undefined} onChange={(e) => { diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts index 6260162..5e4ae4e 100644 --- a/src/lib/schemas.ts +++ b/src/lib/schemas.ts @@ -288,7 +288,7 @@ export const switchMiiInstructionsSchema = z .object({ day: z.number().int().min(1).max(31).optional(), month: z.number().int().min(1).max(12).optional(), - age: z.number().int().min(1).max(100).optional(), + age: z.number().int().min(1).max(1000).optional(), dontAge: z.boolean().optional(), }) .optional(),