poi-plugin-quest-info-2 0.12.3 → 0.12.5

package/build/questCodeMap.json

@@ -94,6 +94,7 @@
   "A90": 195,
   "A91": 196,
   "A93": 197,
+  "A94": 198,
   "Bd1": 201,
   "B1": 202,
   "B2": 203,
@@ -216,6 +217,7 @@
   "Cs5": 326,
   "C25": 327,
   "C27": 328,
+  "2401C1": 329,
   "Cq1": 330,
   "C31": 331,
   "C32": 332,
@@ -285,6 +287,7 @@
   "Dy4": 438,
   "Dy5": 439,
   "Dy6": 440,
+  "2401D1": 441,
   "Dy7": 442,
   "D39": 443,
   "Dy8": 444,
@@ -435,7 +438,10 @@
   "B86": 837,
   "B87": 838,
   "B88": 839,
+  "2401B5": 840,
+  "2401B6": 841,
   "B89": 842,
+  "2401B7": 843,
   "B90": 844,
   "Bq12": 845,
   "B91": 846,
@@ -555,6 +561,9 @@
   "B191": 997,
   "B192": 998,
   "B194": 1001,
+  "B195": 1003,
+  "B196": 1004,
+  "By13": 1005,
   "F96": 1101,
   "F97": 1102,
   "Fy5": 1103,
@@ -581,5 +590,6 @@
   "F119": 1131,
   "F120": 1132,
   "F121": 1133,
-  "F122": 1134
+  "F122": 1134,
+  "2312F3": 1135
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",

package/src/App.tsx

@@ -1,11 +1,11 @@
-import styled from 'styled-components'
-import React, { StrictMode } from 'react'
 import { Text } from '@blueprintjs/core'
+import React, { StrictMode } from 'react'
+import styled from 'styled-components'
 
 import { Toolbar, useFilterQuest } from './Toolbar'
-import { StoreProvider } from './store'
-import { usePluginTranslation } from './poi/hooks'
 import { QuestList } from './components/QuestList'
+import { usePluginTranslation } from './poi/hooks'
+import { StoreProvider } from './store'
 
 const Container = styled.div`
   display: flex;

package/src/__tests__/__snapshots__/questCategory.spec.ts.snap

@@ -255,7 +255,7 @@ exports[`should questCategory correct snapshot 1`] = `
     {
       "code": "Bq1",
       "gameId": 822,
-      "name": "冲之岛海域迎击战！",
+      "name": "冲之岛海域迎击战",
     },
     {
       "code": "Bq12",
@@ -393,7 +393,7 @@ exports[`should questCategory correct snapshot 1`] = `
     {
       "code": "Fw2",
       "gameId": 638,
-      "name": "对空机枪量产！",
+      "name": "对空机枪量产",
     },
     {
       "code": "Gw1",
@@ -597,6 +597,11 @@ exports[`should questCategory correct snapshot 1`] = `
       "gameId": 975,
       "name": "精锐「第十九驱逐队」，全力出击！",
     },
+    {
+      "code": "By13",
+      "gameId": 1005,
+      "name": "精强 “第七驱逐队” 紧急出动！",
+    },
     {
       "code": "Fy5",
       "gameId": 1103,

package/src/__tests__/__snapshots__/questHelper.spec.ts.snap

@@ -3,6 +3,8 @@
 exports[`questHelper should 101 locked quests match snapshot 1`] = `
 {
   "1001": true,
+  "1003": true,
+  "1005": true,
   "102": true,
   "103": true,
   "104": true,
@@ -37,6 +39,7 @@ exports[`questHelper should 101 locked quests match snapshot 1`] = `
   "1132": true,
   "1133": true,
   "1134": true,
+  "1135": true,
   "114": true,
   "115": true,
   "116": true,
@@ -119,6 +122,7 @@ exports[`questHelper should 101 locked quests match snapshot 1`] = `
   "195": true,
   "196": true,
   "197": true,
+  "198": true,
   "215": true,
   "217": true,
   "219": true,

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(`"2023122801"`)
+  expect(version).toMatchInlineSnapshot(`"2024020301"`)
 })
 
 test('should Kcanotify Game data keys correct', () => {

package/src/__tests__/kcwikiData.spec.ts

@@ -4,7 +4,7 @@ import newQuestData from '../../build/kcQuestsData/quests-scn-new.json'
 describe('should version correct', () => {
   test('should KcwikiQuestData Game data version correct', () => {
     expect(version).toMatchInlineSnapshot(
-      `"0a92ed4afb302d984c4456fa2878ab64942f2cad"`,
+      `"7b0205e11577b3d69fc0a22608bf71a1218af1cd"`,
     )
   })
 

package/src/__tests__/questCategory.spec.ts

@@ -8,8 +8,8 @@ describe('should questCategory correct', () => {
     expect(questCategory.weeklyQuest.length).toMatchInlineSnapshot(`17`)
     expect(questCategory.monthlyQuest.length).toMatchInlineSnapshot(`11`)
     expect(questCategory.quarterlyQuest.length).toMatchInlineSnapshot(`27`)
-    expect(questCategory.yearlyQuest.length).toMatchInlineSnapshot(`45`)
-    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`468`)
+    expect(questCategory.yearlyQuest.length).toMatchInlineSnapshot(`46`)
+    expect(questCategory.singleQuest.length).toMatchInlineSnapshot(`470`)
   })
 
   test('snapshot', () => {

package/src/patch.ts

@@ -19,7 +19,7 @@ const isLegacyQuestPluginEnabled = async () => {
   const poiStore = await getPoiStore()
   const legacyQuestPlugin = poiStore
     .getState()
-    .plugins.find((i) => i.id === LEGACY_QUEST_PLUGIN_ID)
+    .plugins?.find((i) => i.id === LEGACY_QUEST_PLUGIN_ID)
   if (legacyQuestPlugin && legacyQuestPlugin.enabled) {
     return true
   }
@@ -40,13 +40,21 @@ const getQuestState = (maybeLanguage: string) => {
       : QuestData[maybeLanguage]
 
   return Object.fromEntries(
-    Object.entries(data).map(([apiNo, data]) => [
-      apiNo,
-      {
-        wiki_id: data.code,
-        condition: [(data as any).memo2, data.desc].filter(Boolean).join(' | '),
-      },
-    ]),
+    Object.entries(data).map(([apiNo, d]) => {
+      const typedData = d as (typeof data)[keyof typeof data]
+      return [
+        apiNo,
+        {
+          wiki_id: typedData.code,
+          condition: [
+            'memo2' in typedData ? typedData.memo2 : undefined,
+            typedData.desc,
+          ]
+            .filter(Boolean)
+            .join(' | '),
+        },
+      ]
+    }),
   )
 }
 
@@ -57,13 +65,17 @@ const getQuestState = (maybeLanguage: string) => {
  */
 export const patchLegacyQuestPluginReducer = async () => {
   if (await isLegacyQuestPluginEnabled()) {
-    // no clear if legacy quest plugin enabled
+    // skip patch if legacy quest plugin enabled
     return
   }
 
   try {
-    const i18next: i18n = await importFromPoi('views/env-parts/i18next')
-    const language = i18next.language
+    const i18next: i18n | { default: i18n; __esModule: true } =
+      await importFromPoi('views/env-parts/i18next')
+    // Fix https://github.com/poooi/poi/issues/2539
+    const language =
+      '__esModule' in i18next ? i18next.default.language : i18next.language
+
     const initState = {
       [HACK_KEY]: true,
       quests: getQuestState(language),
@@ -102,13 +114,13 @@ export const patchLegacyQuestPluginReducer = async () => {
  */
 export const clearPatchLegacyQuestPluginReducer = async () => {
   if (await isLegacyQuestPluginEnabled()) {
-    // no clear if legacy quest plugin enabled
+    // skip clear if legacy quest plugin enabled
     return
   }
   try {
     const { extendReducer } = await importFromPoi('views/create-store')
     const clearReducer = undefined
-    extendReducer('poi-plugin-quest-info', clearReducer)
+    extendReducer(LEGACY_QUEST_PLUGIN_ID, clearReducer)
   } catch (e) {
     console.error('Clear hack quest plugin reducer error', e)
   }