poi-plugin-quest-info-2 0.5.10 → 0.6.2

package/scripts/convertAssets.ts

@@ -7,13 +7,14 @@ const OUTPUT_PATH = path.resolve('build')
 const OUTPUT_FILE = path.resolve(OUTPUT_PATH, 'assets.ts')
 const CONVERT_EXTS = ['jpg', 'png'] as const
 
-const HEADER = `/**
+const HEADER = `/* eslint-disable prettier/prettier */
+/**
  * This file was automatically generated by \`${path.relative(
    // project root
    process.cwd(),
    __filename
  )}\`
- * Do not edit!
+ * Do not edit this file directly.
  */` as const
 
 function base64Encode(file: string) {

package/scripts/downloadKcQuestsData.ts

@@ -14,7 +14,7 @@ const VERSION_URL =
   'https://api.github.com/repos/kcwikizh/kcQuests/branches/main'
 
 // expired quest: 2021 节分任务
-const IGNORE_DATA = [840, 841, 842, 843] as const
+const IGNORE_DATA = [329, 441, 840, 841, 842, 843] as const
 
 const getRemoteVersion = async () => {
   const resp = await fetch(VERSION_URL)
@@ -80,12 +80,20 @@ const main = async () => {
   text = text.trim()
 
   const json = JSON.parse(text) as {
-    [gameId: string]: { code: string; name: string; desc: string }
+    [gameId: string]: {
+      code: string
+      name: string
+      desc: string
+      memo?: string
+    }
   }
   for (const gameId in json) {
-    const { name, desc } = json[gameId]
+    const { name, desc, memo } = json[gameId]
     json[gameId].name = pangu.spacing(name)
     json[gameId].desc = pangu.spacing(desc)
+    if (memo) {
+      json[gameId].memo = pangu.spacing(memo)
+    }
   }
 
   IGNORE_DATA.forEach((gameId) => delete json[gameId])

package/scripts/downloadKcanotifyGamedata.ts

@@ -97,12 +97,20 @@ const main = async () => {
       text = text.trim()
 
       const json = JSON.parse(text) as {
-        [gameId: string]: { code: string; name: string; desc: string }
+        [gameId: string]: {
+          code: string
+          name: string
+          desc: string
+          memo?: string
+        }
       }
       for (const gameId in json) {
-        const { name, desc } = json[gameId]
+        const { name, desc, memo } = json[gameId]
         json[gameId].name = pangu.spacing(name)
         json[gameId].desc = pangu.spacing(desc)
+        if (memo) {
+          json[gameId].memo = pangu.spacing(memo)
+        }
       }
 
       const data = JSON.stringify(json, undefined, 2)

package/scripts/genQuestCategory.ts

@@ -0,0 +1,58 @@
+import { writeFileSync } from 'fs'
+import path from 'path'
+import { QuestData } from '../build/kcanotifyGamedata'
+import { KcwikiQuestData } from '../build/kcQuestsData'
+
+const OUTPUT_PATH = path.resolve('build', 'questCategory.json')
+
+const questStartsFilter = (str: string) =>
+  Object.entries(QuestData['zh-CN'])
+    .filter(([, quest]) => quest.name.startsWith(str))
+    .map(([gameId]) => gameId)
+
+const kcwikiDataSelector = () => Object.entries(KcwikiQuestData['zh-CN'])
+const mergeDataSelector = () =>
+  Object.entries({ ...QuestData['zh-CN'], ...KcwikiQuestData['zh-CN'] })
+
+const main = () => {
+  const dailyQuest = questStartsFilter('(日任)')
+  const weeklyQuest = questStartsFilter('(周任)')
+  const monthlyQuest = questStartsFilter('(月任)')
+  const quarterlyQuest = [
+    ...new Set([
+      ...questStartsFilter('(季任)'),
+      ...kcwikiDataSelector()
+        .filter(([, quest]) => quest.desc.includes('季常任务'))
+        .map(([gameId]) => gameId),
+    ]),
+  ].sort((a, b) => +a - +b)
+  // (年任) (年任 / x 月)
+  const yearlyQuest = kcwikiDataSelector()
+    .filter(([, quest]) => quest.desc.includes('❀备注：年常任务'))
+    .map(([gameId]) => gameId)
+  const singleQuest = mergeDataSelector()
+    .filter(
+      ([gameId]) =>
+        ![
+          ...dailyQuest,
+          ...weeklyQuest,
+          ...monthlyQuest,
+          ...quarterlyQuest,
+          ...yearlyQuest,
+        ].includes(gameId)
+    )
+    .map(([gameId]) => gameId)
+
+  const data = {
+    dailyQuest,
+    weeklyQuest,
+    monthlyQuest,
+    quarterlyQuest,
+    yearlyQuest,
+    singleQuest,
+  }
+
+  writeFileSync(OUTPUT_PATH, JSON.stringify(data, null, 2))
+}
+
+main()

package/src/Toolbar.tsx

@@ -1,20 +1,22 @@
 import { Button, InputGroup, Intent, Tag, Tooltip } from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
-import styled from 'styled-components'
-import React, { useCallback } from 'react'
 import type { ChangeEvent } from 'react'
+import React, { useCallback } from 'react'
 import { useThrottle } from 'react-use'
-import { useQuest, useStore } from './store'
+import styled from 'styled-components'
+import { IN_POI } from './poi/env'
+import { usePluginTranslation } from './poi/hooks'
+import type { UnionQuest } from './questHelper'
+import { useQuest, useSyncWithGame } from './store'
+import { useFilterTags } from './store/filterTags'
+import { useSearchInput } from './store/search'
 import {
-  ALL_TYPE_TAG,
   ALL_CATEGORY_TAG,
-  TYPE_TAGS,
-  CATEGORY_TAGS,
   ALL_TAGS,
+  ALL_TYPE_TAG,
+  CATEGORY_TAGS,
+  TYPE_TAGS,
 } from './tags'
-import type { UnionQuest } from './questHelper'
-import { usePluginTranslation } from './poi/hooks'
-import { IN_POI } from './poi/env'
 
 const ToolbarWrapper = styled.div`
   display: flex;
@@ -37,18 +39,21 @@ const TagsWrapper = styled.div`
 
 const SyncButton = () => {
   const { t } = usePluginTranslation()
-  const {
-    store: { syncWithGame },
-    updateStore,
-  } = useStore()
+  const { searchInput } = useSearchInput()
+  const { syncWithGame, toggleSyncWithGame } = useSyncWithGame()
   const handleClick = useCallback(() => {
-    updateStore({ syncWithGame: !syncWithGame })
-  }, [syncWithGame, updateStore])
+    toggleSyncWithGame()
+  }, [toggleSyncWithGame])
+  const intent = syncWithGame
+    ? searchInput
+      ? Intent.WARNING
+      : Intent.SUCCESS
+    : Intent.NONE
   return (
     <Tooltip content={t('Sync with game')}>
       <Button
         icon={IconNames.EXCHANGE}
-        intent={syncWithGame ? Intent.SUCCESS : Intent.NONE}
+        intent={intent}
         disabled={!IN_POI}
         onClick={handleClick}
       />
@@ -58,24 +63,30 @@ const SyncButton = () => {
 
 export const SearchInput: React.FC = () => {
   const { t } = usePluginTranslation()
-  const {
-    store: { searchInput },
-    updateStore,
-  } = useStore()
+  const { searchInput, setSearchInput } = useSearchInput()
 
   const handleChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) =>
-      updateStore({ searchInput: event.target.value }),
-    [updateStore]
+      setSearchInput(event.target.value),
+    [setSearchInput]
   )
 
+  const handleClear = useCallback(() => setSearchInput(''), [setSearchInput])
+
   return (
     <InputGroup
       value={searchInput}
       onChange={handleChange}
       placeholder={t('Search')}
       leftIcon={IconNames.SEARCH}
-      rightElement={<SyncButton></SyncButton>}
+      rightElement={
+        <>
+          {!!searchInput && (
+            <Button icon={IconNames.CROSS} onClick={handleClear} />
+          )}
+          <SyncButton></SyncButton>
+        </>
+      }
       type="text"
     />
   )
@@ -83,22 +94,16 @@ export const SearchInput: React.FC = () => {
 
 const Tags = () => {
   const { t } = usePluginTranslation()
-  const {
-    store: { typeTags, categoryTags },
-    updateStore,
-  } = useStore()
-  const withHandleClickTag = useCallback(
-    (tagName: string, key: 'typeTags' | 'categoryTags') => () =>
-      updateStore({ [key]: { [tagName]: true } }),
-    [updateStore]
-  )
+
+  const { typeTags, categoryTags, setCategoryTags, setTypeTags } =
+    useFilterTags()
 
   return (
     <>
       <TagsWrapper>
         {CATEGORY_TAGS.map(({ name }) => (
           <Tag
-            onClick={withHandleClickTag(name, 'categoryTags')}
+            onClick={() => setCategoryTags(name)}
             intent={
               categoryTags[name]
                 ? name === ALL_CATEGORY_TAG.name
@@ -116,7 +121,7 @@ const Tags = () => {
       <TagsWrapper>
         {TYPE_TAGS.map(({ name }) => (
           <Tag
-            onClick={withHandleClickTag(name, 'typeTags')}
+            onClick={() => setTypeTags(name)}
             intent={
               typeTags[name]
                 ? name === ALL_TYPE_TAG.name
@@ -145,9 +150,9 @@ export const Toolbar = () => {
 }
 
 const useToolbarFilter = () => {
-  const {
-    store: { searchInput, typeTags, categoryTags },
-  } = useStore()
+  const { searchInput } = useSearchInput()
+  const { typeTags, categoryTags } = useFilterTags()
+
   const activatedTags = { ...typeTags, ...categoryTags }
   const activatedTagsName = ALL_TAGS.filter((tag) => activatedTags[tag.name])
   const tagsFilter = activatedTagsName.map((tag) => tag.filter)