🎨 [annict] season指定を3段階でより引っかかりやすいように

秋アニメのstartが9月なことがある（しっぽな）
ci7lus · Oct 7, 2022 · 213f4e7 · 213f4e7
1 parent 9acdeda
commit 213f4e7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/src/miraktest-annict/constants.ts b/src/miraktest-annict/constants.ts
@@ -36,7 +36,7 @@ export const ANNICT_META = {
   id: ANNICT_PLUGIN_ID,
   name: "Annict",
   author: "ci7lus",
-  version: "0.3.6",
+  version: "0.3.7",
   description: "視聴中の番組をAnnictで記録する",
   authorUrl: "https://github.com/ci7lus",
   url: "https://github.com/ci7lus/miraktest-plugins/tree/master/src/miraktest-annict",

diff --git a/src/miraktest-annict/findWork.ts b/src/miraktest-annict/findWork.ts
@@ -3,6 +3,7 @@ import isSameOrAfter from "dayjs/plugin/isSameOrAfter"
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore"
 import { Program } from "../@types/plugin"
 import { SayaDefinitionChannel } from "../miraktest-saya/types"
+import { wait } from "../shared/utils"
 import { AnnictRESTAPI } from "./annictAPI"
 import { SyobocalAPI } from "./syobocalAPI"
 import { ARM } from "./types"
@@ -88,25 +89,32 @@ export const detectProgramInfo = async ({
         const season = `${syobocalWork.FirstYear}-${getAnnictSeasonByMonth(
           syobocalWork.FirstMonth
         )}`
-        for (const term of [
-          syobocalWork.Title,
-          syobocalWork.TitleYomi,
-          syobocalWork.ShortTitle,
-          syobocalWork.TitleEN,
-        ].filter((s): s is string => !!s)) {
-          const annictWorkSearchReq = await rest.getWorks({
-            filter_title: [term.replace(/\(\d+\)/g, "")],
-            filter_season: [season],
-          })
-          const annictWork = annictWorkSearchReq.data.works.slice(0).shift()
-          if (annictWork) {
-            return {
-              annictId: annictWork.id,
-              episode: {
-                title: syobocalProgram.SubTitle,
-                number: syobocalProgram.Count,
-              },
+        for (const seasonSpec of [
+          season,
+          `${syobocalWork.FirstYear}-all`,
+          null,
+        ]) {
+          for (const term of [
+            syobocalWork.Title,
+            syobocalWork.TitleYomi,
+            syobocalWork.ShortTitle,
+            syobocalWork.TitleEN,
+          ].filter((s): s is string => !!s)) {
+            const annictWorkSearchReq = await rest.getWorks({
+              filter_title: [term.replace(/\(\d+\)/g, "")],
+              filter_season: seasonSpec !== null ? [seasonSpec] : undefined,
+            })
+            const annictWork = annictWorkSearchReq.data.works.slice(0).shift()
+            if (annictWork) {
+              return {
+                annictId: annictWork.id,
+                episode: {
+                  title: syobocalProgram.SubTitle,
+                  number: syobocalProgram.Count,
+                },
+              }
             }
+            await wait(100)
           }
         }
       }