🚧 Work on fixing channels

package.json

@@ -42,7 +42,7 @@
     "eslint": "9.6.0",
     "eslint-plugin-cypress": "3.3.0",
     "globals": "15.8.0",
-    "knip": "5.24.2",
+    "knip": "5.24.3",
     "prettier": "3.3.2",
     "prettier-plugin-organize-imports": "4.0.0",
     "typescript": "5.5.3"

server/src/common/innertube/innertubeFetch.ts

@@ -21,6 +21,8 @@ export const innertubeFetch = async (input: InputType, init?: RequestInit) => {
     url = input.url;
   }
 
+  console.log(url);
+
   return vtFetch.rawFetch(url, {
     ...(typeof input === 'string' ? {} : input),
     ...init,

server/src/common/proxyAgent.ts

@@ -60,7 +60,7 @@ const getSocksProxyAgent = (proxyUrl: string) => {
   const socksProxy = parseSocksURL(proxyUrl);
   const socksProxyAgent = socksDispatcher(socksProxy);
   return {
-    proxyAgent: socksDispatcher(socksProxy),
+    proxyAgent: socksProxyAgent,
     done: async () => {
       await socksProxyAgent.close();
     }

server/src/core/channels/channels.service.ts

@@ -5,6 +5,7 @@ import fs from 'fs';
 import { Model } from 'mongoose';
 import path from 'path';
 import { General } from 'server/common/general.schema';
+import { innertubeClient } from 'server/common/innertube/innertube';
 import sharp from 'sharp';
 import { checkParams, throwChannelError } from './channels.helper';
 import { ChannelCommunityPostsContinuationDto } from './dto/response/channel-community-posts-continuation.dto';
@@ -30,6 +31,24 @@ export class ChannelsService {
     private readonly GeneralModel: Model<General>
   ) {}
 
+  async resolveId(channelId: string): Promise<string> {
+    if (!checkParams(channelId)) {
+      throw new BadRequestException('Error fetching channel homepage', 'Invalid channelId');
+    }
+    if (channelId.startsWith('UC') && channelId.length === 24) {
+      return channelId;
+    }
+
+    const innertube = await innertubeClient();
+
+    const page = await innertube.resolveURL(`http://youtube.com/${channelId}`);
+    if (page?.payload?.browseId) {
+      return page.payload.browseId;
+    }
+
+    throw new NotFoundException('Channel not found');
+  }
+
   async getChannelHome(channelId: string): Promise<ChannelHomeDto | ChannelInfoError> {
     if (!checkParams(channelId)) {
       throw new BadRequestException('Error fetching channel homepage', 'Invalid channelId');
@@ -43,12 +62,11 @@ export class ChannelsService {
     // }
   }
 
-  getChannelInfo(channelId: string): Promise<ChannelInfoDto | ChannelInfoError> {
-    if (!checkParams(channelId)) {
-      throw new BadRequestException('Error fetching channel info', 'Invalid channelId');
-    }
+  async getChannelInfo(channelId: string): Promise<ChannelInfoDto | ChannelInfoError> {
     try {
-      return YoutubeGrabber.getChannelInfo({ channelId }) as unknown as Promise<ChannelInfoDto>;
+      const id = await this.resolveId(channelId);
+      const innertube = await innertubeClient();
+      return (await innertube.getChannel(id)).getAbout() as any;
     } catch (error) {
       throwChannelError(error, 'Error fetching channel info');
     }

server/src/core/channels/yt-channel-info/app/YoutubeGrabber.ts

@@ -99,6 +99,12 @@ export class YoutubeGrabber {
           .topicChannelDetailsRenderer;
       //  = topicChannelDetailsRenderer
     }
+
+    if (!channelHeaderData) {
+      channelHeaderData =
+        channelPageDataResponse?.header?.pageHeaderRenderer?.content?.pageHeaderViewModel;
+    }
+
     const headerTabs = channelPageDataResponse?.contents?.twoColumnBrowseResultsRenderer?.tabs;
     const channelTabs = headerTabs
       .filter(tab => tab?.tabRenderer !== undefined && tab?.tabRenderer !== null)
@@ -151,6 +157,10 @@ export class YoutubeGrabber {
 
     if (typeof channelHeaderData?.banner !== 'undefined') {
       bannerThumbnails = channelHeaderData?.banner?.thumbnails;
+
+      if (!bannerThumbnails) {
+        bannerThumbnails = channelHeaderData?.banner?.imageBannerViewModel?.image?.sources;
+      }
     }
 
     const subscriberSplit = subscriberText?.split(' ');