poi-plugin-quest-info-2 0.6.3 → 0.6.7

package/scripts/genQuestCategory.ts

@@ -5,7 +5,7 @@ import { KcwikiQuestData } from '../build/kcQuestsData'
 
 const OUTPUT_PATH = path.resolve('build', 'questCategory.json')
 
-const questStartsFilter = (str: string) =>
+const kcaQuestStartsFilter = (str: string) =>
   Object.entries(QuestData['zh-CN'])
     .filter(([, quest]) => quest.name.startsWith(str))
     .map(([gameId]) => gameId)
@@ -15,20 +15,20 @@ const mergeDataSelector = () =>
   Object.entries({ ...QuestData['zh-CN'], ...KcwikiQuestData['zh-CN'] })
 
 const main = () => {
-  const dailyQuest = questStartsFilter('(日任)')
-  const weeklyQuest = questStartsFilter('(周任)')
-  const monthlyQuest = questStartsFilter('(月任)')
+  const dailyQuest = kcaQuestStartsFilter('(日任)')
+  const weeklyQuest = kcaQuestStartsFilter('(周任)')
+  const monthlyQuest = kcaQuestStartsFilter('(月任)')
   const quarterlyQuest = [
     ...new Set([
-      ...questStartsFilter('(季任)'),
+      ...kcaQuestStartsFilter('(季任)'),
       ...kcwikiDataSelector()
-        .filter(([, quest]) => quest.desc.includes('季常任务'))
+        .filter(([, quest]) => quest.memo2.includes('季常任务'))
         .map(([gameId]) => gameId),
     ]),
   ].sort((a, b) => +a - +b)
   // (年任) (年任 / x 月)
   const yearlyQuest = kcwikiDataSelector()
-    .filter(([, quest]) => quest.desc.includes('❀备注：年常任务'))
+    .filter(([, quest]) => quest.memo2.includes('年常任务'))
     .map(([gameId]) => gameId)
   const singleQuest = mergeDataSelector()
     .filter(

package/src/Toolbar.tsx

@@ -119,20 +119,21 @@ const Tags = () => {
         ))}
       </TagsWrapper>
       <TagsWrapper>
-        {TYPE_TAGS.map(({ name }) => (
+        {TYPE_TAGS.map((tag) => (
           <Tag
-            onClick={() => setTypeTags(name)}
+            onClick={() => setTypeTags(tag.name)}
             intent={
-              typeTags[name]
-                ? name === ALL_TYPE_TAG.name
+              typeTags[tag.name]
+                ? tag.name === ALL_TYPE_TAG.name
                   ? 'success'
                   : 'primary'
                 : 'none'
             }
             interactive={true}
-            key={name}
+            key={tag.name}
           >
-            {t(name)}
+            {t(tag.name)}
+            {'suffix' in tag && ' ' + tag.suffix}
           </Tag>
         ))}
       </TagsWrapper>
@@ -159,17 +160,19 @@ const useToolbarFilter = () => {
 
   const throttledSearchInput = useThrottle(searchInput)
   const searchKeywords = throttledSearchInput
-    ?.split(' ')
+    .split(' ')
+    // Remove empty string
+    .filter((i) => !!i)
     .map((i) => i.toUpperCase())
 
   const stringFilter = useCallback(
     (quest: UnionQuest) => {
+      if (!searchKeywords || !searchKeywords.length) {
+        return true
+      }
       const text = `${quest.docQuest.code} ${quest.docQuest.name} ${
         quest.docQuest.desc
       } ${quest.docQuest.memo ?? ''}`
-      if (!searchKeywords) {
-        return true
-      }
       return searchKeywords.some((keyword) =>
         text.toUpperCase().includes(keyword)
       )

package/src/__tests__/kcanotifyData.spec.ts

@@ -1,7 +1,7 @@
 import { version, QuestData } from '../../build/kcanotifyGamedata'
 
 test('should Kcanotify Game data version correct', () => {
-  expect(version).toMatchInlineSnapshot(`"2022020101"`)
+  expect(version).toMatchInlineSnapshot(`"2022040401"`)
 })
 
 test('should Kcanotify Game data keys correct', () => {

package/src/__tests__/kcwikiData.spec.ts

@@ -3,16 +3,16 @@ import { version, KcwikiQuestData } from '../../build/kcQuestsData'
 describe('should version correct', () => {
   test('should KcwikiQuestData Game data version correct', () => {
     expect(version).toMatchInlineSnapshot(
-      `"9c5a15512d59eaad02e09fe717defba581c4e4a3"`
+      `"98f428c28296c17f81d27e2717be6c6ac50f2c36"`
     )
   })
 
   test('should KcwikiQuestData Game data keys correct', () => {
     expect(Object.keys(KcwikiQuestData)).toMatchInlineSnapshot(`
-    Array [
-      "zh-CN",
-    ]
-  `)
+          Array [
+            "zh-CN",
+          ]
+      `)
   })
 })
 

package/src/__tests__/questCategory.spec.ts

@@ -9,7 +9,7 @@ describe('should questCategory correct', () => {
     expect(questCategory.monthlyQuest.length).toMatchInlineSnapshot(`11`)
     expect(questCategory.quarterlyQuest.length).toMatchInlineSnapshot(`25`)
     expect(questCategory.yearlyQuest.length).toMatchInlineSnapshot(`37`)
-    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`473`)
+    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`475`)
   })
 
   test('snapshot', () => {

package/src/components/QuestCard/MinimalQuestCard.tsx

@@ -9,7 +9,7 @@ export const MinimalQuestCard: React.FC<QuestCardProps> = ({
   code,
   name,
   desc,
-  tips,
+  tip,
   status = QUEST_STATUS.DEFAULT,
   onClick,
   style,
@@ -24,7 +24,7 @@ export const MinimalQuestCard: React.FC<QuestCardProps> = ({
         <>
           {desc}
           <br />
-          {tips}
+          {tip}
         </>
       }
     >

package/src/components/QuestCard/index.tsx

@@ -11,7 +11,8 @@ export type QuestCardProps = {
   code: string
   name: string
   desc: string | JSX.Element
-  tips?: string
+  tip?: string
+  tip2?: string
   status?: QUEST_STATUS
   preTask?: string[]
   onClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void
@@ -27,7 +28,8 @@ export const LargeQuestCard = ({
   code,
   name,
   desc,
-  tips,
+  tip,
+  tip2,
   preTask,
   status = QUEST_STATUS.DEFAULT,
   onClick,
@@ -48,9 +50,10 @@ export const LargeQuestCard = ({
       <CardBody>
         <H5>{[code, name].filter((i) => i != undefined).join(' - ')}</H5>
         <Text>{desc}</Text>
-        {tips && <Text tagName="i">{tips}</Text>}
+        {tip2 && <b>{tip2}</b>}
+        {tip && <i>{tip}</i>}
         <PreTaskTagWrapper>
-          {!!preTask?.length && <Text tagName="span">{t('Requires')}</Text>}
+          {!!preTask?.length && <span>{t('Requires')}</span>}
           {preTask?.map((i) => (
             <PreTaskTag key={i} code={i}></PreTaskTag>
           ))}

package/src/components/QuestList.tsx

@@ -47,7 +47,7 @@ const useQuestsRowRenderer = (quests: UnionQuest[]) => {
     ({ key, index, style, parent }: ListRowProps) => {
       const quest = quests[index]
       const { gameId } = quest
-      const { code, name, desc, memo, pre } = quest.docQuest
+      const { code, name, desc, memo, memo2, pre } = quest.docQuest
       const questStatus = questStateToQuestStatus(quest.gameQuest?.api_state)
 
       return (
@@ -65,7 +65,8 @@ const useQuestsRowRenderer = (quests: UnionQuest[]) => {
               code={code}
               name={name}
               desc={desc}
-              tips={memo}
+              tip={memo}
+              tip2={memo2}
               preTask={pre}
               status={questStatus}
             ></QuestCard>

package/src/patch.ts

@@ -40,13 +40,15 @@ const getQuestState = (maybeLanguage: string) => {
       ? KcwikiQuestData[maybeLanguage]
       : QuestData[maybeLanguage]
 
-  return Object.entries(data).reduce((acc, [apiNo, { code, desc }]) => {
-    acc[apiNo] = {
-      wiki_id: code,
-      condition: desc,
-    }
-    return acc
-  }, {} as Record<string, { wiki_id: string; condition: string }>)
+  return Object.fromEntries(
+    Object.entries(data).map(([apiNo, data]) => [
+      apiNo,
+      {
+        wiki_id: data.code,
+        condition: [(data as any).memo2, data.desc].filter(Boolean).join(' | '),
+      },
+    ])
+  )
 }
 
 /**

package/src/questHelper.ts

@@ -6,7 +6,14 @@ type DocQuest = {
   code: string
   name: string
   desc: string
+  /**
+   * Quest rewards
+   */
   memo?: string
+  /**
+   * Quest details, only in KcWiki
+   */
+  memo2?: string
   /**
    * Only in kcanotify
    */
@@ -38,6 +45,7 @@ const newQuest = new Set(newQuestData)
 export const isInProgressQuest = (quest: UnionQuest) =>
   quest.gameQuest?.api_state === QUEST_API_STATE.IN_PROGRESS ||
   quest.gameQuest?.api_state === QUEST_API_STATE.COMPLETED
+
 export const isDailyQuest = (quest: UnionQuest) => dailyQuest.has(quest.gameId)
 export const isWeeklyQuest = (quest: UnionQuest) =>
   weeklyQuest.has(quest.gameId)
@@ -52,6 +60,7 @@ export const isSingleQuest = (quest: UnionQuest) =>
 
 export const hasNewQuest = newQuestData.length > 0
 export const isNewQuest = (quest: UnionQuest) => newQuest.has(quest.gameId)
+export const newQuestNumber = newQuestData.length
 
 export enum QUEST_CATEGORY {
   Composition = '1',

package/src/tags.ts

@@ -17,6 +17,7 @@ import {
   isSingleQuest,
   hasNewQuest,
   isNewQuest,
+  newQuestNumber,
 } from './questHelper'
 import type { UnionQuest } from './questHelper'
 
@@ -49,7 +50,9 @@ export const CATEGORY_TAGS = [
 export const TYPE_TAGS = [
   ALL_TYPE_TAG,
   ...(IN_POI ? [{ name: 'In Progress', filter: isInProgressQuest }] : []),
-  ...(hasNewQuest ? [{ name: 'New', filter: isNewQuest }] : []),
+  ...(hasNewQuest
+    ? [{ name: 'New', filter: isNewQuest, suffix: newQuestNumber }]
+    : []),
   { name: 'Daily', filter: isDailyQuest },
   { name: 'Weekly', filter: isWeeklyQuest },
   { name: 'Monthly', filter: isMonthlyQuest },