itube-specs 0.0.258 → 0.0.260

package/components/page-components/s-filter-videos-chips.vue

@@ -31,7 +31,7 @@ const chipsItems = computed(() => {
       const value = cat.split('_')[1] ?? cat;
       const groupCategory = cat.split('_')[0];
       const title = props.scheme.find(item => {
-        return item.name === convertString().toCapitalize(groupCategory)
+        return item.name.toLowerCase() === groupCategory.toLowerCase();
       })?.items.find((item: ISelectItem) => item.value === value)?.title;
 
       items.push({

package/composables/use-fetch-related-videos.ts

@@ -0,0 +1,38 @@
+import { useRoute } from 'vue-router';
+import {  EAsyncData, ELanguage } from '../runtime';
+import type { IVideoCard, PaginatedResponse } from '../types';
+
+export const useFetchRelatedVideos = async (
+    apiMethod: (...args: any[]) => Promise<PaginatedResponse<IVideoCard>>
+) => {
+    const { locale } = useI18n();
+    const lang = locale.value as ELanguage;
+    const route = useRoute();
+    const PER_PAGE = 14;
+
+    // const routeName = route.name;
+    // const paths = ['playlists-id-slug', 'videos-slug'];
+
+    // if (!paths.some(item => String(routeName).includes(item))) {
+    //     return null; // нужно явно проверять, в частности при переходе с видео на категорию слаг подхватывается и иногда выскакивает ошибка
+    // }
+
+    const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
+        EAsyncData.RelatedVideos,
+        () => useApiFetcher<PaginatedResponse<IVideoCard>>(
+            EAsyncData.RelatedVideos,
+            apiMethod,
+            {
+                page: Number(route.query[ 'page' ]) || 1,
+                'per-page': PER_PAGE,
+            },
+            lang,
+            useSlug().value
+        )(),
+        {
+            watch: [() => route.query.page],
+        }
+    );
+
+    return { data, status, error };
+};

package/composables/use-fetch-video-referer-phrases.ts

@@ -0,0 +1,41 @@
+import { useRoute } from 'vue-router';
+import { EAsyncData, ELanguage } from '../runtime';
+
+export const useFetchVideoRefererPhrases = (
+    apiMethod: (...args: any[]) => Promise<string[]>) => {
+  const { locale } = useI18n();
+  const lang = locale.value as ELanguage;
+  const route = useRoute();
+
+  const { data, status, error } = useAsyncData<string[]>(
+    EAsyncData.RefererPhrases,
+    () => useApiFetcher<string[]>(
+        EAsyncData.RefererPhrases,
+        apiMethod,
+        lang,
+        useSlug().value,
+        undefined
+    )(),
+  );
+
+  // async function fetchData() {
+  //   try {
+  //     const { $features } = useNuxtApp();
+  //     const slug = convertString().fromSlug(String(route.params['slug'])) || '';
+  //
+  //     if ($features.FetchByUrlEnabled) {
+  //       return await VideosApiService.refererPhrasesByUrl(lang, slug, undefined);
+  //     } else {
+  //       return await VideosApiService.refererPhrasesById(lang, slug, undefined);
+  //     }
+  //   } catch (err) {
+  //     throw createError({
+  //       statusCode: 500,
+  //       statusMessage: 'Error fetching video data',
+  //       message: err instanceof Error ? err.message : 'An unknown error occurred',
+  //     });
+  //   }
+  // }
+
+  return { data, status, error };
+};

package/composables/use-fetch-video.ts

@@ -0,0 +1,33 @@
+import { useRoute } from 'vue-router';
+import { EAsyncData, ELanguage } from '../runtime';
+import type { IVideoData } from '../types';
+
+export const useFetchVideo = async (
+    apiMethod: (...args: any[]) => Promise<IVideoData>
+) => {
+  const { locale } = useI18n();
+  const lang = locale.value as ELanguage;
+  const route = useRoute();
+  let headers = {} as HeadersInit & { 'User-Agent': string };
+
+  /* Проверка - если сср, то прокидываем беку заголовки пользователя, чтобы не сработал антихотлинк */
+  if (process.server) {
+    const event = useRequestEvent();
+    if (event && event.node.req.headers['user-agent']) {
+      headers['User-Agent'] = event.node.req.headers['user-agent'];
+    }
+  }
+
+  const { data, status, error } = await useAsyncData<IVideoData>(
+    EAsyncData.Video,
+    () => useApiFetcher<IVideoData>(
+        EAsyncData.Video,
+        apiMethod,
+        lang,
+        useSlug().value,
+        undefined,
+    )(),
+  );
+
+  return { data, status, error };
+};

package/composables/use-fetch-videos-by-categories.ts

@@ -8,6 +8,8 @@ export const useFetchVideosByCategories = async (
 ) => {
   const route = useRoute();
     const lang = useI18n().locale.value as ELanguage;
+    const slug = useSlug().value;
+    const filters = useGetVideosFilterRequest(route, selectDurationItems, selectAddedItems);
 
   const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
     EAsyncData.VideosByCategory,
@@ -19,8 +21,8 @@ export const useFetchVideosByCategories = async (
           page: Number(route.query[ 'page' ]) || 1,
           'per-page': 48,
         },
-        useGetVideosFilterRequest(route, selectDurationItems, selectAddedItems),
-        useSlug().value,
+        filters,
+        slug,
         getSelectedQuery(route, sortItemsDefault) || '-popularity'
     )(),
     {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.258",
+  "version": "0.0.260",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {