refactor!: rename tp fansubId and publisherId

yjl9903 · Jun 14, 2023 · 475959a · 475959a
1 parent 0aea7b5
commit 475959a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 51 deletions.
diff --git a/packages/animegarden/src/garden/types.ts b/packages/animegarden/src/garden/types.ts
@@ -4,12 +4,12 @@ export interface FilterOptions {
   /**
    * Filter by the group id of fansub
    */
-  fansub?: number | string;
+  fansubId?: number | string;
 
   /**
    * Filter by the user id of publisher
    */
-  publisher?: number | string;
+  publisherId?: number | string;
 
   /**
    * Filter by the resource type
@@ -58,12 +58,12 @@ export interface ResolvedFilterOptions {
   /**
    * Filter by the group id of fansub
    */
-  fansub?: number;
+  fansubId?: number;
 
   /**
    * Filter by the user id of publisher
    */
-  publisher?: number;
+  publisherId?: number;
 
   /**
    * Filter by the resource type

diff --git a/packages/animegarden/src/garden/url.ts b/packages/animegarden/src/garden/url.ts
@@ -28,8 +28,8 @@ const parser = {
     .number()
     .default(100)
     .transform((ps) => Math.round(Math.max(1, Math.min(1000, ps)))),
-  fansub: z.coerce.number().optional(),
-  publisher: z.coerce.number().optional(),
+  fansubId: z.coerce.number().optional(),
+  publisherId: z.coerce.number().optional(),
   type: z.coerce.string().optional(),
   before: dateLike,
   after: dateLike,
@@ -133,11 +133,11 @@ export function stringifySearchURL(baseURL: string, options: FilterOptions): URL
   if (options.pageSize) {
     url.searchParams.set('pageSize', '' + options.pageSize);
   }
-  if (options.fansub) {
-    url.searchParams.set('fansub', '' + options.fansub);
+  if (options.fansubId) {
+    url.searchParams.set('fansubId', '' + options.fansubId);
   }
-  if (options.publisher) {
-    url.searchParams.set('publisher', '' + options.publisher);
+  if (options.publisherId) {
+    url.searchParams.set('publisherId', '' + options.publisherId);
   }
   if (options.type) {
     url.searchParams.set('type', '' + options.type);

diff --git a/packages/app/src/components/Search.tsx b/packages/app/src/components/Search.tsx
@@ -22,16 +22,14 @@ import { histories, loading } from '../state';
   });
 }
 
-const DMHY_RE =
-  /(?:https:\/\/share.dmhy.org\/topics\/view\/)?(\d+_[a-zA-Z0-9_\-]+\.html)/;
+const DMHY_RE = /(?:https:\/\/share.dmhy.org\/topics\/view\/)?(\d+_[a-zA-Z0-9_\-]+\.html)/;
 
 const useActiveElement = () => {
   const [listenersReady, setListenersReady] = useState(false);
   const [activeElement, setActiveElement] = useState(document.activeElement);
 
   useEffect(() => {
-    const onFocus = (event: FocusEvent) =>
-      setActiveElement(event.target as any);
+    const onFocus = (event: FocusEvent) => setActiveElement(event.target as any);
     const onBlur = (event: FocusEvent) => setActiveElement(null);
 
     window.addEventListener('focus', onFocus, true);
@@ -133,10 +131,7 @@ export default function Search() {
         // Filter old history item which is the substring of the current input
         const oldHistories = histories.get().filter((o) => !target.includes(o));
         // Remove duplicate items
-        const newHistories = [...new Set([target, ...oldHistories])].slice(
-          0,
-          10
-        );
+        const newHistories = [...new Set([target, ...oldHistories])].slice(0, 10);
         // Set histories
         histories.set(newHistories);
 
@@ -201,9 +196,7 @@ export default function Search() {
                 onMouseDown={() => selectGoToSearch()}
                 onSelect={() => selectGoToSearch()}
               >
-                {DMHY_RE.test(input)
-                  ? `前往 ${input}`
-                  : `在本页列出 ${input} 的搜索结果...`}
+                {DMHY_RE.test(input) ? `前往 ${input}` : `在本页列出 ${input} 的搜索结果...`}
               </Command.Item>
               <Command.Item
                 onSelect={() => {
@@ -233,12 +226,8 @@ export default function Search() {
                   <Command.Item
                     key={r.href}
                     value={r.href}
-                    onMouseDown={selectStatic(
-                      `/resource/${r.href.split('/').at(-1)}`
-                    )}
-                    onSelect={selectStatic(
-                      `/resource/${r.href.split('/').at(-1)}`
-                    )}
+                    onMouseDown={selectStatic(`/resource/${r.href.split('/').at(-1)}`)}
+                    onSelect={selectStatic(`/resource/${r.href.split('/').at(-1)}`)}
                   >
                     {r.title}
                   </Command.Item>
@@ -285,9 +274,7 @@ export default function Search() {
                 {filteredFansub.map((fansub) => (
                   <Command.Item
                     key={fansub.id}
-                    onMouseDown={selectStatic(
-                      `/resources/1?fansub=${fansub.id}`
-                    )}
+                    onMouseDown={selectStatic(`/resources/1?fansub=${fansub.id}`)}
                     onSelect={selectStatic(`/resources/1?fansub=${fansub.id}`)}
                   >
                     {fansub.name}
@@ -333,9 +320,7 @@ function parseSearch(search: string) {
           fansub.push(found.id);
         } else {
           word = word.replace('樱', '桜');
-          const found = fansubs.find((t) =>
-            tradToSimple(t.name).includes(word)
-          );
+          const found = fansubs.find((t) => tradToSimple(t.name).includes(word));
           if (found) {
             fansub.push(found.id);
           }
@@ -390,20 +375,14 @@ function goToSearch(search: string) {
     if (match) {
       goTo(`/resource/${match[1]}`);
     } else {
-      const {
-        search: keywords,
-        include,
-        exclude,
-        fansub,
-        after
-      } = parseSearch(search);
+      const { search: keywords, include, exclude, fansub, after } = parseSearch(search);
       const query = [
         `search=${JSON.stringify(keywords)}`,
         `include=${JSON.stringify(include)}`,
         `exclude=${JSON.stringify(exclude)}`
       ];
       if (fansub !== undefined) {
-        query.push(`fansub=${fansub}`);
+        query.push(`fansubId=${fansub}`);
       }
       if (after !== undefined) {
         query.push(`after=${after.toISOString()}`);

diff --git a/packages/app/src/pages/resources/[page].astro b/packages/app/src/pages/resources/[page].astro
@@ -17,9 +17,9 @@ const page = _page ? +_page : 1;
 const url = Astro.url;
 const params = parseSearchURL(Astro.url.searchParams);
 
-const publisher = params.publisher;
-const fansub = params.fansub;
-const fansubItem = fansubs.find((f) => f.id === fansub);
+const publisherId = params.publisherId;
+const fansubId = params.fansubId;
+const fansub = fansubs.find((f) => f.id === fansubId);
 const type = params.type && params.type in QueryType ? QueryType[params.type] : params.type;
 const after = params.after;
 const before = params.before;
@@ -55,17 +55,17 @@ function removeQuote(words: string[]) {
     {
       ok ? (
         <>
-          {(search || include || before || after || fansubItem) && (
+          {(search || include || before || after || fansub) && (
             <>
               <div class="mb4 p4 w-full bg-gray-100 rounded-md space-y-2">
-                {fansubItem && (
+                {fansub && (
                   <div class="space-x-2 select-none text-0">
                     <span class="text-4 text-base-800 font-bold inline-block mr2">字幕组</span>
                     <a
-                      href={`/resources/1?fansub=${fansubItem.id}`}
+                      href={`/resources/1?fansub=${fansub.id}`}
                       class="text-4 select-text text-link"
                     >
-                      {fansubItem.name}
+                      {fansub.name}
                     </a>
                   </div>
                 )}

diff --git a/packages/worker/src/query.ts b/packages/worker/src/query.ts
@@ -43,15 +43,14 @@ export const getSearchResources = memoAsync(
     const timer = createTimer(`Search Resources`);
     timer.start();
 
-    const { page, pageSize, fansub, publisher, type, before, after, search, include, exclude } =
+    const { page, pageSize, fansubId, publisherId, type, before, after, search, include, exclude } =
       options;
+
     const result = await prisma.resource.findMany({
       where: {
         AND: [
           {
             type,
-            fansubId: fansub,
-            publisherId: publisher,
             createdAt: {
               gte: after,
               lte: before
@@ -60,6 +59,12 @@ export const getSearchResources = memoAsync(
               search: search && search.length > 0 ? search.join(' ') : undefined
             }
           },
+          {
+            fansubId: fansubId
+          },
+          {
+            publisherId: publisherId
+          },
           {
             AND: include?.map((arr) => ({
               OR: arr.map((t) => ({ titleAlt: { contains: normalizeTitle(t) } }))