From dcf2b720a09c82a1ad93815d338c0490c84d0da5 Mon Sep 17 00:00:00 2001
From: LuanRT <luan.lrt4@gmail.com>
Date: Sat, 17 Sep 2022 19:14:46 -0300
Subject: [PATCH] fix: minor parsing issues and other improvements  (#194)

* feat: add `ConfirmDialog`

This usually appears in the `playability_status` object.

* fix(PlayerErrorMessage): check if `iconType` exists before parsing

* chore(parser): fix a few inconsistencies

* feat(ytmusic): add `MetadataScreen`

TODO: Check TrackInfo, YouTube Music is probably getting some minor UI updates.
---
 src/parser/classes/ConfirmDialog.ts      | 24 ++++++++++++++++++++++++
 src/parser/classes/MetadataScreen.ts     | 15 +++++++++++++++
 src/parser/classes/PlayerErrorMessage.ts | 10 ++++++----
 src/parser/classes/SubscribeButton.ts    |  5 +++--
 src/parser/classes/VideoSecondaryInfo.ts |  5 +++--
 src/parser/index.ts                      |  2 +-
 src/parser/map.ts                        |  4 ++++
 7 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 src/parser/classes/ConfirmDialog.ts
 create mode 100644 src/parser/classes/MetadataScreen.ts

diff --git a/src/parser/classes/ConfirmDialog.ts b/src/parser/classes/ConfirmDialog.ts
new file mode 100644
index 00000000..4725e2d8
--- /dev/null
+++ b/src/parser/classes/ConfirmDialog.ts
@@ -0,0 +1,24 @@
+import Parser from '..';
+import Text from './misc/Text';
+import Button from './Button';
+
+import { YTNode } from '../helpers';
+
+class ConfirmDialog extends YTNode {
+  static type = 'ConfirmDialog';
+
+  title: Text;
+  confirm_button: Button | null;
+  cancel_button: Button | null;
+  dialog_messages: Text[];
+
+  constructor (data: any) {
+    super();
+    this.title = new Text(data.title);
+    this.confirm_button = Parser.parseItem<Button>(data.confirmButton, Button);
+    this.cancel_button = Parser.parseItem<Button>(data.cancelButton, Button);
+    this.dialog_messages = data.dialogMessages.map((txt: any) => new Text(txt));
+  }
+}
+
+export default ConfirmDialog;
\ No newline at end of file
diff --git a/src/parser/classes/MetadataScreen.ts b/src/parser/classes/MetadataScreen.ts
new file mode 100644
index 00000000..fe03bbf7
--- /dev/null
+++ b/src/parser/classes/MetadataScreen.ts
@@ -0,0 +1,15 @@
+import Parser from '..';
+import { YTNode } from '../helpers';
+
+class MetadataScreen extends YTNode {
+  static type = 'MetadataScreen';
+
+  section_list;
+
+  constructor (data: any) {
+    super();
+    this.section_list = Parser.parseItem(data);
+  }
+}
+
+export default MetadataScreen;
\ No newline at end of file
diff --git a/src/parser/classes/PlayerErrorMessage.ts b/src/parser/classes/PlayerErrorMessage.ts
index 8a14f080..9ed68a87 100644
--- a/src/parser/classes/PlayerErrorMessage.ts
+++ b/src/parser/classes/PlayerErrorMessage.ts
@@ -1,6 +1,8 @@
 import Parser from '../index';
 import Text from './misc/Text';
 import Thumbnail from './misc/Thumbnail';
+import Button from './Button';
+
 import { YTNode } from '../helpers';
 
 class PlayerErrorMessage extends YTNode {
@@ -8,17 +10,17 @@ class PlayerErrorMessage extends YTNode {
 
   subreason: Text;
   reason: Text;
-  proceed_button;
+  proceed_button: Button | null;
   thumbnails: Thumbnail[];
-  icon_type: string;
+  icon_type: string | null;
 
   constructor(data: any) {
     super();
     this.subreason = new Text(data.subreason);
     this.reason = new Text(data.reason);
-    this.proceed_button = Parser.parse(data.proceedButton);
+    this.proceed_button = Parser.parseItem<Button>(data.proceedButton, Button);
     this.thumbnails = Thumbnail.fromResponse(data.thumbnail);
-    this.icon_type = data.icon.iconType;
+    this.icon_type = data.icon?.iconType || null;
   }
 }
 
diff --git a/src/parser/classes/SubscribeButton.ts b/src/parser/classes/SubscribeButton.ts
index f8da774a..a3f1cfc3 100644
--- a/src/parser/classes/SubscribeButton.ts
+++ b/src/parser/classes/SubscribeButton.ts
@@ -1,6 +1,7 @@
 import Parser from '../index';
 import Text from './misc/Text';
 import NavigationEndpoint from './NavigationEndpoint';
+import SubscriptionNotificationToggleButton from './SubscriptionNotificationToggleButton';
 import { YTNode } from '../helpers';
 
 class SubscribeButton extends YTNode {
@@ -14,7 +15,7 @@ class SubscribeButton extends YTNode {
   show_preferences: boolean;
   subscribed_text: Text;
   unsubscribed_text: Text;
-  notification_preference_button;
+  notification_preference_button: SubscriptionNotificationToggleButton | null;
   endpoint: NavigationEndpoint;
 
   constructor(data: any) {
@@ -27,7 +28,7 @@ class SubscribeButton extends YTNode {
     this.show_preferences = data.showPreferences;
     this.subscribed_text = new Text(data.subscribedButtonText);
     this.unsubscribed_text = new Text(data.unsubscribedButtonText);
-    this.notification_preference_button = Parser.parse(data.notificationPreferenceButton);
+    this.notification_preference_button = Parser.parseItem<SubscriptionNotificationToggleButton>(data.notificationPreferenceButton, SubscriptionNotificationToggleButton);
     this.endpoint = new NavigationEndpoint(data.serviceEndpoints?.[0] || data.onSubscribeEndpoints?.[0]);
   }
 }
diff --git a/src/parser/classes/VideoSecondaryInfo.ts b/src/parser/classes/VideoSecondaryInfo.ts
index 665468d9..e2889718 100644
--- a/src/parser/classes/VideoSecondaryInfo.ts
+++ b/src/parser/classes/VideoSecondaryInfo.ts
@@ -1,6 +1,7 @@
 import Parser from '../index';
 import Text from './misc/Text';
 import Button from './Button';
+import VideoOwner from './VideoOwner';
 import SubscribeButton from './SubscribeButton';
 import MetadataRowContainer from './MetadataRowContainer';
 import { YTNode } from '../helpers';
@@ -8,7 +9,7 @@ import { YTNode } from '../helpers';
 class VideoSecondaryInfo extends YTNode {
   static type = 'VideoSecondaryInfo';
 
-  owner; // TODO: VideoOwner?
+  owner: VideoOwner | null;// TODO: VideoOwner?
   description: Text;
   subscribe_button;
   metadata: MetadataRowContainer | null;
@@ -19,7 +20,7 @@ class VideoSecondaryInfo extends YTNode {
 
   constructor(data: any) {
     super();
-    this.owner = Parser.parse(data.owner);
+    this.owner = Parser.parseItem<VideoOwner>(data.owner);
     this.description = new Text(data.description);
     this.subscribe_button = Parser.parseItem<SubscribeButton | Button>(data.subscribeButton, [ SubscribeButton, Button ]);
     this.metadata = Parser.parseItem<MetadataRowContainer>(data.metadataRowContainer, MetadataRowContainer);
diff --git a/src/parser/index.ts b/src/parser/index.ts
index 9ca13278..0c5d067a 100644
--- a/src/parser/index.ts
+++ b/src/parser/index.ts
@@ -259,7 +259,7 @@ export default class Parser {
       } : null,
       playability_status: data.playabilityStatus ? {
         status: data.playabilityStatus.status as string,
-        error_screen: Parser.parse(data.playabilityStatus.errorScreen),
+        error_screen: Parser.parseItem(data.playabilityStatus.errorScreen),
         audio_only_playablility: Parser.parseItem<AudioOnlyPlayability>(data.playabilityStatus.audioOnlyPlayability, AudioOnlyPlayability),
         embeddable: !!data.playabilityStatus.playableInEmbed || false,
         reason: data.playabilityStatus?.reason || ''
diff --git a/src/parser/map.ts b/src/parser/map.ts
index 086d62dc..a0d57779 100644
--- a/src/parser/map.ts
+++ b/src/parser/map.ts
@@ -55,6 +55,7 @@ import { default as CompactLink } from './classes/CompactLink';
 import { default as CompactMix } from './classes/CompactMix';
 import { default as CompactPlaylist } from './classes/CompactPlaylist';
 import { default as CompactVideo } from './classes/CompactVideo';
+import { default as ConfirmDialog } from './classes/ConfirmDialog';
 import { default as ContinuationItem } from './classes/ContinuationItem';
 import { default as CopyLink } from './classes/CopyLink';
 import { default as CreatePlaylistDialog } from './classes/CreatePlaylistDialog';
@@ -143,6 +144,7 @@ import { default as MetadataBadge } from './classes/MetadataBadge';
 import { default as MetadataRow } from './classes/MetadataRow';
 import { default as MetadataRowContainer } from './classes/MetadataRowContainer';
 import { default as MetadataRowHeader } from './classes/MetadataRowHeader';
+import { default as MetadataScreen } from './classes/MetadataScreen';
 import { default as MicroformatData } from './classes/MicroformatData';
 import { default as Mix } from './classes/Mix';
 import { default as Movie } from './classes/Movie';
@@ -328,6 +330,7 @@ const map: Record<string, YTNodeConstructor> = {
   CompactMix,
   CompactPlaylist,
   CompactVideo,
+  ConfirmDialog,
   ContinuationItem,
   CopyLink,
   CreatePlaylistDialog,
@@ -416,6 +419,7 @@ const map: Record<string, YTNodeConstructor> = {
   MetadataRow,
   MetadataRowContainer,
   MetadataRowHeader,
+  MetadataScreen,
   MicroformatData,
   Mix,
   Movie,