Merge pull request #431 from YOGESH-08/staging

abhitrueprogrammer · web-flow · commit ad392cb9c081 · 2026-01-24T18:09:41.000+05:30
fix: build and ip_ratelimit
diff --git a/.env.example b/.env.example
@@ -27,3 +27,7 @@ KV_URL=""                           # The URL of your Vercel KV instance
 KV_REST_API_URL=""                  # The REST API URL of your Vercel KV instance
 KV_REST_API_TOKEN=""                # The REST API token for your Vercel KV instance
 KV_REST_API_READ_ONLY_TOKEN=""      # The read-only REST API token for your Vercel KV instance
+
+# Upstash_Redis
+UPSTASH_REDIS_REST_URL=""           # REST URL of your Upstash Redis database
+UPSTASH_REDIS_REST_TOKEN=""         # REST API token for Upstash Redis
diff --git a/src/app/api/report-tag/route.ts b/src/app/api/report-tag/route.ts
@@ -3,30 +3,48 @@ import { connectToDatabase } from "@/lib/database/mongoose";
 import TagReport from "@/db/tagReport";
 import { Ratelimit } from "@upstash/ratelimit";
 import { redis } from "@/lib/utils/redis";
-import { exams } from "@/components/select_options";
+
+const exams: string[] = ["CAT-1", "CAT-2", "FAT", "Model CAT-1", "Model CAT-2", "Model FAT"]
 
 interface ReportedFieldInput {
   field: string;
   value?: string;
 }
+interface ReportTagBody {
+  paperId?: string;
+  reportedFields?: unknown;
+  comment?: unknown;
+  reporterEmail?: unknown;
+  reporterId?: unknown;
+}
+
 const ALLOWED_FIELDS = ["subject", "courseCode", "exam", "slot", "year"];
 
-const ratelimit = new Ratelimit({
-  redis,
-  limiter: Ratelimit.slidingWindow(3, "1 h"),//per id - 3 request - per hour
-  analytics: true,
+function getRateLimit(){
+  return new Ratelimit({
+    redis,
+    limiter: Ratelimit.slidingWindow(3, "1 h"),//per id - 3 request - per hour
+    analytics: true,
 });
-
+}
 function getClientIp(req: Request & { ip?: string}): string {
-  return req.ip || "127.0.0.1";
+  const xff = req.headers.get("x-forwarded-for");
+  if (typeof xff === "string" && xff.length > 0) {
+    return xff.split(",")[0]?.trim()??"";
+  }
+  const xri = req.headers.get("x-real-ip");
+  if (typeof xri === "string" && xri.length > 0) {
+    return xri;
+  }
+  return "0.0.0.0";
 }
 
 export async function POST(req: Request & { ip?: string }) {
   try {
     await connectToDatabase();
-
-    const body = await req.json();
-    const { paperId } = body;
+    const ratelimit = getRateLimit();
+    const body = (await req.json()) as ReportTagBody;
+    const paperId = typeof body.paperId === "string" ? body.paperId : undefined;
 
     if (!paperId) {
       return NextResponse.json(
@@ -55,12 +73,14 @@ export async function POST(req: Request & { ip?: string }) {
     }
       const reportedFields: ReportedFieldInput[] = Array.isArray(body.reportedFields)
         ? body.reportedFields
-            .map((r:Partial<ReportedFieldInput>) => ({
-              field: typeof r.field === "string" ? r.field.trim() : "",
-              value: typeof r.value === "string" ? r.value.trim() : undefined,
-            }))
-            .filter((r:Partial<ReportedFieldInput>) => r.field)
-        : [];
+            .map((r): ReportedFieldInput | null => {
+               if (!r || typeof r !== "object") return null;
+
+              const field = typeof (r as { field?: unknown }).field === "string" ? (r as { field: string }).field.trim() : "";
+              const value = typeof (r as { value?: unknown }).value === "string" ? (r as { value: string }).value.trim() : undefined;
+             return field ? { field, value } : null;
+            })
+             .filter((r): r is ReportedFieldInput => r !== null):[];
 
     for (const rf of reportedFields) {
       if (!ALLOWED_FIELDS.includes(rf.field)) {
@@ -82,9 +102,10 @@ export async function POST(req: Request & { ip?: string }) {
     const newReport = await TagReport.create({
       paperId,
       reportedFields,
-      comment: body.comment,
-      reporterEmail: body.reporterEmail,
-      reporterId: body.reporterId,
+      comment: typeof body.comment === "string" ? body.comment : undefined,
+      reporterEmail: typeof body.reporterEmail === "string" ? body.reporterEmail : undefined,
+      reporterId: typeof body.reporterId === "string" ? body.reporterId : undefined,
+
     });
 
     return NextResponse.json(
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -15,6 +15,12 @@ import {
 } from "react-icons/fa6";
 import { Bold, Mail } from "lucide-react";
 import toast from "react-hot-toast";
+
+type SubscribeResponse = {
+  success?: boolean;
+  error?: string;
+};
+
 export default function Footer() {
   const { theme } = useTheme();
   const [isDarkMode, setIsDarkMode] = useState<boolean | null>(true);
@@ -37,14 +43,14 @@ export default function Footer() {
         body: JSON.stringify({ email }),
       })
       .then(async (res) => {
-        const data = await res.json();
-        if (!res.ok) return Promise.reject(data.error || "Something went wrong.");
+        const data = (await res.json()) as SubscribeResponse;
+        if (!res.ok) throw new Error(data.error ?? "Something went wrong.");
         return data;
       }),
       {
         loading: "Subscribing...",
         success: "You've Successfully Subscribed!",
-        error: (err: any) => err,
+        error: (err: Error) => err.message,
       },
     );
 
diff --git a/src/components/ReportTagModal.tsx b/src/components/ReportTagModal.tsx
@@ -14,9 +14,11 @@ import { Button } from "@/components/ui/button";
 import { MultiSelect } from "@/components/multi-select";
 import LabeledInput from "@/components/ui/LabeledInput";
 import LabeledSelect from "@/components/ui/LabeledSelect";
-import axios from "axios";
+import axios, { AxiosError } from "axios";
 import toast from "react-hot-toast";  
 
+type ReportResponse = { error?: string; message?: string };
+
 interface ReportTagModalProps {
   paperId: string;
   subject?: string;
@@ -40,8 +42,8 @@ const ReportTagModal = ({
   const [internalOpen, setInternalOpen] = useState(false);
   const isControlled = open !== undefined && setOpen !== undefined;
 
-  const modalOpen = isControlled ? open! : internalOpen;
-  const modalSetOpen = isControlled ? setOpen! : setInternalOpen;
+  const modalOpen = isControlled ? open : internalOpen;
+  const modalSetOpen = isControlled ? setOpen : setInternalOpen;
   const [comment, setComment] = useState("");
   const [email, setEmail] = useState("");
   const [selectedCategories, setSelectedCategories] = useState<string[]>([]);
@@ -64,14 +66,14 @@ const ReportTagModal = ({
   const isDirty = useMemo(() => {
     if (selectedCategories.length === 0) return false;
     for (const c of selectedCategories) {
-      const curr = (categoryValues[c] || "").trim();
-      const orig = (originalCategoryValues[c] || "").trim();
+      const curr = (categoryValues[c] ?? "").trim();
+      const orig = (originalCategoryValues[c] ?? "").trim();
       if (curr !== orig) return true;
     }
 
     if (selectedCategories.includes("subject")) {
-      const currCode = (categoryValues["courseCode"] || "").trim();
-      const origCode = (originalCategoryValues["courseCode"] || "").trim();
+      const currCode = (categoryValues.courseCode ?? "").trim();
+      const origCode = (originalCategoryValues.courseCode ?? "").trim();
       if (currCode !== origCode) return true;
     }
 
@@ -83,7 +85,8 @@ const ReportTagModal = ({
     for (const c of selectedCategories) {
       if (categoryValues[c]) continue;
       if (c === "subject" && subject) {
-        const m = subject.match(/^(.*)\s*\[([^\]]+)\]\s*$/);
+        const subjectRegex = /^(.*)\s*\[([^\]]+)\]\s*$/;
+        const m = subjectRegex.exec(subject);
         if (m?.[1] && m?.[2]) {
           const name = m[1].trim();
           const code = m[2].trim();
@@ -104,17 +107,18 @@ const ReportTagModal = ({
     if (open) {
       const base: Record<string, string> = {};
       if (subject) {
-        const m = subject.match(/^(.*)\s*\[([^\]]+)\]\s*$/);
+        const subjectRegex = /^(.*)\s*\[([^\]]+)\]\s*$/;
+        const m = subjectRegex.exec(subject);
         if (m?.[1] && m?.[2]) {
-          base["subject"] = m[1].trim();
-          base["courseCode"] = m[2].trim();
+          base.subject = m[1].trim();
+          base.courseCode = m[2].trim();
         } else {
-          base["subject"] = subject;
+          base.subject = subject;
         }
       }
-      if (exam) base["exam"] = exam;
-      if (slot) base["slot"] = slot;
-      if (year) base["year"] = year;
+      if (exam) base.exam = exam;
+      if (slot) base.slot = slot;
+      if (year) base.year = year;
       setOriginalCategoryValues(base);
       setOriginalEmail("");
     } else {
@@ -134,23 +138,23 @@ const ReportTagModal = ({
   }
 
   if (selectedCategories.includes("subject")) {
-  const sub = (categoryValues.subject || "").trim();
+  const sub = (categoryValues.subject ?? "").trim();
   if (!sub) {
     toast.error("Subject name cannot be empty.");
     return;
   }
 }
 
   if (selectedCategories.includes("slot")) {
-    const v = (categoryValues.slot || "").trim();
+    const v = (categoryValues.slot ?? "").trim();
     const slotRegex = /^[A-G][1-2]$/;
     if (!slotRegex.test(v)) {
       toast.error("Slot must be from A1 to G2 (e.g., D1, B2).");
       return;
     }
   }
   if (selectedCategories.includes("year")) {
-    const y = (categoryValues.year || "").trim();
+    const y = (categoryValues.year ?? "").trim();
     const yearRegex = /^\d{4}(-\d{4})?$/;
     if (!yearRegex.test(y)) {
       toast.error("Year must be a valid format (e.g., 2024 or 2024-2025).");
@@ -180,15 +184,15 @@ const ReportTagModal = ({
 
   for (const c of selectedCategories) {
     if (c === "subject") {
-      const newSub = (categoryValues.subject || "").trim();
-      const oldSub = (originalCategoryValues.subject || "").trim();
+      const newSub = (categoryValues.subject ?? "").trim();
+      const oldSub = (originalCategoryValues.subject ?? "").trim();
 
       if (newSub !== oldSub) {
         reportedFields.push({ field: "subject", value: newSub });
       }
 
-      const newCode = (categoryValues.courseCode || "").trim();
-      const oldCode = (originalCategoryValues.courseCode || "").trim();
+      const newCode = (categoryValues.courseCode ?? "").trim();
+      const oldCode = (originalCategoryValues.courseCode ?? "").trim();
 
       if (newCode !== oldCode) {
         reportedFields.push({ field: "courseCode", value: newCode });
@@ -197,8 +201,8 @@ const ReportTagModal = ({
       continue;
     }
 
-    const newVal = (categoryValues[c] || "").trim();
-    const oldVal = (originalCategoryValues[c] || "").trim();
+    const newVal = (categoryValues[c] ?? "").trim();
+    const oldVal = (originalCategoryValues[c] ?? "").trim();
 
     if (newVal !== oldVal) {
       reportedFields.push({ field: c, value: newVal });
@@ -213,20 +217,23 @@ if (reportedFields.length === 0 && comment.trim().length === 0) {
     paperId,
     reportedFields,
     comment,
-    reporterEmail: email || undefined,
+    reporterEmail: email ?? undefined,
   };
   setLoading(true);
   await toast.promise(
-    axios.post("/api/report-tag", payload),
+    axios.post<ReportResponse>("/api/report-tag", payload),
     {
       loading: "Submitting your report...",
       success: "Reported successfully. Thank you, We will work on that",
-      error: (err)=>{
-        return (
-        err?.response?.data?.error ||
-        err?.message ||
-        "Failed to submit report."
-        )
+      error: (err: unknown)=>{
+          if (axios.isAxiosError<ReportResponse>(err)) {
+            return ( 
+              err.response?.data?.error ??
+              err.message ??
+              "Failed to submit report."
+            );
+        }
+        return err instanceof Error ? err.message : "Failed to submit report.";
       },
     }
   )
diff --git a/src/components/ui/LabeledSelect.tsx b/src/components/ui/LabeledSelect.tsx
@@ -17,7 +17,7 @@ const LabeledSelect = ({ label, value, onChange, options, placeholder }: Labeled
     <Field label={label}>
       <Select value={value} onValueChange={onChange}>
         <SelectTrigger className="w-full">
-          <SelectValue placeholder={placeholder || "Select"} />
+          <SelectValue placeholder={placeholder ?? "Select"} />
         </SelectTrigger>
         <SelectContent>
           {options.map((opt) => (
diff --git a/src/components/ui/field.tsx b/src/components/ui/field.tsx
@@ -6,7 +6,7 @@ export function Field({ label, children, className }: {
   className?: string;
 }) {
   return (
-    <div className={`space-y-1 w-full ${className || ""}`}>
+    <div className={`space-y-1 w-full ${className ?? ""}`}>
       <Label>{label}</Label>
       {children}
     </div>
diff --git a/src/context/filterContext.tsx b/src/context/filterContext.tsx
@@ -7,7 +7,7 @@ import React, {
   useCallback,
   type ReactNode,
 } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
+import { ReadonlyURLSearchParams, useRouter, useSearchParams } from "next/navigation";
 import { type IPaper, type Filters } from "@/interface";
 import JSZip from "jszip";
 import { toast } from "react-hot-toast";
@@ -154,12 +154,16 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
         console.error(`Failed to fetch ${paper.file_url}`, err);
       }
     }
-
+    function getDownloadName(params:ReadonlyURLSearchParams, key: string, fallback = "download"): string {
+        const value = params.get(key);
+        if (!value) return fallback;
+        return value.split(" [")[0]?.trim() ?? fallback;
+  }
     const zipBlob = await zip.generateAsync({ type: "blob" });
     const url = URL.createObjectURL(zipBlob);
     const a = document.createElement("a");
     a.href = url;
-    a.download = searchParams.get("subject")?.split(" [")[0];
+    a.download = getDownloadName(searchParams,"subject");
     document.body.appendChild(a);
     a.click();
     a.remove();
