Merge branch 'dev'

Author: Jecomo-Alyssa-Lyn

apps/codebility/app/home/_components/LeftSidebar.tsx

@@ -54,12 +54,6 @@ const LeftSidebar = () => {
           links: section.links.filter((link: SidebarLink) => {
             // TODO: Remove these filters when features are implemented
 
-            // Filter out Feeds from MENU section
-            if (link.label === "Feeds") {
-              console.log("🚧 Feeds feature not yet implemented - hiding from navigation");
-              return false;
-            }
-            
             // Filter out Codev Overflow from CODEVS section
             if (link.label === "Codev Overflow") {
               console.log("🚧 Codev Overflow feature not yet implemented - hiding from navigation");
@@ -69,13 +63,13 @@ const LeftSidebar = () => {
             return true; // Keep all other links
           })
         }));
-        
+
         setSidebarData(filteredData);
       }
     };
 
     fetchSidebarData();
-  }, [roleId, refreshKey]);
+  }, []);
 
   const sidebarVariants = {
     closed: {

apps/codebility/app/home/_components/LeftSidebarClient.tsx

@@ -41,10 +41,7 @@ const LeftSidebarClient = ({ initialSidebarData }: LeftSidebarClientProps) => {
   const filteredSidebarData = initialSidebarData.map((section) => ({
     ...section,
     links: section.links.filter((link) => {
-      // TODO: Remove these filters when features are implemented
-      if (link.label === "Feeds" || link.label === "Codev Overflow") {
-        return false;
-      }
+
       return true;
     })
   }));

apps/codebility/app/home/feeds/_components/CreatePostForm.tsx

@@ -71,6 +71,12 @@ const CreatePostForm = ({
       setImage(null);
     } catch (error) {
       console.error("Error creating post:", error);
+
+      if (error instanceof Error) {
+        toast.error(error.message);
+        return;
+      }
+
       toast.error("Failed to create post.");
     } finally {
       setIsSubmitting(false);

apps/codebility/app/home/feeds/_components/EditPostForm.tsx

@@ -83,6 +83,12 @@ const EditPostForm = ({
       setImage(null);
     } catch (error) {
       console.error("Error editing post:", error);
+
+      if (error instanceof Error) {
+        toast.error(error.message);
+        return;
+      }
+      
       toast.error("Failed to edit post.");
     } finally {
       setIsSubmitting(false);

apps/codebility/app/home/feeds/_services/action.ts

@@ -1,6 +1,8 @@
 "use server";
 import { createClientServerComponent } from "@/utils/supabase/server";
 import { deleteImage, getImagePath } from "@/utils/uploadImage";
+import { createPostSchema, editPostSchema } from "./validation";
+import { ZodError } from "zod";
 
 
 export const getUserRole = async (userId: Number | null): Promise<string | null> => {
@@ -43,15 +45,22 @@ type AddPostParams = {
   tag_ids?: number[] | null;
 };
 
-export const addPost = async ({
-  title,
-  content,
-  author_id,
-  image_url,
-  content_image_ids,
-  tag_ids,
-}: AddPostParams) => {
+export const addPost = async (
+  payload
+: AddPostParams) => {
   try {
+    // Validation
+    const parsed = createPostSchema.parse(payload);
+
+    const {
+      title,
+      content,
+      author_id,
+      image_url,
+      content_image_ids,
+      tag_ids,
+    } = parsed;
+
     const supabase = await createClientServerComponent();
 
     // 1. Insert the post
@@ -105,6 +114,10 @@ export const addPost = async ({
     return newPost;
   } catch (error) {
     console.error("Error in addPost:", error);
+
+    if (error instanceof ZodError) {
+      throw new Error(error.errors[0]?.message ?? "Invalid post data");
+    }
     throw error;
   }
 };
@@ -155,16 +168,22 @@ type EditPostParams = {
   tag_ids?: number[] | null;
 };
 
-export const editPost = async ({
-  id,
-  title,
-  content,
-  author_id,
-  image_url,
-  content_image_ids,
-  tag_ids,
-}: EditPostParams) => {
+export const editPost = async (payload: EditPostParams) => {
   try {
+    // Validation
+    const parsed = editPostSchema.parse(payload);
+
+    const {
+      id,
+      title,
+      content,
+      author_id,
+      image_url,
+      content_image_ids,
+      tag_ids,
+    } = parsed;
+
+
     const supabase = await createClientServerComponent();
 
     // 1. Fetch existing post for old image cleanup
@@ -255,6 +274,9 @@ export const editPost = async ({
     return updatedPost;
   } catch (error) {
     console.error("Error editing post:", error);
+    if (error instanceof ZodError) {
+      throw new Error(error.errors[0]?.message ?? "Invalid post data");
+    }
     throw error;
   }
 };
@@ -553,3 +575,29 @@ export async function deletePostComment(comment_id: string) {
     throw error;
   }
 }
+
+export const hasReachedDailyPostLimit = async (author_id: string, limit = 2) => {
+  try {
+    const supabase = await createClientServerComponent();
+
+    // Timestamp 24 hours ago
+    const twentyFourHoursAgo = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
+
+    const { count, error } = await supabase
+      .from("posts")
+      .select("id", { count: "exact", head: true }) // head: true avoids fetching rows
+      .eq("author_id", author_id)
+      .gte("created_at", twentyFourHoursAgo);
+
+    if (error) {
+      console.error("Error checking daily post limit:", error);
+      throw error;
+    }
+
+    // Return true if count >= limit
+    return (count ?? 0) >= limit;
+  } catch (error) {
+    console.error("Error in hasReachedDailyPostLimit:", error);
+    throw error;
+  }
+};

apps/codebility/app/home/feeds/_services/validation.ts

@@ -0,0 +1,22 @@
+import { z } from "zod";
+
+export const createPostSchema = z.object({
+  title: z
+    .string()
+    .min(3, "Title must be at least 3 characters")
+    .max(150, "Title is too long"),
+
+  content: z
+    .string()
+    .max(15000, "Post content is too long"),
+
+  author_id: z.string().nullable().optional(),
+  image_url: z.string().url().nullable().optional(),
+  content_image_ids: z.any().optional(),
+  tag_ids: z.any().optional(),
+});
+
+
+export const editPostSchema = createPostSchema.extend({
+  id: z.string(),
+});

apps/codebility/app/home/feeds/page.tsx

@@ -4,13 +4,13 @@ import { useEffect, useState } from "react";
 import CreatePostModal from "@/components/modals/CreatePostModal";
 import { Button } from "@/components/ui/button";
 import { useUserStore } from "@/store/codev-store";
-import { ChevronDown } from "lucide-react";
 
 import Feed from "./_components/Feed";
 import SocialPointsCard from "./_components/SocialPointsCard";
 import SortMenu from "./_components/SortMenu";
 import { SEARCH_DEBOUNCE_MS } from "./_constants";
-import { getUserRole } from "./_services/action";
+import { getUserRole, hasReachedDailyPostLimit } from "./_services/action";
+import toast from "react-hot-toast";
 
 type SortField = "title" | "date" | "upvotes";
 type SortOrder = "asc" | "desc";
@@ -22,7 +22,6 @@ export default function FeedsPage() {
   const [debouncedQuery, setDebouncedQuery] = useState("");
   const [sortField, setSortField] = useState<SortField>("date");
   const [sortOrder, setSortOrder] = useState<SortOrder>("desc");
-  const [sortMenuOpen, setSortMenuOpen] = useState(false);
   const { user } = useUserStore();
 
   useEffect(() => {
@@ -42,7 +41,22 @@ export default function FeedsPage() {
     return () => clearTimeout(handler);
   }, [searchQuery]);
 
-  const openModal = () => setIsModalOpen(true);
+  const openModal = async () => {
+    if (!user) return;
+
+    try {
+      const unallowed = await hasReachedDailyPostLimit(user.id);
+
+      if (unallowed) {
+        toast.error("Daily post limit reached. You’re not allowed to create a post right now.");
+        return;
+      }
+
+      setIsModalOpen(true);
+    } catch (error) {
+      console.error("Failed to check posting permission", error);
+    }
+  };
   const closeModal = () => setIsModalOpen(false);
 
   return (