Merge branch 'main' into end-poll

Author: KentoNishi

package.json

@@ -11,7 +11,8 @@
     "start:chrome": "cross-env AUTOLAUNCH=true npm run dev:chrome",
     "start:firefox": "cross-env AUTOLAUNCH=true npm run dev:firefox",
     "lint": "npm run lint:check -- --fix",
-    "lint:check": "eslint src --max-warnings=0"
+    "lint:check": "eslint src --max-warnings=0",
+    "postinstall": "patch-package"
   },
   "dependencies": {
     "@livetl/svelte-webext-stores": "^0.0.14",
@@ -33,6 +34,7 @@
     "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-plugin-svelte3": "^3.2.0",
     "npm-run-all": "^4.1.5",
+    "patch-package": "^8.0.0",
     "postcss": "^8.4.31",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^14.0.2",

patches/vite-plugin-web-extension+1.4.9.patch

@@ -0,0 +1,26 @@
+diff --git a/node_modules/vite-plugin-web-extension/dist/index.cjs b/node_modules/vite-plugin-web-extension/dist/index.cjs
+index e02db3b..287502e 100644
+--- a/node_modules/vite-plugin-web-extension/dist/index.cjs
++++ b/node_modules/vite-plugin-web-extension/dist/index.cjs
+@@ -125,7 +125,7 @@ function resolveBrowserTagsInObject(browser, object) {
+ // src/validation.ts
+ var import_ajv = __toModule(require("ajv"));
+ var import_https = __toModule(require("https"));
+-var SCHEMA_URL = "https://json.schemastore.org/chrome-manifest";
++var SCHEMA_URL = "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/chrome-manifest.json";
+ async function validateManifest(log, manifest) {
+   const ajv = new import_ajv.default();
+   ajv.addFormat("permission", /.*/);
+diff --git a/node_modules/vite-plugin-web-extension/dist/index.js b/node_modules/vite-plugin-web-extension/dist/index.js
+index 21e6808..d4f9341 100644
+--- a/node_modules/vite-plugin-web-extension/dist/index.js
++++ b/node_modules/vite-plugin-web-extension/dist/index.js
+@@ -115,7 +115,7 @@ function resolveBrowserTagsInObject(browser, object) {
+ // src/validation.ts
+ import Ajv from "ajv";
+ import https from "https";
+-var SCHEMA_URL = "https://json.schemastore.org/chrome-manifest";
++var SCHEMA_URL = "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/chrome-manifest.json";
+ async function validateManifest(log, manifest) {
+   const ajv = new Ajv();
+   ajv.addFormat("permission", /.*/);

src/components/ChatSummary.svelte

@@ -5,6 +5,7 @@
   import Icon from 'smelte/src/components/Icon';
   import { Theme } from '../ts/chat-constants';
   import { createEventDispatcher } from 'svelte';
+  import { showTimestamps } from '../ts/storage';
 
   export let summary: Ytc.ParsedSummary;
 
@@ -55,6 +56,11 @@
             <span class="align-middle">{run.text}</span>
           {/if}
         {/each}
+        {#if summary.timestamp && $showTimestamps}
+          <span class="text-xs ml-1 text-gray-400 dark:text-gray-600 align-middle">
+            {summary.timestamp}
+          </span>
+        {/if}
       </div>
       <div class="flex-none self-end" style="transform: translateY(3px);">
         <Tooltip offsetY={0} small>

src/components/RedirectBanner.svelte

@@ -2,11 +2,11 @@
   import { slide, fade } from 'svelte/transition';
   import MessageRun from './MessageRuns.svelte';
   import Tooltip from './common/Tooltip.svelte';
+  import Button from 'smelte/src/components/Button';
   import Icon from 'smelte/src/components/Icon';
   import { Theme } from '../ts/chat-constants';
   import { createEventDispatcher } from 'svelte';
-  import { showProfileIcons } from '../ts/storage';
-  import Button from 'smelte/src/components/Button';
+  import { showProfileIcons, showTimestamps } from '../ts/storage';
 
   export let redirect: Ytc.ParsedRedirect;
 
@@ -53,6 +53,11 @@
           </Icon>
         </span>
         <span class="align-middle">Live Redirect Notice</span>
+        {#if redirect.timestamp && $showTimestamps}
+          <span class="text-xs ml-1 text-gray-400 dark:text-gray-600 align-middle">
+            {redirect.timestamp}
+          </span>
+        {/if}
       </div>
       <div class="flex-none self-end" style="transform: translateY(3px);">
         <Tooltip offsetY={0} small>

src/ts/chat-parser.ts

@@ -104,6 +104,7 @@ const parseChatSummary = (renderer: Ytc.AddChatItem, actionId: string, showtime:
       message: splitRuns[2],
     },
     showtime: showtime,
+    timestamp: formatTimestamp(Date.now() * 1000),
   };
   return item;
 }
@@ -139,6 +140,7 @@ const parseRedirectBanner = (renderer: Ytc.AddChatItem, actionId: string, showti
       }
     },
     showtime: showtime,
+    timestamp: formatTimestamp(Date.now() * 1000),
   };
   return item;
 }

src/ts/typings/ytc.d.ts

@@ -491,6 +491,7 @@ declare namespace Ytc {
       message: ParsedRun[];
     };
     showtime: number;
+    timestamp?: string;
   }
 
   interface ParsedRedirect {
@@ -505,6 +506,7 @@ declare namespace Ytc {
       }
     };
     showtime: number;
+    timestamp?: string;
   }
 
   interface ParsedPoll {