Merge branch 'master' into mv3

Author: KentoNishi

src/components/ChatSummary.svelte

@@ -20,7 +20,7 @@
       clearTimeout(autoHideTimeout);
       autoHideTimeout = null;
     }
-   };
+  };
 
   $: if (summary) {
     dismissed = false;

src/components/HyperchatButton.svelte

@@ -64,10 +64,6 @@
 </div>
 
 <style>
-  :global(div#contents.style-scope.yt-live-chat-renderer) {
-    z-index: 2;
-  }
-
   #hc-buttons {
     float: right;
     display: flex;

src/components/PinnedMessage.svelte

@@ -10,14 +10,24 @@
 
   let dismissed = false;
   let shorten = false;
+  let autoHideTimeout: NodeJS.Timeout | null = null;
   const classes = 'rounded inline-flex flex-col overflow-visible ' +
    'bg-secondary-900 p-2 w-full text-white z-10 shadow';
 
-  const onShorten = () => { shorten = !shorten; };
-
+  const onShorten = () => { 
+    shorten = !shorten;
+    if (autoHideTimeout) {
+      clearTimeout(autoHideTimeout);
+      autoHideTimeout = null;
+    }
+  };
+  
   $: if (pinned) {
     dismissed = false;
     shorten = false;
+    if (pinned.showtime) {
+      autoHideTimeout = setTimeout(() => { shorten = true; }, pinned.showtime);
+    }
   }
 
   const dispatch = createEventDispatcher();

src/ts/chat-parser.ts

@@ -75,7 +75,7 @@ const splitRunsByNewline = (runs: Ytc.ParsedRun[], maxSplit: number = -1): Ytc.P
     return acc;
   }, [[]]);
 
-const parseChatSummary = (renderer: Ytc.AddChatItem, isEphemeral: boolean, bannerTimeoutMs: number): Ytc.ParsedSummary | undefined => {
+const parseChatSummary = (renderer: Ytc.AddChatItem, showtime: number): Ytc.ParsedSummary | undefined => {
   if (!renderer.liveChatBannerChatSummaryRenderer) {
     return;
   }
@@ -102,7 +102,7 @@ const parseChatSummary = (renderer: Ytc.AddChatItem, isEphemeral: boolean, banne
       message: splitRuns[2],
     },
     id: baseRenderer.liveChatSummaryId,
-    showtime: isEphemeral ? bannerTimeoutMs : 0,
+    showtime: showtime,
   };
   return item;
 }
@@ -231,8 +231,14 @@ const parseMessageDeletedAction = (action: Ytc.MessageDeletedAction): Ytc.Parsed
 
 const parseBannerAction = (action: Ytc.AddPinnedAction): Ytc.ParsedPinned | Ytc.ParsedSummary | undefined => {
   const baseRenderer = action.bannerRenderer.liveChatBannerRenderer;
+
+  // fold both auto-disappear and auto-collapse into just collapse for showtime
+  const showtime = action.bannerProperties?.isEphemeral
+   ? (action.bannerProperties?.bannerTimeoutMs || 0)
+   : 1000 * (action.bannerProperties?.autoCollapseDelay?.seconds || baseRenderer.bannerProperties?.autoCollapseDelay?.seconds || 0);
+
   if (baseRenderer.contents.liveChatBannerChatSummaryRenderer) {
-    return parseChatSummary(baseRenderer.contents, action.bannerProperties?.isEphemeral ?? false, action.bannerProperties?.bannerTimeoutMs ?? 0);
+    return parseChatSummary(baseRenderer.contents, showtime);
   }
   const parsedContents = parseAddChatItemAction(
     { item: baseRenderer.contents }, true
@@ -247,7 +253,8 @@ const parseBannerAction = (action: Ytc.AddPinnedAction): Ytc.ParsedPinned | Ytc.
         baseRenderer.header.liveChatBannerHeaderRenderer.text.runs
       ),
       contents: parsedContents
-    }
+    },
+    showtime: showtime,
   };
 };
 

src/ts/chat-utils.ts

@@ -42,7 +42,7 @@ export const isValidFrameInfo = (f: Chat.UncheckedFrameInfo, port?: Chat.Port):
   return check;
 };
 
-const actionTypes = new Set(['messages', 'bonk', 'delete', 'pin', 'unpin', 'playerProgress', 'forceUpdate']);
+const actionTypes = new Set(['messages', 'bonk', 'delete', 'pin', 'unpin', 'summary', 'playerProgress', 'forceUpdate']);
 export const responseIsAction = (r: Chat.BackgroundResponse): r is Chat.Actions =>
   actionTypes.has(r.type);
 

src/ts/typings/ytc.d.ts

@@ -86,11 +86,19 @@ declare namespace Ytc {
             text: RunsObj;
           };
         };
+        /** Gets used for pinned messages */
+        bannerProperties?: BannerPropertiesObj;
       };
     };
-    bannerProperties?: {
-      isEphemeral: boolean;
-      bannerTimeoutMs: number;
+    /** Gets used for chat summary/redirects */
+    bannerProperties?: BannerPropertiesObj;
+  }
+
+  interface BannerPropertiesObj {
+    isEphemeral?: boolean;
+    bannerTimeoutMs?: number;
+    autoCollapseDelay?: {
+      seconds: number;
     }
   }
 
@@ -378,6 +386,7 @@ declare namespace Ytc {
       header: ParsedRun[];
       contents: ParsedMessage;
     };
+    showtime: number;
   }
 
   interface ParsedSummary {