poi-plugin-quest-info-2 0.8.2 → 0.8.3

package/package.json

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

package/src/questHelper.ts

@@ -248,15 +248,35 @@ const calcQuestMap = (
   return map
 }
 
-export const getCompletedQuest = moize((inProgressQuest: number[]) => {
-  const completedQuest = calcQuestMap(inProgressQuest, getPreQuestIds)
-  return completedQuest
-})
+export const getCompletedQuest = moize(
+  (inProgressQuest: number[]) => {
+    const completedQuest = calcQuestMap(inProgressQuest, getPreQuestIds)
+    return completedQuest
+  },
+  {
+    matchesArg: (cacheKeyArg, keyArg) => {
+      if (Array.isArray(cacheKeyArg) && Array.isArray(keyArg)) {
+        return cacheKeyArg.join(',') === keyArg.join(',')
+      }
+      return cacheKeyArg === keyArg
+    },
+  }
+)
 
-export const getLockedQuest = moize((inProgressQuest: number[]) => {
-  const lockedQuest = calcQuestMap(inProgressQuest, getPostQuestIds)
-  return lockedQuest
-})
+export const getLockedQuest = moize(
+  (inProgressQuest: number[]) => {
+    const lockedQuest = calcQuestMap(inProgressQuest, getPostQuestIds)
+    return lockedQuest
+  },
+  {
+    matchesArg: (cacheKeyArg, keyArg) => {
+      if (Array.isArray(cacheKeyArg) && Array.isArray(keyArg)) {
+        return cacheKeyArg.join(',') === keyArg.join(',')
+      }
+      return cacheKeyArg === keyArg
+    },
+  }
+)
 
 export const questApiStateToQuestStatus = (
   state: QUEST_API_STATE | undefined

package/src/store/quest.ts

@@ -88,7 +88,7 @@ export const useQuest = (): UnionQuest[] => {
   }
 }
 
-export const useQuestByCode = (code: string): UnionQuest | null => {
+export const useQuestByCode = (code: string) => {
   const questMap = useQuestMap()
   const gameId = getQuestIdByCode(code)
   if (gameId && gameId in questMap) {
@@ -102,17 +102,20 @@ export const useQuestByCode = (code: string): UnionQuest | null => {
 
 export const useQuestStatus = (gameId: number | null) => {
   const gameQuest = useGameQuest()
-  const gameQuestId = gameQuest.map((quest) => quest.api_no)
-  const completedQuest = getCompletedQuest(gameQuestId)
-  const lockedQuest = getLockedQuest(gameQuestId)
 
   if (!gameId) {
     return QUEST_STATUS.UNKNOWN
   }
   const theGameQuest = gameQuest.find((quest) => quest.api_no === gameId)
   if (theGameQuest) {
+    // the quest is in game
     return questApiStateToQuestStatus(theGameQuest.api_state)
   }
+
+  const gameQuestId = gameQuest.map((quest) => quest.api_no)
+  const completedQuest = getCompletedQuest(gameQuestId)
+  const lockedQuest = getLockedQuest(gameQuestId)
+
   if (gameId in lockedQuest) {
     return QUEST_STATUS.LOCKED
   }

package/src/store/store.tsx

@@ -111,6 +111,7 @@ export const useSyncWithGame = () => {
   }, [setSyncWithGame, syncWithGame])
   return {
     syncWithGame,
+    setSyncWithGame,
     toggleSyncWithGame,
   }
 }