feat: ytb sponsorblock

src/components/miniplayer/View.tsx

@@ -71,13 +71,15 @@ export default () => {
   };
   const onArtworkPress = () => {
     if (artworkOpacity.value === 1) {
-      return (artworkOpacity.value = withTiming(0, { duration: 100 }, () => {
+      artworkOpacity.value = withTiming(0, { duration: 100 }, () => {
         runOnJS(setLrcVisible)(true);
-      }));
+      });
+      return;
     }
     if (artworkOpacity.value === 0) {
       setLrcVisible(false);
-      return (artworkOpacity.value = withTiming(1, { duration: 100 }));
+      artworkOpacity.value = withTiming(1, { duration: 100 });
+      return;
     }
   };
 
@@ -89,9 +91,10 @@ export default () => {
     if (translationY < -height * SnapToRatio) {
       return expand();
     }
-    return (miniplayerHeight.value = withTiming(initHeight.value, {
+    miniplayerHeight.value = withTiming(initHeight.value, {
       duration: 250,
-    }));
+    });
+    return;
   };
 
   const scrollDragGesture = React.useMemo(

src/components/player/controls/useSponsorBlock.ts

@@ -12,7 +12,7 @@ export default () => {
   const { sponsorBlockEnabled, sponsorBlockCat } = useNoxSetting(
     state => state.playerSetting,
   );
-  const [sponsorblock, setSponsorBlock] = useState<SponsorBlockBili[]>([]);
+  const [sponsorBlock, setSponsorBlock] = useState<SponsorBlockBili[]>([]);
 
   const initSponsorBlock = (song: NoxMedia.Song) => {
     if (sponsorBlockEnabled) {
@@ -21,7 +21,7 @@ export default () => {
   };
 
   const checkSponsorBlock = (position: number) => {
-    for (const sb of sponsorblock) {
+    for (const sb of sponsorBlock) {
       if (
         sponsorBlockCat.includes(sb.category) &&
         sb.actionType === ActionType.Skip &&

src/components/style.ts

@@ -60,16 +60,16 @@ export const createStyle = (
       alignItems: 'center',
       height: 148,
     },
-    gifs: (customStyle.gifs || []) as any,
-    bkgrdImg: randomChoice(customStyle.backgroundImages || []) as any,
+    gifs: (customStyle.gifs ?? []) as any,
+    bkgrdImg: randomChoice(customStyle.backgroundImages ?? []) as any,
     bkgrdImgLandscape: randomChoice(
-      customStyle.backgroundImagesLandscape || [],
+      customStyle.backgroundImagesLandscape ?? [],
     ) as any,
     loadingIcon: customStyle.loadingIcon as any,
     progressThumbImage: customStyle.progressThumbImage as any,
-    progressThumbImageLeftDrag: (customStyle.progressThumbImageLeftDrag ||
+    progressThumbImageLeftDrag: (customStyle.progressThumbImageLeftDrag ??
       customStyle.progressThumbImage) as any,
-    progressThumbImageRightDrag: (customStyle.progressThumbImageRightDrag ||
+    progressThumbImageRightDrag: (customStyle.progressThumbImageRightDrag ??
       customStyle.progressThumbImage) as any,
     biliGarbCard: customStyle.biliGarbCard as any,
     thumbupSVGA: customStyle.thumbupSVGA as any,

src/utils/mediafetch/acfunvideo.ts

@@ -75,7 +75,7 @@ const export2URL = (song: NoxMedia.Song) =>
   `https://www.youtube.com/watch?v=${song.bvid}`;
 
 export default {
-  regexSearchMatch: /acfun\.cn\/v\/(ac[0-9]+)/,
+  regexSearchMatch: /acfun\.cn\/v\/(ac\d+)/,
   regexFetch,
   regexResolveURLMatch: /^acfun-/,
   resolveURL,

src/utils/sponsorblock/parser.ts

@@ -1,10 +1,13 @@
 import { Source } from '@enums/MediaFetch';
 import { getSponsorBlock as getSponsorBlockBili } from './bilibili';
+import { getSponsorBlock as getSponsorYtb } from './ytb';
 
 export const getSponsorBlock = async (song: NoxMedia.Song) => {
   switch (song.source) {
     case Source.bilivideo:
       return getSponsorBlockBili(song);
+    case Source.ytbvideo:
+      return getSponsorYtb(song);
   }
   return [];
 };

src/utils/sponsorblock/ytb.ts

@@ -0,0 +1,26 @@
+import bfetch from '@utils/BiliFetch';
+import logger from '../Logger';
+import { SponsorBlockBili } from './Constants';
+
+// https://wiki.sponsor.ajay.app/w/API_Docs
+const API = 'https://sponsor.ajay.app/api/skipSegments?videoID={bvid}';
+
+const _getSponsorBlock = async (bvid: string): Promise<SponsorBlockBili[]> => {
+  try {
+    const res = await bfetch(API.replace('{bvid}', bvid));
+    if (res.status !== 200) {
+      logger.info(
+        `[sponsorblock.ytb] ${bvid}: ${res.status} ${res.statusText}`,
+      );
+      return [];
+    }
+    const json = (await res.json()) as SponsorBlockBili[];
+    return json;
+  } catch {
+    return [];
+  }
+};
+
+export const getSponsorBlock = (
+  song: NoxMedia.Song,
+): Promise<SponsorBlockBili[]> => _getSponsorBlock(song.bvid);