Merge pull request #132 from MaaAssistantArknights/dev

Author: guansss

src/apis/arknights.ts

@@ -31,6 +31,7 @@ export const useLevels = ({ suspense }: { suspense?: boolean } = {}) => {
 
   const response = useSWR<LevelResponse>(url, {
     focusThrottleInterval: ONE_DAY,
+    dedupingInterval: ONE_DAY,
     suspense,
     fetcher: async (input: string, init?: RequestInit) => {
       let res: LevelResponse

src/apis/rating.ts

@@ -2,14 +2,18 @@ import { Response } from 'models/network'
 import { OpRatingType, Operation } from 'models/operation'
 import { jsonRequest } from 'utils/fetcher'
 
+const ratingTypeMapping: Record<OpRatingType, string> = {
+  0: 'None',
+  1: 'Like',
+  2: 'Dislike',
+}
+
 export const apiPostRating = (id: Operation['id'], rating: OpRatingType) => {
-  return jsonRequest<
-    Response<Pick<Operation, 'id' | 'ratingRatio' | 'ratingType'>>
-  >('/copilot/rating', {
+  return jsonRequest<Response<string>>('/copilot/rating', {
     method: 'POST',
     json: {
       id,
-      rating,
+      rating: ratingTypeMapping[rating],
     },
   })
 }

src/components/editor/OperationEditor.tsx

@@ -155,9 +155,6 @@ export const StageNameInput: FC<{
           selectedItem={selectedLevel}
           onItemSelect={selectLevel}
           inputValueRenderer={(item) => `${item.catThree} ${item.name}`}
-          popoverContentProps={{
-            className: 'max-h-64 overflow-auto',
-          }}
           noResults={<MenuItem disabled text="没有匹配的关卡" />}
           createNewItemFromQuery={(query) => createCustomLevel(query)}
           createNewItemRenderer={(query, active, handleClick) => (

src/components/editor/operator/EditorOperatorGroupSelect.tsx

@@ -57,9 +57,6 @@ export const EditorOperatorGroupSelect = ({
           selected={active}
         />
       )}
-      popoverContentProps={{
-        className: 'max-h-64 overflow-auto',
-      }}
       noResults={<MenuItem disabled text={`没有匹配的干员组`} />}
       inputProps={{
         placeholder: `干员组名`,

src/components/editor/source/SourceEditorHeader.tsx

@@ -37,9 +37,8 @@ export const SourceEditorHeader: FC<SourceEditorHeaderProps> = ({
     let title: string | undefined
     try {
       title = (JSON.parse(text) as CopilotDocV1.Operation).doc.title
-      title = title.slice(0, 20)
     } catch (e) {
-      // ignored
+      console.warn(e)
     }
 
     const blob = new Blob([text], {

src/components/viewer/OperationRating.tsx

@@ -4,8 +4,8 @@ import clsx from 'clsx'
 import { FC } from 'react'
 import Rating from 'react-rating'
 
-import { OpRatingLevelString } from 'models/enums'
 import { Operation } from 'models/operation'
+import { ratingLevelToString } from 'models/rating'
 
 export const OperationRating: FC<{
   operation: Pick<
@@ -67,7 +67,7 @@ export const OperationRating: FC<{
           ? layout === 'vertical'
             ? '还没有足够的评分'
             : '评分不足'
-          : OpRatingLevelString[operation.ratingLevel]}
+          : ratingLevelToString(operation.ratingLevel)}
       </div>
     </div>
   )

src/components/viewer/OperationViewer.tsx

@@ -18,7 +18,7 @@ import { requestDeleteOperation } from 'apis/copilotOperation'
 import { useOperation } from 'apis/query'
 import { apiPostRating } from 'apis/rating'
 import { useAtom } from 'jotai'
-import { merge } from 'lodash-es'
+import { noop } from 'lodash-es'
 import { ComponentType, FC, useMemo, useState } from 'react'
 import { Link } from 'react-router-dom'
 
@@ -118,7 +118,6 @@ export const OperationViewer: ComponentType<{
     const levels = useLevels()?.data?.data || []
 
     const [auth] = useAtom(authAtom)
-    const authed = !!auth.token
 
     // make eslint happy: we got Suspense out there
     if (!operation) return null
@@ -129,15 +128,12 @@ export const OperationViewer: ComponentType<{
       )
     }
 
-    const handleCopyShortCode = () => {
-      if (!operation?.id) {
-        AppToaster.show({
-          message: '获取作业失败',
-          intent: 'danger',
-        })
-        return
-      }
+    const operationDoc = useMemo(
+      () => toCopilotOperation(operation),
+      [operation],
+    )
 
+    const handleCopyShortCode = () => {
       const shortCode = toShortCode(operation.id)
       navigator.clipboard.writeText(shortCode)
 
@@ -148,22 +144,15 @@ export const OperationViewer: ComponentType<{
     }
 
     const handleDownloadJSON = () => {
-      const content = operation?.content
-      if (!content) {
-        AppToaster.show({
-          message: '获取作业失败',
-          intent: 'danger',
-        })
-        return
-      }
-
-      const blob = new Blob([content], {
+      // pretty print the JSON
+      const json = JSON.stringify(operationDoc, null, 2)
+      const blob = new Blob([json], {
         type: 'application/json',
       })
       const url = URL.createObjectURL(blob)
       const link = document.createElement('a')
       link.href = url
-      link.download = `MAACopilot_作业${operation.id}.json`
+      link.download = `MAACopilot_${operationDoc.doc.title}.json`
       link.click()
       URL.revokeObjectURL(url)
 
@@ -174,35 +163,20 @@ export const OperationViewer: ComponentType<{
     }
 
     const handleRating = async (decision: OpRatingType) => {
-      if (!authed) {
-        AppToaster.show({
-          message: '请先登录',
-          intent: 'warning',
-        })
-        return
+      // cancel rating if already rated by the same type
+      if (decision === operation.ratingType) {
+        decision = OpRatingType.None
       }
 
-      mutate(async (val) => {
-        try {
-          return await wrapErrorMessage(
-            (e: NetworkError) => `提交评分失败：${e.message}`,
-            (async () => {
-              const response = await apiPostRating(operationId, decision)
-
-              return merge(val, response)
-            })(),
-          )
-        } catch (e) {
+      wrapErrorMessage(
+        (e: NetworkError) => `提交评分失败：${e.message}`,
+        mutate(async (val) => {
+          await apiPostRating(operationId, decision)
           return val
-        }
-      })
+        }),
+      ).catch(noop)
     }
 
-    const operationDoc = useMemo(
-      () => toCopilotOperation(operation),
-      [operation],
-    )
-
     return (
       <OperationDrawer
         title={
@@ -274,24 +248,24 @@ export const OperationViewer: ComponentType<{
                     <Button
                       icon="thumbs-up"
                       intent={
-                        operation?.ratingType === OpRatingType.Like
+                        operation.ratingType === OpRatingType.Like
                           ? 'success'
                           : 'none'
                       }
                       className="mr-2"
-                      active={operation?.ratingType === OpRatingType.Like}
+                      active={operation.ratingType === OpRatingType.Like}
                       onClick={() => handleRating(OpRatingType.Like)}
                     />
                   </Tooltip2>
                   <Tooltip2 content=" ヽ(。>д<)ｐ" placement="bottom">
                     <Button
                       icon="thumbs-down"
                       intent={
-                        operation?.ratingType === OpRatingType.Dislike
+                        operation.ratingType === OpRatingType.Dislike
                           ? 'danger'
                           : 'none'
                       }
-                      active={operation?.ratingType === OpRatingType.Dislike}
+                      active={operation.ratingType === OpRatingType.Dislike}
                       onClick={() => handleRating(OpRatingType.Dislike)}
                     />
                   </Tooltip2>

src/components/viewer/ViewerActions.tsx

@@ -9,6 +9,10 @@ import { FactItem } from 'components/FactItem'
 import type { CopilotDocV1 } from 'models/copilot.schema'
 import { findActionType } from 'models/types'
 
+import {
+  findOperatorDirection,
+  findOperatorSkillUsage,
+} from '../../models/operator'
 import { formatDuration } from '../../utils/times'
 
 const actionKey = (action: CopilotDocV1.Action, index?: number) =>
@@ -67,7 +71,7 @@ export const ViewerActions: FC<{
                         title="切换技能用法至"
                         icon="swap-horizontal"
                       >
-                        {action.skillUsage}
+                        {findOperatorSkillUsage(action.skillUsage).title}
                       </FactItem>
                     )}
 
@@ -82,7 +86,9 @@ export const ViewerActions: FC<{
 
                     {'direction' in action && (
                       <FactItem dense title="朝向" icon="compass">
-                        <span className="font-mono">{action.direction}</span>
+                        <span className="font-mono">
+                          {findOperatorDirection(action.direction).title}
+                        </span>
                       </FactItem>
                     )}
                   </div>

src/models/enums.ts

@@ -13,7 +13,7 @@ export interface Operation {
   views: number
   hotScore: number
   available: boolean
-  ratingLevel: OpRatingLevel
+  ratingLevel: number // integer in [0, 10]
   ratingRatio: number
   ratingType: OpRatingType
   isNotEnoughRating: boolean
@@ -31,22 +31,10 @@ export interface Level {
   height: number
 }
 
-export enum OpRatingLevel {
-  OverwhelminglyPositive = 'OverwhelminglyPositive',
-  VeryPositive = 'VeryPositive',
-  Positive = 'Positive',
-  MostlyPositive = 'MostlyPositive',
-  Mixed = 'Mixed',
-  MostlyNegative = 'MostlyNegative',
-  Negative = 'Negative',
-  VeryNegative = 'VeryNegative',
-  OverwhelminglyNegative = 'OverwhelminglyNegative',
-}
-
 export enum OpRatingType {
-  Like = 'Like',
-  Dislike = 'Dislike',
-  None = 'None',
+  None = 0,
+  Like = 1,
+  Dislike = 2,
 }
 
 export enum OpDifficulty {