Merge pull request #393 from MaaAssistantArknights/dev

Release to Production

Author: guansss

.env.development

@@ -2,4 +2,4 @@
 PORT=3000
 
 # 如果需要使用生产环境的API，请把下面一行注释掉，或者在.env.development.local中覆盖
-VITE_API=https://maa-docker.kkdy.tech
+VITE_API=https://maa-backend-dev.theresa.wiki

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 2025-04-04
+
+- 优化了首页列表的性能 [@Aliothmoon](https://github.com/Aliothmoon)
+- 添加了私有作业功能 [@guansss](https://github.com/guansss) [@dragove](https://github.com/dragove)
+- 添加了关闭评论区功能 [@guansss](https://github.com/guansss) [@dragove](https://github.com/dragove)
+- 添加了按用户筛选功能 [@guansss](https://github.com/guansss) [@Pleasurecruise](https://github.com/Pleasurecruise) [@dragove](https://github.com/dragove)
+- 重新设计了主页的搜索面板 [@guansss](https://github.com/guansss)
+- 搜索功能的全文索引优化 [@Aliothmoon](https://github.com/Aliothmoon) [@Handiwork](https://github.com/Handiwork)
+- 修复了按干员筛选时和异格冲突的问题 [@LuoRenMu](https://github.com/LuoRenMu)
+- 优化了敏感词检测 [@dragove](https://github.com/dragove) [@Daydreamer114](https://github.com/Daydreamer114)
+
+从现在起，后端的更新和贡献者也会一并列出 (～￣▽￣)～
+
+## 2025-03-15
+
+- 优化了暗色模式界面显示 [@zhangchi0104](https://github.com/zhangchi0104)
+
 ## 2025-03-01
 
 - 优化了移动端界面 [@guansss](https://github.com/guansss)

README.md

@@ -2,9 +2,14 @@
 
 MAA 作业站前端！
 
-## 开发流程
+## 文档
+
+- ~~后端接口文档~~ (暂无，请参考 [maa-copilot-client](https://github.com/MaaAssistantArknights/maa-copilot-client-ts) 的 TS 类型，或者从后端 [Actions](https://github.com/MaaAssistantArknights/MaaBackendCenter/actions/workflows/openapi.yml) 的 Artifacts 里下载最新的 OpenAPI 文档)
+- 作业格式：[MAA 战斗流程协议](https://maa.plus/docs/zh-cn/protocol/copilot-schema.html)
 
-后端接口文档：https://maa-docker.kkdy.tech/swagger-ui/index.html
+更新 maa-copilot-client 时，需要在 [Tags](https://github.com/MaaAssistantArknights/maa-copilot-client-ts/tags) 中复制版本号，然后替换掉 `package.json` 中的 `maa-copilot-client` 版本号，再运行 `yarn` 安装依赖
+
+## 开发流程
 
 该仓库的主分支为 `dev`，线上分支为 `main`，代码合并到 `main` 后将会自动部署到线上
 

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.784.58f96e5",
+    "maa-copilot-client": "https://github.com/MaaAssistantArknights/maa-copilot-client-ts.git#0.1.0-SNAPSHOT.824.f8ad839",
     "normalize.css": "^8.0.1",
     "prettier": "^3.2.5",
     "react": "^18.0.0",

src/apis/operation.ts

@@ -1,5 +1,9 @@
 import { uniqBy } from 'lodash-es'
-import { QueriesCopilotRequest } from 'maa-copilot-client'
+import {
+  BanCommentsStatusEnum,
+  CopilotInfoStatusEnum,
+  QueriesCopilotRequest,
+} from 'maa-copilot-client'
 import useSWR from 'swr'
 import useSWRInfinite from 'swr/infinite'
 
@@ -11,13 +15,18 @@ import { useSWRRefresh } from 'utils/swr'
 
 export type OrderBy = 'views' | 'hot' | 'id'
 
+export interface OperatorFilterParams {
+  included: string[]
+  excluded: string[]
+}
+
 export interface UseOperationsParams {
   limit?: number
   orderBy?: OrderBy
   descending?: boolean
   keyword?: string
   levelKeyword?: string
-  operator?: string
+  operator?: OperatorFilterParams
   operationIds?: number[]
   uploaderId?: string
 
@@ -80,7 +89,12 @@ export function useOperations({
           page: pageIndex + 1,
           document: keyword,
           levelKeyword,
-          operator,
+          operator: operator
+            ? [
+                ...operator.included,
+                ...operator.excluded.map((o) => `~${o}`),
+              ].join(',') || undefined
+            : undefined,
           orderBy,
           desc: descending,
           copilotIds: operationIds,
@@ -178,16 +192,29 @@ export async function getOperation(req: { id: number }): Promise<Operation> {
   }
 }
 
-export async function createOperation(req: { content: string }) {
+export async function createOperation(req: {
+  content: string
+  status: CopilotInfoStatusEnum
+}) {
   await new OperationApi().uploadCopilot({ copilotCUDRequest: req })
 }
 
-export async function updateOperation(req: { id: number; content: string }) {
+export async function updateOperation(req: {
+  id: number
+  content: string
+  status: CopilotInfoStatusEnum
+}) {
   await new OperationApi().updateCopilot({ copilotCUDRequest: req })
 }
 
 export async function deleteOperation(req: { id: number }) {
-  await new OperationApi().deleteCopilot({ copilotCUDRequest: req })
+  await new OperationApi().deleteCopilot({
+    copilotCUDRequest: {
+      content: '',
+      status: CopilotInfoStatusEnum.Public,
+      ...req,
+    },
+  })
 }
 
 export async function rateOperation(req: { id: number; rating: OpRatingType }) {
@@ -204,3 +231,13 @@ export async function rateOperation(req: { id: number; rating: OpRatingType }) {
     },
   })
 }
+
+export async function banComments(req: {
+  operationId: number
+  status: BanCommentsStatusEnum
+}) {
+  await new OperationApi().banComments({
+    copilotId: req.operationId,
+    ...req,
+  })
+}

src/apis/user.ts

@@ -1,6 +1,5 @@
 import useSWR from 'swr'
 
-import { NotFoundError } from '../utils/error'
 import { UserApi } from '../utils/maa-copilot-client'
 
 export function useUserInfo({
@@ -20,13 +19,27 @@ export function useUserInfo({
         userId,
       })
 
-      // FIXME: 严谨一点！！！
-      if (res.data.userName === '未知用户:(') {
-        throw new NotFoundError()
-      }
-
       return res.data
     },
     { suspense },
   )
 }
+
+export function useUserSearch({ keyword }: { keyword?: string }) {
+  return useSWR(
+    keyword ? ['userSearch', keyword] : null,
+    async ([, keyword]) => {
+      const res = await new UserApi({
+        sendToken: 'never',
+        requireData: true,
+      }).searchUsers({
+        userName: keyword,
+      })
+      return res.data
+    },
+    {
+      revalidateOnFocus: false,
+      keepPreviousData: true,
+    },
+  )
+}

src/components/Confirm.tsx

@@ -0,0 +1,73 @@
+import { Alert, AlertProps } from '@blueprintjs/core'
+
+import { useEffect, useState } from 'react'
+
+import { FCC } from '../types'
+
+interface ConfirmProps extends Omit<AlertProps, 'isOpen' | 'onConfirm'> {
+  repeats?: number
+  trigger: (params: { handleClick: () => void }) => React.ReactNode
+  onConfirm?: () => void | Promise<void>
+}
+
+export const Confirm: FCC<ConfirmProps> = ({
+  repeats = 0,
+  confirmButtonText = '确定',
+  intent = 'primary',
+  trigger,
+  onConfirm,
+  ...props
+}) => {
+  const [isOpen, setIsOpen] = useState(false)
+  const [confirming, setConfirming] = useState(false)
+  const [remainingRepeats, setRemainingRepeats] = useState(repeats)
+
+  useEffect(() => {
+    if (isOpen) {
+      setRemainingRepeats(repeats)
+    }
+  }, [isOpen, repeats])
+
+  const handleConfirm = async () => {
+    if (confirming) return
+    if (remainingRepeats > 1) {
+      setRemainingRepeats((prev) => prev - 1)
+      return
+    }
+
+    setConfirming(true)
+    try {
+      await onConfirm?.()
+    } catch (e) {
+      console.error(e)
+    }
+    setConfirming(false)
+    setIsOpen(false)
+  }
+
+  return (
+    <>
+      {trigger({ handleClick: () => setIsOpen(true) })}
+      <Alert
+        cancelButtonText="取消"
+        icon={
+          intent === 'danger' || intent === 'warning' ? 'error' : 'info-sign'
+        }
+        {...props}
+        isOpen={isOpen}
+        loading={confirming}
+        intent={intent}
+        confirmButtonText={
+          repeats
+            ? `${confirmButtonText} (${remainingRepeats})`
+            : confirmButtonText
+        }
+        onCancel={() => {
+          if (confirming) return
+          setIsOpen(false)
+        }}
+        onConfirm={handleConfirm}
+      />
+    </>
+  )
+}