Merge pull request OwnTube-tv#372 from mykhailodanilenko/feature/premium-content-ads

Enable premium content ads for premium videos

Author: mykhailodanilenko

OwnTube.tv/api/constants.ts

@@ -34,6 +34,8 @@ export enum QUERY_KEYS {
   homepageLatestVideosView = "homepageLatestVideosView",
   categoryVideosView = "categoryVideosView",
   channelLatestVideosView = "channelLatestVideosView",
+  premiumAdsCollection = "premiumAdsCollection",
+  premiumAdsCaptionsCollection = "premiumAdsCaptionsCollection",
 }
 
 export const WRONG_SERVER_VERSION_STATUS_CODE = 444;

OwnTube.tv/api/queries/index.ts

@@ -3,4 +3,3 @@ export * from "./channels";
 export * from "./instances";
 export * from "./playlists";
 export * from "./videos";
-export * from "./liveStreams";

OwnTube.tv/api/queries/liveStreams.ts

@@ -1,9 +1,9 @@
 import { useLocalSearchParams } from "expo-router";
 import { RootStackParams } from "../../app/_layout";
-import { Query, useInfiniteQuery, useMutation, useQuery } from "@tanstack/react-query";
-import { GetVideosVideo } from "../models";
+import { Query, useInfiniteQuery, useMutation, useQueries, useQuery } from "@tanstack/react-query";
+import { GetVideosVideo, OwnTubeError } from "../models";
 import { ApiServiceImpl } from "../peertubeVideosApi";
-import { VideosCommonQuery, Video } from "@peertube/peertube-types";
+import { VideosCommonQuery, Video, VideoCaption } from "@peertube/peertube-types";
 import { SOURCES } from "../../types";
 import { getLocalData, retry } from "../helpers";
 
@@ -142,3 +142,48 @@ export const useGetVideoCaptionsQuery = (id?: string, enabled = true) => {
     retry,
   });
 };
+
+export const useGetVideoCaptionsCollectionQuery = (videoIds: string[] = [], queryKey: string) => {
+  const { backend } = useLocalSearchParams<RootStackParams["index"]>();
+
+  return useQueries({
+    queries: videoIds.map((videoId) => ({
+      queryKey: [queryKey, videoId, "captions"],
+      queryFn: async () => {
+        try {
+          return await ApiServiceImpl.getVideoCaptions(backend!, videoId!);
+        } catch (e) {
+          throw new OwnTubeError({ message: (e as unknown as { message: string }).message });
+        }
+      },
+      retry,
+      enabled: !!backend && videoIds.length > 0,
+    })),
+    combine: (result) => {
+      return result.filter(({ data }) => !!data).map(({ data }) => data || ([] as VideoCaption[]));
+    },
+  });
+};
+
+export const useGetVideoFullInfoCollectionQuery = (videoIds: string[] = [], queryKey: string) => {
+  const { backend } = useLocalSearchParams<RootStackParams["index"]>();
+
+  return useQueries({
+    queries: videoIds.map((videoId) => ({
+      queryKey: [queryKey, videoId],
+      queryFn: async () => {
+        try {
+          const res = await ApiServiceImpl.getVideo(backend!, videoId!);
+          return { ...res, previewPath: `https://${backend}${res?.previewPath}` };
+        } catch (e) {
+          throw new OwnTubeError({ message: (e as unknown as { message: string }).message });
+        }
+      },
+      retry,
+      enabled: !!backend && videoIds.length > 0,
+    })),
+    combine: (result) => {
+      return result.filter(({ data }) => !!data).map(({ data }) => data || ({} as Video));
+    },
+  });
+};

OwnTube.tv/api/queries/videos.ts

@@ -24,6 +24,7 @@ const customizationsSchema = z
     hideChannelPlaylistLinks: z.boolean(),
     homeFeaturedLives: z.array(z.string()),
     refreshQueriesStaleTimeMs: z.number(),
+    premiumContentAds: z.array(z.string()),
   })
   .partial();
 

OwnTube.tv/instanceConfigs.ts

@@ -113,6 +113,7 @@
   "lastWeek": "Last Week",
   "lastMonth": "Last Month",
   "lastYear": "Last Year",
+  "last12Months": "Last 12 Months",
   "olderThanAYear": "Older than a year",
   "showMore": "Show more",
   "findAVideoSite": "Find a video site",
@@ -148,5 +149,5 @@
   "streamingNow": "Streaming now",
   "offline": "Offline",
   "privacyPolicy": "Privacy policy",
-  "premiumVideoUnavailable": "Den här videon är inte tillgänglig för tillfället på grund av begränsningar för premiuminnehåll"
+  "premiumVideoUnavailable": "This video is unavailable at the moment, due to premium content restrictions"
 }

OwnTube.tv/locales/en.json

@@ -113,6 +113,7 @@
   "lastWeek": "На прошлой неделе",
   "lastMonth": "В прошлом месяце",
   "lastYear": "В прошлом году",
+  "last12Months": "За последние 12 месяцев",
   "olderThanAYear": "Старше года",
   "showMore": "Показать еще",
   "findAVideoSite": "Найти видео-сайт",

OwnTube.tv/locales/ru.json

@@ -113,6 +113,7 @@
   "lastWeek": "Senaste veckan",
   "lastMonth": "Senaste månaden",
   "lastYear": "Senaste året",
+  "last12Months": "Senaste 12 månaderna",
   "olderThanAYear": "Äldre än ett år",
   "showMore": "Visa mer",
   "findAVideoSite": "Hitta en videosajt",
@@ -148,5 +149,5 @@
   "streamingNow": "Direktsändning pågår",
   "offline": "Offline",
   "privacyPolicy": "Integritetspolicy",
-  "premiumVideoUnavailable": "Це відео зараз недоступне через обмеження преміум-контенту"
+  "premiumVideoUnavailable": "Den här videon är inte tillgänglig för tillfället på grund av begränsningar för premiuminnehåll"
 }

OwnTube.tv/locales/sv.json

@@ -113,6 +113,7 @@
   "lastWeek": "Минулого тижня",
   "lastMonth": "Минулого місяця",
   "lastYear": "Минулого року",
+  "last12Months": "За останні 12 місяців",
   "olderThanAYear": "Старші року",
   "showMore": "Показати ще",
   "findAVideoSite": "Знайти відео-сайт",

OwnTube.tv/locales/uk.json

@@ -241,6 +241,7 @@
       homeHidePlaylistsOverview: false,
       homeFeaturedLives: ["c25424b3-a077-42a1-9b1e-eb47729f1450"],
       showMoreSize: 24,
+      premiumContentAds: ["80d0b6ee-df38-4119-9234-a79b0909bd34"],
     },
   },
   {