Merge pull request #221 from DominikPieper/hotfix/youtube

hotfix: youtube content types

Author: adamluckdev

src/helpers/domUtils.ts

@@ -4,7 +4,7 @@ export interface JavascriptDeclaration {
     value: string;
 }
 
-const DECLARATION_REGEX = /(const|let|var)\s+(\w+)\s*=\s*(.+?)\s*(?=(?:^|\s+)(const|let|var)\s+|$)/g;
+const DECLARATION_REGEX = /(const|let|var)\s+(\w+)\s*=\s*(.+|\n+?)\s*(?=(?:^|\s+)(const|let|var)\s+|$)/g;
 
 export function getJavascriptDeclarationByName(
     name: string,

src/parsers/PinterestParser.ts

@@ -2,9 +2,9 @@ import { request } from 'obsidian';
 import { desktopBrowserUserAgent } from 'src/helpers/networkUtils';
 import { normalizeFilename } from 'src/helpers/fileutils';
 import { replaceImages } from 'src/helpers/replaceImages';
+import { handleError } from 'src/helpers/error';
 import { Note } from './Note';
 import { Parser } from './Parser';
-import { handleError } from 'src/helpers/error';
 
 interface PinAuthor {
     fullName: string;

src/parsers/YoutubeParser.ts

@@ -152,7 +152,7 @@ class YoutubeParser extends Parser {
 
             const videoHTML = new DOMParser().parseFromString(response, 'text/html');
 
-            const declaration = getJavascriptDeclarationByName('ytInitialDataa', videoHTML.querySelectorAll('script'));
+            const declaration = getJavascriptDeclarationByName('ytInitialData', videoHTML.querySelectorAll('script'));
             const jsonData = typeof declaration !== 'undefined' ? JSON.parse(declaration.value) : {};
 
             const videoSchemaElement = videoHTML.querySelector('[itemtype*="http://schema.org/VideoObject"]');
@@ -177,6 +177,11 @@ class YoutubeParser extends Parser {
             const videoViewsCount =
                 jsonData?.contents?.twoColumnWatchNextResults?.results?.results?.contents?.[0]?.videoPrimaryInfoRenderer
                     ?.viewCount?.videoViewCountRenderer?.originalViewCount ?? 0;
+            const channelId =
+                jsonData?.contents?.twoColumnWatchNextResults?.results?.results?.contents?.[1]
+                    ?.videoSecondaryInfoRenderer?.subscribeButton?.subscribeButtonRenderer?.channelId ??
+                videoSchemaElement?.querySelector('[itemprop="channelId"]')?.getAttribute('content') ??
+                '';
 
             return {
                 date: this.getFormattedDateForContent(createdAt),
@@ -193,7 +198,7 @@ class YoutubeParser extends Parser {
                 videoViewsCount: videoViewsCount,
                 videoTags: '',
                 videoChapters: this.formatVideoChapters(videoId, chapters),
-                channelId: videoSchemaElement?.querySelector('[itemprop="channelId"')?.getAttribute('content') ?? '',
+                channelId: channelId,
                 channelURL: personSchemaElement?.querySelector('[itemprop="url"]')?.getAttribute('href') ?? '',
                 channelName: personSchemaElement?.querySelector('[itemprop="name"]')?.getAttribute('content') ?? '',
                 extra: null,