check block status before follow update

wanderer-moe · Mar 13, 2024 · 231e45a · 231e45a
1 parent 1bbbd3c
commit 231e45a
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 4 deletions.
diff --git a/src/v2/routes/user/follows/follow/id/[id]/route.ts b/src/v2/routes/user/follows/follow/id/[id]/route.ts
@@ -2,8 +2,8 @@ import { OpenAPIHono } from "@hono/zod-openapi"
 import { followUserByIdRoute } from "./openapi"
 import { getConnection } from "@/v2/db/turso"
 import { AuthSessionManager } from "@/v2/lib/managers/auth/user-session-manager"
-import { and, eq } from "drizzle-orm"
-import { userFollowing } from "@/v2/db/schema"
+import { and, eq, or } from "drizzle-orm"
+import { userFollowing, userBlocked } from "@/v2/db/schema"
 
 const handler = new OpenAPIHono<{ Bindings: Bindings; Variables: Variables }>()
 
@@ -55,6 +55,41 @@ handler.openapi(followUserByIdRoute, async (ctx) => {
         )
     }
 
+    const [blockedStatus] = await drizzle
+        .select({
+            id: userBlocked.blockedId,
+            blockById: userBlocked.blockedById,
+        })
+        .from(userBlocked)
+        .where(
+            or(
+                and(
+                    eq(userBlocked.blockedId, user.id),
+                    eq(userBlocked.blockedById, userId)
+                ),
+                and(
+                    eq(userBlocked.blockedId, userId),
+                    eq(userBlocked.blockedById, user.id)
+                )
+            )
+        )
+        .limit(1)
+
+    if (blockedStatus) {
+        const message =
+            blockedStatus.blockById === user.id
+                ? "You are blocked by this user"
+                : "You have blocked this user"
+
+        return ctx.json(
+            {
+                success: false,
+                message,
+            },
+            400
+        )
+    }
+
     try {
         await drizzle.insert(userFollowing).values({
             followerId: user.id,

diff --git a/src/v2/routes/user/follows/unfollow/id/[id]/route.ts b/src/v2/routes/user/follows/unfollow/id/[id]/route.ts
@@ -2,8 +2,8 @@ import { OpenAPIHono } from "@hono/zod-openapi"
 import { unFollowUserByIdRoute } from "./openapi"
 import { getConnection } from "@/v2/db/turso"
 import { AuthSessionManager } from "@/v2/lib/managers/auth/user-session-manager"
-import { userFollowing } from "@/v2/db/schema"
-import { and, eq } from "drizzle-orm"
+import { userFollowing, userBlocked } from "@/v2/db/schema"
+import { and, eq, or } from "drizzle-orm"
 
 const handler = new OpenAPIHono<{ Bindings: Bindings; Variables: Variables }>()
 
@@ -56,6 +56,41 @@ handler.openapi(unFollowUserByIdRoute, async (ctx) => {
         )
     }
 
+    const [blockedStatus] = await drizzle
+        .select({
+            id: userBlocked.blockedId,
+            blockById: userBlocked.blockedById,
+        })
+        .from(userBlocked)
+        .where(
+            or(
+                and(
+                    eq(userBlocked.blockedId, user.id),
+                    eq(userBlocked.blockedById, userId)
+                ),
+                and(
+                    eq(userBlocked.blockedId, userId),
+                    eq(userBlocked.blockedById, user.id)
+                )
+            )
+        )
+        .limit(1)
+
+    if (blockedStatus) {
+        const message =
+            blockedStatus.blockById === user.id
+                ? "You are blocked by this user"
+                : "You have blocked this user"
+
+        return ctx.json(
+            {
+                success: false,
+                message,
+            },
+            400
+        )
+    }
+
     try {
         await drizzle
             .delete(userFollowing)