Skip to content

Commit 2621447

Browse files
committed
Merge branch 'main' into mv3-ltl
# Conflicts: # src/ts/typings/ytc.d.ts
2 parents 5618a2f + edefde8 commit 2621447

3 files changed

Lines changed: 76 additions & 42 deletions

File tree

package-lock.json

Lines changed: 41 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ts/chat-utils.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ export const getFrameInfoAsync = async (): Promise<Chat.UncheckedFrameInfo> => {
77
);
88
};
99

10-
const youtubePlayerStylesSelector = 'link[name="www-player"], link[href*="www-player.css"]';
10+
const youtubePlayerStylesSelector = [
11+
'link[name="www-player"]',
12+
'link[href*="www-player.css"]',
13+
'link[name="embed-ui"]',
14+
'link[href*="ytembeds"]'
15+
].join(', ');
1116
const youtubePlayerShellSelectors = ['#player', '#player-controls', '.player-unavailable', 'yt-live-chat-app', 'ytd-app', 'ytm-app'];
1217

1318
export const createPopup = (url: string): void => {

src/ts/typings/ytc.d.ts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ declare namespace Ytc {
8989
text: RunsObj;
9090
};
9191
};
92+
/** Used for identifying the banner action */
9293
actionId: string;
9394
/** Gets used for pinned messages */
9495
bannerProperties?: BannerPropertiesObj;
@@ -330,6 +331,23 @@ declare namespace Ytc {
330331
timestampUsec: IntString;
331332
}
332333

334+
interface PollRenderer {
335+
liveChatPollId: string;
336+
header: {
337+
pollHeaderRenderer: {
338+
pollQuestion: RunsObj;
339+
metadataText: RunsObj;
340+
thumbnail?: Thumbnails;
341+
};
342+
};
343+
choices: Array<{
344+
text: RunsObj;
345+
selected: boolean;
346+
voteRatio?: number;
347+
votePercentage?: SimpleTextObj;
348+
}>;
349+
}
350+
333351
type Renderers = TextMessageRenderer | PaidMessageRenderer |
334352
PaidStickerRenderer | MembershipRenderer | MembershipGiftPurchaseRenderer;
335353

@@ -356,6 +374,8 @@ declare namespace Ytc {
356374
liveChatViewerEngagementMessageRenderer?: EngagementMessageRenderer;
357375
/** ??? */
358376
liveChatPlaceholderItemRenderer?: PlaceholderRenderer;
377+
/** Poll */
378+
pollRenderer?: PollRenderer;
359379
}
360380

361381
interface TickerRenderer { // Doesn't have a timestamp but ID is always a paid message id
@@ -511,17 +531,26 @@ declare namespace Ytc {
511531
type: 'poll';
512532
actionId: string;
513533
item: {
534+
<<<<<<< HEAD
514535
header: ParsedRun[];
515536
profileIcon: ParsedImage;
537+
=======
538+
profileIcon: ParsedImage;
539+
header: ParsedRun[];
540+
>>>>>>> main
516541
question: ParsedRun[];
517542
choices: Array<{
518543
text: ParsedRun[];
519544
selected: boolean;
520545
ratio?: number;
521546
percentage?: string;
522547
}>;
548+
<<<<<<< HEAD
523549
}
524550
// TODO add 'action' for ending poll button
551+
=======
552+
};
553+
>>>>>>> main
525554
}
526555

527556
interface ParsedRemoveBanner {

0 commit comments

Comments
 (0)