refactor: use exact authorId when searching for operations

Author: guansss

src/apis/operation-set.ts

@@ -1,4 +1,3 @@
-import { useAtomValue } from 'jotai'
 import { noop } from 'lodash-es'
 import {
   CopilotSetPageRes,
@@ -9,7 +8,6 @@ import {
 import useSWR from 'swr'
 import useSWRInfinite from 'swr/infinite'
 
-import { authAtom } from 'store/auth'
 import { OperationSetApi } from 'utils/maa-copilot-client'
 import { useSWRRefresh } from 'utils/swr'
 
@@ -19,20 +17,18 @@ export type OrderBy = 'views' | 'hot' | 'id'
 
 export interface UseOperationSetsParams {
   keyword?: string
-  byMyself?: boolean
+  creatorId?: string
 
   disabled?: boolean
   suspense?: boolean
 }
 
 export function useOperationSets({
   keyword,
-  byMyself,
+  creatorId,
   disabled,
   suspense,
 }: UseOperationSetsParams) {
-  const { userId } = useAtomValue(authAtom)
-
   const {
     data: pages,
     error,
@@ -53,14 +49,13 @@ export function useOperationSets({
           limit: 50,
           page: pageIndex + 1,
           keyword,
-          creatorId: byMyself ? userId : undefined,
+          creatorId,
         } satisfies CopilotSetQuery,
-        byMyself,
       ]
     },
-    async ([, req, byMyself]) => {
+    async ([, req]) => {
       const res = await new OperationSetApi({
-        sendToken: byMyself ? 'always' : 'optional', // 如果有 token 会用来获取自己的作业集
+        sendToken: 'optional', // 如果有 token 即可获取到私有的作业集
         requireData: true,
       }).querySets({ copilotSetQuery: req })
       return res.data

src/apis/operation.ts

@@ -19,7 +19,7 @@ export interface UseOperationsParams {
   levelKeyword?: string
   operator?: string
   operationIds?: number[]
-  byMyself?: boolean
+  uploaderId?: string
 
   disabled?: boolean
   suspense?: boolean
@@ -34,7 +34,7 @@ export function useOperations({
   levelKeyword,
   operator,
   operationIds,
-  byMyself,
+  uploaderId,
   disabled,
   suspense,
   revalidateFirstPage,
@@ -84,7 +84,7 @@ export function useOperations({
           orderBy,
           desc: descending,
           copilotIds: operationIds,
-          uploaderId: byMyself ? 'me' : undefined,
+          uploaderId,
         } satisfies QueriesCopilotRequest,
       ]
     },
@@ -96,8 +96,7 @@ export function useOperations({
       }
 
       const res = await new OperationApi({
-        sendToken:
-          'uploaderId' in req && req.uploaderId === 'me' ? 'always' : 'never',
+        sendToken: 'optional',
         requireData: true,
       }).queriesCopilot(req)
 

src/components/Operations.tsx

@@ -65,11 +65,11 @@ export const Operations: ComponentType = withSuspensable(() => {
           className=""
           icon="user"
           title="只显示我发布的作品"
-          active={queryParams.byMyself}
+          active={!!queryParams.uploaderId}
           onClick={() => {
             setQueryParams((old) => ({
               ...old,
-              byMyself: !old.byMyself,
+              uploaderId: old.uploaderId ? undefined : authState.userId,
             }))
           }}
         >
@@ -209,7 +209,12 @@ export const Operations: ComponentType = withSuspensable(() => {
             revalidateFirstPage={queryParams.orderBy !== 'hot'}
           />
         )}
-        {listMode === 'operationSet' && <OperationSetList {...queryParams} />}
+        {listMode === 'operationSet' && (
+          <OperationSetList
+            {...queryParams}
+            creatorId={queryParams.uploaderId}
+          />
+        )}
       </div>
     </>
   )

src/components/operation-set/AddToOperationSet.tsx

@@ -14,13 +14,16 @@ import {
   useOperationSets,
 } from 'apis/operation-set'
 import clsx from 'clsx'
+import { useAtomValue } from 'jotai'
 import { useState } from 'react'
 
 import { AppToaster } from 'components/Toaster'
 import { OperationSetEditorDialog } from 'components/operation-set/OperationSetEditor'
 import { formatError } from 'utils/error'
 import { useNetworkState } from 'utils/useNetworkState'
 
+import { authAtom } from '../../store/auth'
+
 interface AddToOperationSetButtonProps extends ButtonProps {
   operationId: number
 }
@@ -60,14 +63,17 @@ export function AddToOperationSet({
   operationId,
   onSuccess,
 }: AddToOperationSetProps) {
+  const auth = useAtomValue(authAtom)
+
   const {
     operationSets,
     isReachingEnd,
     isValidating,
     setSize,
     error: listError,
   } = useOperationSets({
-    byMyself: true,
+    disabled: !auth.userId,
+    creatorId: auth.userId,
   })
 
   const {
@@ -82,7 +88,8 @@ export function AddToOperationSet({
     {} as Record<number, boolean>,
   )
 
-  const error = submitError || listError
+  const error =
+    submitError || listError || (!auth.userId ? '未登录' : undefined)
 
   const operationSetList = onlyShowAdded
     ? operationSets?.filter(