feat(api): Filter out remote placeholder users from local queries
- Add SQL filter to exclude users with '@' in handle from admin users endpoint - Update search endpoint to filter remote placeholder users from results - Modify users listing endpoint to exclude federated user handles - Prevent remote placeholder accounts from appearing in local user lists and search results
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import { NextResponse } from 'next/server';
|
import { NextResponse } from 'next/server';
|
||||||
import { db, users } from '@/db';
|
import { db, users } from '@/db';
|
||||||
import { requireAdmin } from '@/lib/auth/admin';
|
import { requireAdmin } from '@/lib/auth/admin';
|
||||||
import { desc } from 'drizzle-orm';
|
import { desc, sql } from 'drizzle-orm';
|
||||||
|
|
||||||
export async function GET(request: Request) {
|
export async function GET(request: Request) {
|
||||||
try {
|
try {
|
||||||
@@ -27,6 +27,7 @@ export async function GET(request: Request) {
|
|||||||
isBot: users.isBot,
|
isBot: users.isBot,
|
||||||
})
|
})
|
||||||
.from(users)
|
.from(users)
|
||||||
|
.where(sql`${users.handle} NOT LIKE '%@%'`)
|
||||||
.orderBy(desc(users.createdAt))
|
.orderBy(desc(users.createdAt))
|
||||||
.limit(limit);
|
.limit(limit);
|
||||||
|
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ export async function GET(request: Request) {
|
|||||||
eq(users.isSuspended, false),
|
eq(users.isSuspended, false),
|
||||||
eq(users.isSilenced, false)
|
eq(users.isSilenced, false)
|
||||||
);
|
);
|
||||||
searchUsers = await db.select({
|
const localUsers = await db.select({
|
||||||
id: users.id,
|
id: users.id,
|
||||||
handle: users.handle,
|
handle: users.handle,
|
||||||
displayName: users.displayName,
|
displayName: users.displayName,
|
||||||
@@ -117,6 +117,9 @@ export async function GET(request: Request) {
|
|||||||
.from(users)
|
.from(users)
|
||||||
.where(userConditions)
|
.where(userConditions)
|
||||||
.limit(limit);
|
.limit(limit);
|
||||||
|
|
||||||
|
// Filter out remote placeholder users (those with @ in handle)
|
||||||
|
searchUsers = localUsers.filter(u => !u.handle.includes('@'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Federated user lookup (exact handle@domain queries)
|
// Federated user lookup (exact handle@domain queries)
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export async function GET(request: NextRequest) {
|
|||||||
isBot: users.isBot,
|
isBot: users.isBot,
|
||||||
})
|
})
|
||||||
.from(users)
|
.from(users)
|
||||||
.where(sql`${users.isSuspended} IS FALSE`)
|
.where(sql`${users.isSuspended} IS FALSE AND ${users.handle} NOT LIKE '%@%'`)
|
||||||
.orderBy(desc(users.createdAt))
|
.orderBy(desc(users.createdAt))
|
||||||
.limit(limit);
|
.limit(limit);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user