poi-plugin-quest-info-2 0.6.4 → 0.7.0

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/poi/hooks.ts

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { observePluginStore, observePoiStore } from './store'
 import { name as PACKAGE_NAME } from '../../package.json'
-import type { GameQuest, PoiQuestState, PoiState } from './types'
+import { GameQuest, PoiQuestState, PoiState, QuestTab } from './types'
 
 export const useActiveQuest = () => {
   const [activeQuests, setActiveQuests] = useState<PoiQuestState>({})
@@ -34,6 +34,15 @@ export const useGameQuest = () => {
   return quests
 }
 
+export const useGameTab = () => {
+  const [tab, setTab] = useState<QuestTab>(QuestTab.ALL)
+  useEffect(() => {
+    const listener = (tabId: QuestTab | null) => setTab(tabId ?? QuestTab.ALL)
+    return observePluginStore(listener, (i) => i?._?.tabId)
+  }, [])
+  return tab
+}
+
 const UNKNOWN_TAB = 'unknown'
 const useActiveTab = () => {
   const [activeMainTab, setActiveMainTab] = useState<string>(UNKNOWN_TAB)

package/src/poi/types.ts

@@ -60,19 +60,22 @@ export type GameQuest = {
   api_bonus_flag: 1
 }
 
+export enum QuestTab {
+  ALL = '0',
+  IN_PROGRESS = '9',
+  DAILY = '1',
+  WEEKLY = '2',
+  MONTHLY = '3',
+  ONCE = '4',
+  OTHERS = '5',
+}
+
 type QuestListAction = {
   type: '@@Response/kcsapi/api_get_member/questlist'
   path: '/kcsapi/api_get_member/questlist'
   postBody: {
     api_verno: '1'
-    api_tab_id:
-      | '0' // All
-      | '9' // In progress
-      | '1' // Daily
-      | '2' // Weekly
-      | '3' // Monthly
-      | '4' // Once
-      | '5' // Others
+    api_tab_id: QuestTab
   }
   body: {
     api_completed_kind: number

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
    */

package/src/reducer.ts

@@ -1,7 +1,8 @@
-import type { GameQuest, PoiAction } from './poi/types'
+import { GameQuest, PoiAction, QuestTab } from './poi/types'
 
 const initState = {
   questList: null as null | GameQuest[],
+  tabId: QuestTab.ALL,
 }
 
 export type PluginState = { _: typeof initState }
@@ -12,11 +13,12 @@ export const reducer = (
 ): typeof initState => {
   switch (action.type) {
     case '@@Response/kcsapi/api_get_member/questlist': {
-      const { body } = action
+      const { body, postBody } = action
 
       return {
         ...state,
         questList: body.api_list,
+        tabId: postBody.api_tab_id,
       }
     }
     default:

package/src/store/filterTags.ts

@@ -1,11 +1,14 @@
 import { useCallback } from 'react'
+import { useUpdateEffect } from 'react-use'
+import { useGameTab } from '../poi/hooks'
+import { QuestTab } from '../poi/types'
 import {
   ALL_CATEGORY_TAG,
   ALL_TYPE_TAG,
   CATEGORY_TAGS,
   TYPE_TAGS,
 } from '../tags'
-import { useStore } from './store'
+import { useStore, useSyncWithGame } from './store'
 
 export const useFilterTags = () => {
   const {
@@ -29,6 +32,13 @@ export const useFilterTags = () => {
     },
     [updateStore]
   )
+  const manualSetTypeTags = useCallback(
+    (data: Record<string, boolean>) => {
+      updateStore({ typeTags: data })
+    },
+    [updateStore]
+  )
+
   const setTypeTagsAll = useCallback(() => {
     setTypeTags(ALL_TYPE_TAG.name)
   }, [setTypeTags])
@@ -39,6 +49,44 @@ export const useFilterTags = () => {
     setCategoryTags,
     setCategoryTagsAll,
     setTypeTags,
+    manualSetTypeTags,
     setTypeTagsAll,
   }
 }
+
+export const useSyncGameTagEffect = () => {
+  const { syncWithGame } = useSyncWithGame()
+  const filterTags = useFilterTags()
+  const tab = useGameTab()
+
+  useUpdateEffect(() => {
+    if (!syncWithGame) {
+      return
+    }
+    switch (tab) {
+      case QuestTab.ALL:
+        filterTags.setTypeTagsAll()
+        break
+      case QuestTab.DAILY:
+        filterTags.setTypeTags('Daily')
+        break
+      case QuestTab.WEEKLY:
+        filterTags.setTypeTags('Weekly')
+        break
+      case QuestTab.MONTHLY:
+        filterTags.setTypeTags('Monthly')
+        break
+      case QuestTab.IN_PROGRESS:
+        filterTags.setTypeTags('In Progress')
+        break
+      case QuestTab.OTHERS:
+        filterTags.manualSetTypeTags({ Quarterly: true, Yearly: true })
+        break
+      case QuestTab.ONCE:
+        filterTags.setTypeTags('One-time')
+        break
+      default:
+        break
+    }
+  }, [syncWithGame, tab])
+}

package/src/store/quest.ts

@@ -4,7 +4,7 @@ import { useGameQuest, usePluginTranslation } from '../poi/hooks'
 import { getCategory } from '../questHelper'
 import type { UnionQuest } from '../questHelper'
 import { useKcwikiData, checkIsKcwikiSupportedLanguages } from './kcwiki'
-import { useStore } from './store'
+import { useStore, useSyncWithGame } from './store'
 
 const DEFAULT_LANG = 'ja-JP'
 
@@ -40,9 +40,7 @@ const useQuestMap = () => {
 export const useQuest = (): UnionQuest[] => {
   const docQuestMap = useQuestMap()
   const gameQuest = useGameQuest()
-  const {
-    store: { syncWithGame },
-  } = useStore()
+  const { syncWithGame } = useSyncWithGame()
 
   if (syncWithGame && gameQuest.length) {
     return gameQuest.map((quest) => {

package/src/tags.ts

@@ -49,18 +49,18 @@ export const CATEGORY_TAGS = [
 
 export const TYPE_TAGS = [
   ALL_TYPE_TAG,
-  ...(IN_POI ? [{ name: 'In Progress', filter: isInProgressQuest }] : []),
+  ...(IN_POI
+    ? ([{ name: 'In Progress', filter: isInProgressQuest }] as const)
+    : []),
   ...(hasNewQuest
-    ? [{ name: 'New', filter: isNewQuest, suffix: newQuestNumber }]
+    ? ([{ name: 'New', filter: isNewQuest, suffix: newQuestNumber }] as const)
     : []),
   { name: 'Daily', filter: isDailyQuest },
   { name: 'Weekly', filter: isWeeklyQuest },
   { name: 'Monthly', filter: isMonthlyQuest },
+  { name: 'One-time', filter: isSingleQuest },
   { name: 'Quarterly', filter: isQuarterlyQuest },
   { name: 'Yearly', filter: isYearlyQuest },
-  { name: 'One-time', filter: isSingleQuest },
 ] as const
 
 // TODO tag In Progress / Lock / Completed
-
-export const ALL_TAGS = [...CATEGORY_TAGS, ...TYPE_TAGS]