フラグ

Author: Midra429

package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "@icons-pack/react-simple-icons": "^10.1.0",
     "@internationalized/date": "^3.5.6",
-    "@midra/nco-api": "^1.8.9",
+    "@midra/nco-api": "^1.8.10",
     "@midra/nco-parser": "^1.0.27",
     "@nextui-org/react": "^2.4.8",
     "@webext-core/messaging": "^2.0.2",
@@ -53,6 +53,6 @@
     "tailwindcss": "^3.4.14",
     "typescript": "^5.6.3",
     "utility-types": "^3.11.0",
-    "wxt": "^0.19.12"
+    "wxt": "^0.19.13"
   }
 }

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import type { SyoboCalProgram } from '@midra/nco-api/types/syobocal/json'
+import type { SyoboCalProgramDb } from '@midra/nco-api/types/syobocal/db'
 import type { ScTitleItem } from './TitleItem'
 import type { ScSubtitleItem } from './SubtitleItem'
 
@@ -36,7 +36,7 @@ export const SubtitleDetail = forwardRef<
 >(({ title, subtitle }, ref) => {
   const [isLoading, setIsLoading] = useState(false)
   const [currentTid, setCurrentTid] = useState('')
-  const [programs, setPrograms] = useState<SyoboCalProgram[]>([])
+  const [programs, setPrograms] = useState<SyoboCalProgramDb[]>([])
 
   const stateSlotDetails = useNcoState('slotDetails')
 
@@ -70,18 +70,18 @@ export const SubtitleDetail = forwardRef<
 
     const { signal } = controller
 
-    new Promise<SyoboCalProgram[]>((resolve, reject) => {
+    new Promise<SyoboCalProgramDb[]>((resolve, reject) => {
       signal.addEventListener('abort', reject, { once: true })
 
       ncoApi.syobocal
-        .json(['ProgramByCount'], {
+        .db('ProgLookup', {
           TID: title.TID,
           Count: Number(subtitle[0]),
           ChID: SYOBOCAL_CHANNEL_IDS,
         })
         .then((response) => {
           if (response) {
-            const programs = Object.values(response.Programs)
+            const programs = Object.values(response)
 
             resolve(programs)
           } else {

src/entrypoints/popup/MainPane/Search/SyobocalResults/SubtitleDetail.tsx

@@ -70,12 +70,12 @@ export class NCOSearcher {
         : null,
     ])
 
-    const currentTime = Date.now() / 1000
+    const currentTime = Date.now()
 
     const syobocalPrograms =
       searchSyobocalResults &&
       searchSyobocalResults.programs.filter(
-        (val) => parseInt(val.EdTime) < currentTime
+        (val) => new Date(val.EdTime).getTime() < currentTime
       )
 
     logger.log('searchResults:', searchResults)
@@ -132,7 +132,10 @@ export class NCOSearcher {
         .trim()
 
       syobocalPrograms.forEach((program) => {
-        const id = `${syobocalToJikkyoChId(program.ChID)}:${program.StTime}-${program.EdTime}`
+        const starttime = new Date(program.StTime).getTime() / 1000
+        const endtime = new Date(program.EdTime).getTime() / 1000
+
+        const id = `${syobocalToJikkyoChId(program.ChID)}:${starttime}-${endtime}`
 
         if (loadedIds.includes(id)) return
 
@@ -155,9 +158,12 @@ export class NCOSearcher {
       .map((v) => v.id)
 
     const scPrograms = syobocalPrograms?.filter((program) => {
-      return jikkyoIds.includes(
-        `${syobocalToJikkyoChId(program.ChID)}:${program.StTime}-${program.EdTime}`
-      )
+      const starttime = new Date(program.StTime).getTime() / 1000
+      const endtime = new Date(program.EdTime).getTime() / 1000
+
+      const id = `${syobocalToJikkyoChId(program.ChID)}:${starttime}-${endtime}`
+
+      return jikkyoIds.includes(id)
     })
 
     const [
@@ -192,8 +198,8 @@ export class NCOSearcher {
         ? getJikkyoKakologs(
             scPrograms.map((val) => ({
               jkChId: syobocalToJikkyoChId(val.ChID)!,
-              starttime: parseInt(val.StTime),
-              endtime: parseInt(val.EdTime),
+              starttime: new Date(val.StTime).getTime() / 1000,
+              endtime: new Date(val.EdTime).getTime() / 1000,
             }))
           )
         : null,

src/ncoverlay/searcher.ts

@@ -24,13 +24,32 @@ export const programToSlotDetail = (
 
   const id = `${syobocalToJikkyoChId(program.ChID)}:${starttime / 1000}-${endtime / 1000}`
 
+  const flags: string[] = []
+
+  if ('Flag' in program) {
+    let flag = Number(program.Flag)
+
+    if (8 <= flag) {
+      flag -= 8
+      flags.push('🈞')
+    }
+    if (4 <= flag) {
+      flag -= 4
+      flags.push('🈡')
+    }
+    if (2 <= flag) {
+      flag -= 2
+      flags.push('🈟')
+    }
+  }
+
   return {
     type: 'jikkyo',
     id,
     status: 'pending',
     info: {
       id: program.TID,
-      title,
+      title: `${flags[0] ?? ''} ${title}`.trim(),
       duration: (endtime - starttime) / 1000,
       date: [starttime, endtime],
       count: {