Add chatter command blacklisting and correct search totals

Jamesllllllllll · Jamesllllllllll · commit 2c39faea3dad · 2026-03-22T17:07:41.000-04:00
diff --git a/src/components/song-search-panel.tsx b/src/components/song-search-panel.tsx
@@ -130,9 +130,11 @@ export function SongSearchPanel(props: {
   infoNote?: string;
   placeholder?: string;
   className?: string;
+  extraSearchParams?: Record<string, string | number | boolean | undefined>;
   resultFilter?: (song: SearchSong) => boolean;
   resultState?: (song: SearchSong) => SearchSongResultState;
   advancedFiltersContent?: ReactNode;
+  useTotalForSummary?: boolean;
 }) {
   const [query, setQuery] = useState("");
   const [debouncedQuery, setDebouncedQuery] = useState("");
@@ -194,8 +196,24 @@ export function SongSearchPanel(props: {
       }
     }
 
+    if (props.extraSearchParams) {
+      for (const [key, value] of Object.entries(props.extraSearchParams)) {
+        if (value === undefined) {
+          continue;
+        }
+
+        params.set(key, String(value));
+      }
+    }
+
     return params;
-  }, [debouncedAdvancedFilters, debouncedQuery, field, page]);
+  }, [
+    debouncedAdvancedFilters,
+    debouncedQuery,
+    field,
+    page,
+    props.extraSearchParams,
+  ]);
 
   const hasSearchInput = useMemo(
     () =>
@@ -320,6 +338,9 @@ export function SongSearchPanel(props: {
     "{count}",
     String(catalogTotalQuery.data?.total ?? 0)
   );
+  const summaryCount = props.useTotalForSummary
+    ? (data?.total ?? 0)
+    : visibleResults.length;
   const totalPages = Math.max(
     1,
     Math.ceil((data?.total ?? 0) / (data?.pageSize ?? 25))
@@ -510,7 +531,7 @@ export function SongSearchPanel(props: {
               {!queryTooShort && !error ? (
                 <div className="search-panel__summary rounded-[24px] border border-(--border) bg-(--panel-soft) px-4 py-3 text-right">
                   <p className="text-lg font-semibold text-(--text)">
-                    Found {visibleResults.length} songs
+                    Found {summaryCount} songs
                   </p>
                 </div>
               ) : null}
diff --git a/src/lib/db/repositories.ts b/src/lib/db/repositories.ts
@@ -749,6 +749,9 @@ export interface CatalogSearchInput {
   tuning?: string[];
   parts?: string[];
   year?: number[];
+  excludeSongIds?: number[];
+  excludeArtistNames?: string[];
+  excludeCreatorNames?: string[];
   page: number;
   pageSize: number;
   sortBy?:
@@ -1040,12 +1043,47 @@ export async function searchCatalogSongs(
   const advancedCondition = hasAdvancedFilters
     ? sql.join(advancedConditions, sql` AND `)
     : null;
-  const whereCondition =
+  const baseWhereCondition =
     query && advancedCondition
       ? sql`(${basicCondition}) AND (${advancedCondition})`
       : query
         ? basicCondition
         : (advancedCondition ?? sql`1 = 1`);
+  const normalizedExcludedArtists = uniqueCompact(
+    (input.excludeArtistNames ?? []).map((name) => normalizeSearchPhrase(name))
+  );
+  const normalizedExcludedCreators = uniqueCompact(
+    (input.excludeCreatorNames ?? []).map((name) => normalizeSearchPhrase(name))
+  );
+  const excludedSongIds = [...new Set(input.excludeSongIds ?? [])].filter(
+    (songId): songId is number => Number.isInteger(songId) && songId > 0
+  );
+  const blacklistConditions = [
+    excludedSongIds.length
+      ? sql`${catalogSongs.sourceSongId} NOT IN ${sql`(${sql.join(
+          excludedSongIds.map((songId) => sql`${songId}`),
+          sql`, `
+        )})`}`
+      : null,
+    normalizedExcludedArtists.length
+      ? sql`lower(coalesce(${catalogSongs.artistName}, '')) NOT IN ${sql`(${sql.join(
+          normalizedExcludedArtists.map((name) => sql`${name}`),
+          sql`, `
+        )})`}`
+      : null,
+    normalizedExcludedCreators.length
+      ? sql`lower(coalesce(${catalogSongs.creatorName}, '')) NOT IN ${sql`(${sql.join(
+          normalizedExcludedCreators.map((name) => sql`${name}`),
+          sql`, `
+        )})`}`
+      : null,
+  ].filter(
+    (condition): condition is ReturnType<typeof sql> => condition !== null
+  );
+  const whereCondition =
+    blacklistConditions.length > 0
+      ? sql`(${baseWhereCondition}) AND (${sql.join(blacklistConditions, sql` AND `)})`
+      : baseWhereCondition;
 
   const titleTokenScore = buildTokenMatchScore(
     catalogSongs.title,
@@ -2030,6 +2068,23 @@ export async function addBlockedUser(
     .onConflictDoNothing();
 }
 
+export async function removeBlockedUser(
+  env: AppEnv,
+  input: {
+    channelId: string;
+    twitchUserId: string;
+  }
+) {
+  await getDb(env)
+    .delete(blockedUsers)
+    .where(
+      and(
+        eq(blockedUsers.channelId, input.channelId),
+        eq(blockedUsers.twitchUserId, input.twitchUserId)
+      )
+    );
+}
+
 export async function addBlacklistedArtist(
   env: AppEnv,
   input: Omit<BlacklistedArtistInsert, "createdAt">
diff --git a/src/lib/eventsub/chat-message.ts b/src/lib/eventsub/chat-message.ts
@@ -313,6 +313,21 @@ export async function processEventSubChatMessage(input: {
     return { body: "Ignored", status: 202 };
   }
 
+  if (await deps.isBlockedUser(env, channel.id, event.chatterTwitchUserId)) {
+    await deps.createRequestLog(env, {
+      channelId: channel.id,
+      twitchMessageId: event.messageId,
+      twitchUserId: event.chatterTwitchUserId,
+      requesterLogin: event.chatterLogin,
+      requesterDisplayName: event.chatterDisplayName,
+      rawMessage: event.rawMessage,
+      normalizedQuery: parsed.query,
+      outcome: "blocked",
+      outcomeReason: "user_blocked",
+    });
+    return { body: "Blocked", status: 202 };
+  }
+
   if (parsed.command === "addvip") {
     const targetLogin = parsed.query?.trim();
     const canManageVipTokens =
@@ -642,28 +657,6 @@ export async function processEventSubChatMessage(input: {
     }
   }
 
-  if (
-    await deps.isBlockedUser(env, channel.id, requesterIdentity.twitchUserId)
-  ) {
-    await deps.createRequestLog(env, {
-      channelId: channel.id,
-      twitchMessageId: event.messageId,
-      twitchUserId: requesterIdentity.twitchUserId,
-      requesterLogin: requesterIdentity.login,
-      requesterDisplayName: requesterIdentity.displayName,
-      rawMessage: event.rawMessage,
-      normalizedQuery: parsed.query,
-      outcome: "blocked",
-      outcomeReason: "user_blocked",
-    });
-    await deps.sendChatReply(env, {
-      channelId: channel.id,
-      broadcasterUserId: channel.twitchChannelId,
-      message: `${mention(event.chatterLogin)} you cannot request songs in this channel.`,
-    });
-    return { body: "Blocked", status: 202 };
-  }
-
   const vipTokenBalance = isVipCommand
     ? await deps.getVipTokenBalance(env, {
         channelId: channel.id,
diff --git a/src/lib/validation.ts b/src/lib/validation.ts
@@ -23,6 +23,20 @@ const searchFieldSchema = z.enum([
 export const searchInputSchema = z
   .object({
     query: z.string().trim().max(200).optional(),
+    channelSlug: z.string().trim().max(100).optional(),
+    showBlacklisted: z
+      .preprocess(
+        (value) =>
+          value === undefined
+            ? undefined
+            : value === true || value === "true"
+              ? true
+              : value === false || value === "false"
+                ? false
+                : value,
+        z.boolean().optional()
+      )
+      .default(false),
     field: searchFieldSchema.default("any"),
     title: z.string().trim().max(200).optional(),
     artist: z.string().trim().max(200).optional(),
@@ -85,6 +99,10 @@ export const moderationActionSchema = z.discriminatedUnion("action", [
     displayName: z.string().min(1).optional(),
     reason: z.string().trim().max(300).optional(),
   }),
+  z.object({
+    action: z.literal("removeBlockedUser"),
+    twitchUserId: z.string().min(1),
+  }),
   z.object({
     action: z.literal("addBlacklistedArtist"),
     artistId: z.number().int().positive(),
diff --git a/src/routes/api/dashboard/moderation.ts b/src/routes/api/dashboard/moderation.ts
@@ -15,6 +15,7 @@ import {
   removeBlacklistedArtist,
   removeBlacklistedCharter,
   removeBlacklistedSong,
+  removeBlockedUser,
   removeSetlistArtist,
   revokeVipToken,
   setVipTokenAvailableCount,
@@ -103,6 +104,21 @@ export const Route = createFileRoute("/api/dashboard/moderation")({
               payloadJson: JSON.stringify(body),
             });
             break;
+          case "removeBlockedUser":
+            await removeBlockedUser(runtimeEnv, {
+              channelId: state.channel.id,
+              twitchUserId: body.twitchUserId,
+            });
+            await createAuditLog(runtimeEnv, {
+              channelId: state.channel.id,
+              actorUserId: state.channel.ownerUserId,
+              actorType: "owner",
+              action: "unblock_user",
+              entityType: "blocked_user",
+              entityId: body.twitchUserId,
+              payloadJson: JSON.stringify(body),
+            });
+            break;
           case "addBlacklistedArtist":
             await addBlacklistedArtist(runtimeEnv, {
               channelId: state.channel.id,
diff --git a/src/routes/api/search/route.ts b/src/routes/api/search/route.ts
@@ -5,6 +5,8 @@ import { getSessionUserId } from "~/lib/auth/session.server";
 import {
   consumeSearchRateLimit,
   getCachedSearchResult,
+  getChannelBlacklistByChannelId,
+  getChannelBySlug,
   searchCatalogSongs as searchCatalogSongsInDb,
   upsertCachedSearchResult,
 } from "~/lib/db/repositories";
@@ -20,6 +22,8 @@ function normalizeSearchCacheInput(
 ) {
   return {
     query: input.query ?? "",
+    channelSlug: input.channelSlug ?? "",
+    showBlacklisted: input.showBlacklisted ?? false,
     field: input.field,
     title: input.title ?? "",
     artist: input.artist ?? "",
@@ -62,6 +66,8 @@ export const Route = createFileRoute("/api/search")({
 
         const payload = {
           query: url.searchParams.get("query") ?? undefined,
+          channelSlug: url.searchParams.get("channelSlug") ?? undefined,
+          showBlacklisted: url.searchParams.get("showBlacklisted") ?? undefined,
           field: url.searchParams.get("field") ?? undefined,
           title: url.searchParams.get("title") ?? undefined,
           artist: url.searchParams.get("artist") ?? undefined,
@@ -137,10 +143,37 @@ export const Route = createFileRoute("/api/search")({
         }
 
         try {
-          const results = await searchCatalogSongsInDb(
-            runtimeEnv,
-            normalizedInput
-          );
+          let blacklistFilterInput = {};
+          if (normalizedInput.channelSlug && !normalizedInput.showBlacklisted) {
+            const channel = await getChannelBySlug(
+              runtimeEnv,
+              normalizedInput.channelSlug
+            );
+
+            if (channel) {
+              const blacklist = await getChannelBlacklistByChannelId(
+                runtimeEnv,
+                channel.id
+              );
+
+              blacklistFilterInput = {
+                excludeSongIds: blacklist.blacklistSongs.map(
+                  (song) => song.songId
+                ),
+                excludeArtistNames: blacklist.blacklistArtists.map(
+                  (artist) => artist.artistName
+                ),
+                excludeCreatorNames: blacklist.blacklistCharters.map(
+                  (charter) => charter.charterName
+                ),
+              };
+            }
+          }
+
+          const results = await searchCatalogSongsInDb(runtimeEnv, {
+            ...normalizedInput,
+            ...blacklistFilterInput,
+          });
 
           await upsertCachedSearchResult(runtimeEnv, {
             cacheKey,
diff --git a/src/routes/dashboard/moderation.tsx b/src/routes/dashboard/moderation.tsx
diff --git a/src/routes/search.tsx b/src/routes/search.tsx
diff --git a/tests/eventsub.chat-message.test.ts b/tests/eventsub.chat-message.test.ts
