fix broken unused kick stuff

MrBrax · Nov 7, 2023 · 080407a · 080407a
1 parent 1109b7b
commit 080407a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 7 deletions.
diff --git a/common/Api/Client.ts b/common/Api/Client.ts
@@ -264,8 +264,12 @@ export interface ApiYouTubeChannel extends ApiBaseChannel {
     chapter_data?: BaseVODChapterJSON;
 }
 
-export type ApiChannels = ApiTwitchChannel | ApiYouTubeChannel;
-export type ApiVods = ApiTwitchVod | ApiYouTubeVod;
+export interface ApiKickChannel extends ApiBaseChannel {
+    provider: "kick";
+}
+
+export type ApiChannels = ApiTwitchChannel | ApiYouTubeChannel | ApiKickChannel;
+export type ApiVods = ApiTwitchVod | ApiYouTubeVod | ApiKickVod;
 
 export type ApiSubscription = {
     type: string;

diff --git a/server/src/Controllers/Channels.ts b/server/src/Controllers/Channels.ts
@@ -105,8 +105,18 @@ export async function GetChannel(
         return;
     }
 
+    /*
+    if (isBaseChannel(channel)) {
+        res.api<ApiErrorResponse>(400, {
+            status: "ERROR",
+            message: "Channel is not supported",
+        });
+        return;
+    }
+    */
+
     res.api<ApiChannelResponse>(200, {
-        data: await channel.toAPI(),
+        data: (await channel.toAPI()) as any, // screw typescript
         status: "OK",
     });
 }

diff --git a/server/src/Core/LiveStreamDVR.ts b/server/src/Core/LiveStreamDVR.ts
@@ -6,8 +6,6 @@ import fs from "node:fs";
 import type { Server } from "node:http";
 // import { version } from "node:os";
 import type { BaseVODChapter } from "@/Core/Providers/Base/BaseVODChapter";
-import type { KickChannel } from "@/Core/Providers/Kick/KickChannel";
-import type { KickVOD } from "@/Core/Providers/Kick/KickVOD";
 import { TwitchChannel } from "@/Core/Providers/Twitch/TwitchChannel";
 import { TwitchGame } from "@/Core/Providers/Twitch/TwitchGame";
 import type { TwitchVOD } from "@/Core/Providers/Twitch/TwitchVOD";
@@ -51,6 +49,8 @@ import { Helper } from "./Helper";
 import { Job } from "./Job";
 import { KeyValue } from "./KeyValue";
 import { LOGLEVEL, log } from "./Log";
+import { KickChannel } from "./Providers/Kick/KickChannel";
+import { KickVOD } from "./Providers/Kick/KickVOD";
 import { Scheduler } from "./Scheduler";
 import { Webhook } from "./Webhook";
 

diff --git a/server/src/Core/Providers/Kick/KickChannel.ts b/server/src/Core/Providers/Kick/KickChannel.ts
@@ -1,3 +1,4 @@
+import type { ApiKickChannel } from "@common/Api/Client";
 import type { KickChannelConfig } from "@common/Config";
 import type { Providers } from "@common/Defs";
 import type {
@@ -315,4 +316,11 @@ export class KickChannel extends BaseChannel {
 
         return channel;
     }
+
+    public override async toAPI(): Promise<ApiKickChannel> {
+        return {
+            ...(await super.toAPI()),
+            provider: "kick",
+        };
+    }
 }
diff --git a/server/src/Core/Providers/Twitch/TwitchChannel.ts b/server/src/Core/Providers/Twitch/TwitchChannel.ts
@@ -255,7 +255,7 @@ export class TwitchChannel extends BaseChannel {
         );
     }
 
-    public async toAPI(): Promise<ApiTwitchChannel> {
+    public override async toAPI(): Promise<ApiTwitchChannel> {
         if (!this.internalId || !this.internalName || !this.displayName)
             console.error(
                 chalk.red(

diff --git a/server/src/Core/Providers/YouTube/YouTubeChannel.ts b/server/src/Core/Providers/YouTube/YouTubeChannel.ts
@@ -580,7 +580,7 @@ export class YouTubeChannel extends BaseChannel {
         return this.getVods().find((vod) => vod.is_capturing);
     }
 
-    public async toAPI(): Promise<ApiYouTubeChannel> {
+    public override async toAPI(): Promise<ApiYouTubeChannel> {
         const vods_list = await Promise.all(
             this.getVods().map(async (vod) => await vod.toAPI())
         );

diff --git a/server/src/Helpers/Types.ts b/server/src/Helpers/Types.ts
@@ -1,10 +1,20 @@
+import type { BaseChannel } from "@/Core/Providers/Base/BaseChannel";
+import { BaseVOD } from "@/Core/Providers/Base/BaseVOD";
 import type { KickChannel } from "@/Core/Providers/Kick/KickChannel";
 import type { TwitchChannel } from "@/Core/Providers/Twitch/TwitchChannel";
 import type { TwitchVOD } from "@/Core/Providers/Twitch/TwitchVOD";
 import type { TwitchVODChapter } from "@/Core/Providers/Twitch/TwitchVODChapter";
 import type { YouTubeChannel } from "@/Core/Providers/YouTube/YouTubeChannel";
 import type { YouTubeVOD } from "@/Core/Providers/YouTube/YouTubeVOD";
 
+export function isBaseChannel(data: unknown): data is BaseChannel {
+    return (data as BaseChannel).config?.provider === undefined;
+}
+
+export function isBaseVOD(data: unknown): data is BaseVOD {
+    return (data as BaseVOD).provider === "base";
+}
+
 export function isTwitchChannel(data: unknown): data is TwitchChannel {
     return (data as TwitchChannel).provider === "twitch";
 }