Moderator refactored

nidhish-nayak · Apr 10, 2024 · 1374273 · 1374273
1 parent e22fe49
commit 1374273
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 25 deletions.
diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
diff --git a/server/src/controllers/post/addPost.controller.ts b/server/src/controllers/post/addPost.controller.ts
@@ -42,7 +42,7 @@ export const addPost = async (req: Request, res: Response) => {
         // Call moderator on separate thread
         if (img) {
             setTimeout(() => {
-                moderatorCheck(userId, data[0].id, true, img);
+                moderatorCheck(data[0].id, "posts", userId, img);
             }, 1);
         }
 

diff --git a/server/src/controllers/story/postStory.controller.ts b/server/src/controllers/story/postStory.controller.ts
@@ -36,7 +36,7 @@ export const postStory = async (req: Request, res: Response) => {
 
     // Call moderator on separate thread
     setTimeout(() => {
-        moderatorCheck(userId, data[0].id, false, img);
+        moderatorCheck(data[0].id, "stories", userId, img);
     }, 1);
 
     return res.status(200).json(data);

diff --git a/server/src/utils/moderator.util.ts b/server/src/utils/moderator.util.ts
@@ -5,13 +5,20 @@ import { addBan, getModerationAxiosConfig } from "./axios.util";
 import logDetails from "./log.util";
 
 const moderatorCheck = async (
-    userId: number,
     id: number,
-    post: boolean,
+    table: string,
+    userId: number,
     imageUrl: string
 ) => {
+    // Deletable tables
+    const allowedTables = ["posts", "stories"];
+
     // Toggle moderator on/off as per config
-    if (config.modOptions.modStatus === false || !imageUrl) {
+    if (
+        config.modOptions.modStatus === false ||
+        !imageUrl ||
+        !allowedTables.includes(table)
+    ) {
         return;
     }
 
@@ -25,28 +32,17 @@ const moderatorCheck = async (
                 return console.log("User ban failed upon unsafe upload!");
 
             // Delete post or story if user banned
-            if (post) {
-                await logDetails(userId, imageUrl, "posts");
-
-                const { error } = await supabase
-                    .from("posts")
-                    .delete()
-                    .eq("userId", userId)
-                    .eq("id", id);
-                if (error) return console.log("Error during post delete!");
-            } else {
-                await logDetails(userId, imageUrl, "stories");
-
-                const { error } = await supabase
-                    .from("stories")
-                    .delete()
-                    .eq("userId", userId)
-                    .eq("id", id);
-                if (error) return console.log("Error during story delete!");
-            }
+            await logDetails(userId, imageUrl, table);
+
+            const { error } = await supabase
+                .from(table)
+                .delete()
+                .eq("userId", userId)
+                .eq("id", id);
+            if (error) return console.log(`Error during ${table} delete!`);
 
             // Log the banned userId on server
-            console.log(`UserId: ${userId} was banned!`);
+            console.log(`UserId: ${userId} was banned for unsafe ${table}!`);
         }
         return;
     } catch (error) {