From d5ca3c0cb914f64f36c01349aacba0cd8a96e8be Mon Sep 17 00:00:00 2001
From: MeowcaTheoRange <me@abtmtr.link>
Date: Thu, 25 Apr 2024 13:47:14 -0500
Subject: [PATCH] Sharpen fediblock check

---
 src/app/jams/oauth/code/route.ts  | 2 +-
 src/app/jams/oauth/login/route.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/jams/oauth/code/route.ts b/src/app/jams/oauth/code/route.ts
index 2a97fc2..9893042 100644
--- a/src/app/jams/oauth/code/route.ts
+++ b/src/app/jams/oauth/code/route.ts
@@ -84,7 +84,7 @@ export async function GET(request: NextRequest) {
     username: tUserExists.acct,
     admin: false,
     url: tUserExists.url,
-    banned: JSONt1List.includes(instance), // If user's domain is on tier1, start user banned
+    banned: JSONt1List.some(fbinst => instance.includes(fbinst)), // If user's domain is on tier1, start user banned
     joined: Date.now()
   } as UserTable;
 
diff --git a/src/app/jams/oauth/login/route.ts b/src/app/jams/oauth/login/route.ts
index c7154be..adfd93f 100644
--- a/src/app/jams/oauth/login/route.ts
+++ b/src/app/jams/oauth/login/route.ts
@@ -34,11 +34,11 @@ export async function GET(request: NextRequest) {
   const JSONFnList = fnList.split("\n");
   const JSONSsList = ssList.split("\n");
 
-  if (JSONSsList.includes(instance)) return new Response('https://seirdy.one/pb/spammy-subdomains.txt', {
+  if (JSONSsList.some(fbinst => instance.includes(fbinst))) return new Response('https://seirdy.one/pb/spammy-subdomains.txt', {
     status: 403
   });
 
-  if (JSONFnList.includes(instance)) return new Response('https://seirdy.one/pb/FediNuke.txt', {
+  if (JSONFnList.some(fbinst => instance.includes(fbinst))) return new Response('https://seirdy.one/pb/FediNuke.txt', {
     status: 403
   });