Merge pull request #272 from MaaAssistantArknights/dev

Release

Author: martinwang2002

.eslintignore

@@ -1 +1,2 @@
 .eslintrc.js
+do not edit these files

.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
     'plugin:import/recommended',
     'plugin:import/typescript',
     'plugin:react/jsx-runtime',
+    "plugin:react-hooks/recommended"
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
@@ -35,6 +36,7 @@ module.exports = {
     'react/self-closing-comp': 'error',
     'no-unused-vars': 'off',
     eqeqeq: 'error',
+    "react-hooks/exhaustive-deps": "error",
   },
   settings: {
     react: {

.prettierignore

@@ -1,2 +1,3 @@
 build
 coverage
+do not edit these files

CHANGELOG.md

@@ -0,0 +1,8 @@
+## 2024-04-01
+
+- 添加了作业集功能
+- 添加了更新日志功能
+- 添加了对浏览器“返回”和“前进”按钮的支持
+- 调整了快捷干员选择器中的文字提示样式，让其能适应夜间模式
+- 修复了无法搜索神秘代码的问题
+- 修复了无法在编辑器中导入神秘代码的问题

package.json

@@ -44,7 +44,7 @@
     "linkify-react": "^3.0.4",
     "linkifyjs": "^3.0.5",
     "lodash-es": "^4.17.21",
-    "maa-copilot-client": "https://github.com/MaaAssistantArknights/maa-copilot-client-ts.git#0.1.0-SNAPSHOT.726.3d19287",
+    "maa-copilot-client": "https://github.com/MaaAssistantArknights/maa-copilot-client-ts.git#0.1.0-SNAPSHOT.758.dbc2eb1",
     "normalize.css": "^8.0.1",
     "prettier": "^3.2.5",
     "react": "^18.0.0",

src/apis/operation-set.ts

@@ -0,0 +1,165 @@
+import { useAtomValue } from 'jotai'
+import {
+  CopilotSetPageRes,
+  CopilotSetQuery,
+  CopilotSetStatus,
+} from 'maa-copilot-client'
+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'
+
+export type OrderBy = 'views' | 'hot' | 'id'
+
+export interface UseOperationSetsParams {
+  keyword?: string
+  byMyself?: boolean
+
+  disabled?: boolean
+  suspense?: boolean
+}
+
+export function useOperationSets({
+  keyword,
+  byMyself,
+  disabled,
+  suspense,
+}: UseOperationSetsParams) {
+  const { userId } = useAtomValue(authAtom)
+
+  const {
+    data: pages,
+    error,
+    setSize,
+    isValidating,
+  } = useSWRInfinite(
+    (pageIndex, previousPage: CopilotSetPageRes) => {
+      if (disabled) {
+        return null
+      }
+      if (previousPage && !previousPage.hasNext) {
+        return null // reached the end
+      }
+
+      return [
+        'operationSets',
+        {
+          limit: 50,
+          page: pageIndex + 1,
+          keyword,
+          creatorId: byMyself ? userId : undefined,
+        } satisfies CopilotSetQuery,
+        byMyself,
+      ]
+    },
+    async ([, req, byMyself]) => {
+      const res = await new OperationSetApi({
+        sendToken: byMyself ? 'always' : 'optional', // 如果有 token 会用来获取自己的作业集
+        requireData: true,
+      }).querySets({ copilotSetQuery: req })
+      return res.data
+    },
+    {
+      suspense,
+      focusThrottleInterval: 1000 * 60 * 30,
+    },
+  )
+
+  const isReachingEnd = !!pages?.some((page) => !page.hasNext)
+  const operationSets = pages?.map((page) => page.data).flat()
+
+  return {
+    operationSets,
+    error,
+    setSize,
+    isValidating,
+    isReachingEnd,
+  }
+}
+
+export function useRefreshOperationSets() {
+  const refresh = useSWRRefresh()
+  return () => refresh((key) => key.includes('operationSets'))
+}
+
+interface UseOperationSetParams {
+  id?: number
+  suspense?: boolean
+}
+
+export function useOperationSet({ id, suspense }: UseOperationSetParams) {
+  return useSWR(
+    id ? ['operationSet', id] : null,
+    () => getOperationSet({ id: id! }),
+    { suspense },
+  )
+}
+
+export function useRefreshOperationSet() {
+  const refresh = useSWRRefresh()
+  return (id: number) =>
+    refresh((key) => key.includes('operationSet') && key.includes(String(id)))
+}
+
+export async function getOperationSet(req: { id: number }) {
+  const res = await new OperationSetApi({
+    sendToken: 'optional', // 如果有 token 会用来获取用户是否点赞
+    requireData: true,
+  }).getSet(req)
+  return res.data
+}
+
+export async function createOperationSet(req: {
+  name: string
+  description: string
+  operationIds: number[]
+  status: CopilotSetStatus
+}) {
+  await new OperationSetApi().createSet({
+    copilotSetCreateReq: {
+      name: req.name,
+      description: req.description,
+      copilotIds: req.operationIds,
+      status: req.status,
+    },
+  })
+}
+
+export async function updateOperationSet(req: {
+  id: number
+  name: string
+  description: string
+  status: CopilotSetStatus
+}) {
+  await new OperationSetApi().updateCopilotSet({ copilotSetUpdateReq: req })
+}
+
+export async function deleteOperationSet(req: { id: number }) {
+  await new OperationSetApi().deleteCopilotSet({ commonIdReqLong: req })
+}
+
+export async function addToOperationSet(req: {
+  operationSetId: number
+  operationIds: number[]
+}) {
+  await new OperationSetApi().addCopilotIds({
+    copilotSetModCopilotsReq: {
+      id: req.operationSetId,
+      copilotIds: req.operationIds,
+    },
+  })
+}
+
+export async function removeFromOperationSet(req: {
+  operationSetId: number
+  operationIds: number[]
+}) {
+  await new OperationSetApi().removeCopilotIds({
+    copilotSetModCopilotsReq: {
+      id: req.operationSetId,
+      copilotIds: req.operationIds,
+    },
+  })
+}

src/apis/operation.ts

@@ -1,18 +1,22 @@
-import { CopilotPageInfo, QueriesCopilotRequest } from 'maa-copilot-client'
+import { QueriesCopilotRequest } from 'maa-copilot-client'
 import useSWR from 'swr'
 import useSWRInfinite from 'swr/infinite'
 
-import { OpRatingType } from 'models/operation'
+import { toCopilotOperation } from 'models/converter'
+import { OpRatingType, Operation } from 'models/operation'
+import { parseShortCode } from 'models/shortCode'
 import { OperationApi } from 'utils/maa-copilot-client'
+import { useSWRRefresh } from 'utils/swr'
 
 export type OrderBy = 'views' | 'hot' | 'id'
 
 export interface UseOperationsParams {
-  orderBy: OrderBy
+  orderBy?: OrderBy
   descending?: boolean
   keyword?: string
   levelKeyword?: string
   operator?: string
+  operationIds?: number[]
   byMyself?: boolean
 
   disabled?: boolean
@@ -25,23 +29,39 @@ export function useOperations({
   keyword,
   levelKeyword,
   operator,
+  operationIds,
   byMyself,
   disabled,
   suspense,
 }: UseOperationsParams) {
   const {
+    error,
     data: pages,
     setSize,
     isValidating,
   } = useSWRInfinite(
-    (pageIndex, previousPage: CopilotPageInfo) => {
+    (pageIndex, previousPage: { hasNext: boolean }) => {
       if (disabled) {
         return null
       }
       if (previousPage && !previousPage.hasNext) {
         return null // reached the end
       }
 
+      // 用户输入 maa://xxxxxx 时，只传这个 id，其他参数都不传
+      if (keyword) {
+        const id = parseShortCode(keyword)
+
+        if (id) {
+          return [
+            'operations',
+            {
+              copilotIds: [id],
+            } satisfies QueriesCopilotRequest,
+          ]
+        }
+      }
+
       return [
         'operations',
         {
@@ -52,16 +72,33 @@ export function useOperations({
           operator,
           orderBy,
           desc: descending,
+          copilotIds: operationIds,
           uploaderId: byMyself ? 'me' : undefined,
         } satisfies QueriesCopilotRequest,
       ]
     },
     async ([, req]) => {
+      // 如果指定了 id 列表，但是列表为空，就直接返回空数据。不然要是直接传空列表，就相当于没有这个参数，
+      // 会导致后端返回所有数据
+      if (req.copilotIds?.length === 0) {
+        return { data: [], hasNext: false }
+      }
+
       const res = await new OperationApi({
-        sendToken: req.uploaderId === 'me' ? 'always' : 'never',
+        sendToken:
+          'uploaderId' in req && req.uploaderId === 'me' ? 'always' : 'never',
         requireData: true,
       }).queriesCopilot(req)
-      return res.data
+
+      const parsedOperations: Operation[] = res.data.data.map((operation) => ({
+        ...operation,
+        parsedContent: toCopilotOperation(operation),
+      }))
+
+      return {
+        ...res.data,
+        data: parsedOperations,
+      }
     },
     {
       suspense,
@@ -74,13 +111,19 @@ export function useOperations({
   const operations = pages?.map((page) => page.data).flat()
 
   return {
+    error,
     operations,
     setSize,
     isValidating,
     isReachingEnd,
   }
 }
 
+export function useRefreshOperations() {
+  const refresh = useSWRRefresh()
+  return () => refresh((key) => key.includes('operations'))
+}
+
 interface UseOperationParams {
   id?: number
   suspense?: boolean
@@ -94,12 +137,22 @@ export function useOperation({ id, suspense }: UseOperationParams) {
   )
 }
 
-export async function getOperation(req: { id: number }) {
+export function useRefreshOperation() {
+  const refresh = useSWRRefresh()
+  return (id: number) =>
+    refresh((key) => key.includes('operation') && key.includes(String(id)))
+}
+
+export async function getOperation(req: { id: number }): Promise<Operation> {
   const res = await new OperationApi({
     sendToken: 'optional', // 如果有 token 会用来获取用户是否点赞
     requireData: true,
   }).getCopilotById(req)
-  return res.data
+
+  return {
+    ...res.data,
+    parsedContent: toCopilotOperation(res.data),
+  }
 }
 
 export async function createOperation(req: { content: string }) {