3 way merge from mv3

LiveTL · May 29, 2023 · 3049c12 · 3049c12
1 parent 55ff56e
commit 3049c12
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/src/components/Hyperchat.svelte b/src/components/Hyperchat.svelte
@@ -40,7 +40,8 @@
     enableStickySuperchatBar,
     lastOpenedVersion,
     selfChannelName,
-    enableHighlightedMentions
+    enableHighlightedMentions,
+    ytDark
   } from '../ts/storage';
   import { version } from '../manifest.json';
 
@@ -56,7 +57,6 @@
   let isAtBottom = true;
   let truncateInterval: number;
   const isReplay = paramsIsReplay;
-  let ytDark = false;
   const smelteDark = dark();
 
   type MessageBlocker = (a: Chat.MessageAction) => boolean;
@@ -226,7 +226,7 @@
         $selfChannel = response.selfChannel;
         break;
       case 'themeUpdate':
-        ytDark = response.dark;
+        $ytDark = response.dark;
         break;
       case 'chatUserActionResponse':
         $alertDialog = {
@@ -305,13 +305,13 @@
     if (truncateInterval) window.clearInterval(truncateInterval);
   });
 
-  $: updateTheme($theme, ytDark);
+  $: updateTheme($theme, $ytDark);
   // Scroll to bottom when any of these settings change
   $: ((..._a: any[]) => scrollToBottom())(
     $showProfileIcons, $showUsernames, $showTimestamps, $showUserBadges
   );
 
-  const containerClass = 'h-screen w-screen text-black dark:text-white bg-ytbg-light dark:bg-ytbg-dark flex flex-col justify-between';
+  const containerClass = 'h-screen w-screen text-black dark:text-white bg-white bg-ytbg-light dark:bg-ytbg-dark flex flex-col justify-between';
 
   const isSuperchat = (action: Chat.MessageAction) => (action.message.superChat || action.message.superSticker);
   const isMembership = (action: Chat.MessageAction) => (action.message.membership || action.message.membershipGiftPurchase);

diff --git a/src/components/StickyBar.svelte b/src/components/StickyBar.svelte
@@ -40,7 +40,7 @@
 {#if open}
   <div
     class="w-full overflow-y-hidden overflow-x-scroll scroll-on-hover items-start flex-none"
-    style="--scrollbar-bg-color: #{$isDark ? '202020' : 'ffffff'};"
+    style="--scrollbar-bg-color: #{$isDark ? '0f0f0f' : 'ffffff'};"
     bind:this={scrollableElem}
   >
     <div

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,9 +1,9 @@
 {
   "manifest_version": 2,
-  "name": "HyperChat by LiveTL",
+  "name": "HyperChat [Improved YouTube Chat]",
   "homepage_url": "https://livetl.app/en/hyperchat/",
   "description": "Improved YouTube chat with CPU/RAM optimizations, customization options, and cutting-edge features!",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "permissions": [
     "storage"
   ],

diff --git a/src/scripts/chat-injector.ts b/src/scripts/chat-injector.ts
@@ -46,7 +46,7 @@ const chatLoaded = async (): Promise<void> => {
   const params = new URLSearchParams();
   params.set('tabid', frameInfo.tabId.toString());
   params.set('frameid', frameInfo.frameId.toString());
-  if (frameIsReplay) params.set('isReplay', 'true');
+  if (frameIsReplay()) params.set('isReplay', 'true');
   const source = chrome.runtime.getURL(
     (isLiveTL ? 'hyperchat/index.html' : 'hyperchat.html') +
     `?${params.toString()}`

diff --git a/src/scripts/chat-interceptor.ts b/src/scripts/chat-interceptor.ts
@@ -47,7 +47,7 @@ const chatLoaded = async (): Promise<void> => {
 
   // Register interceptor
   const port: Chat.Port = chrome.runtime.connect();
-  port.postMessage({ type: 'registerInterceptor', source: 'ytc', isReplay });
+  port.postMessage({ type: 'registerInterceptor', source: 'ytc', isReplay: isReplay() });
 
   // Send JSON response to clients
   window.addEventListener('messageReceive', (d) => {

diff --git a/src/ts/chat-utils.ts b/src/ts/chat-utils.ts
@@ -9,9 +9,15 @@ export const createPopup = (url: string): void => {
   chrome.runtime.sendMessage({ type: 'createPopup', url });
 };
 
-export const frameIsReplay = window.location.href.startsWith(
-  `${(location.protocol + '//' + location.host)}/live_chat_replay`
-);
+export const frameIsReplay = (): boolean => {
+  try {
+    return window.location.href.startsWith(
+      `${(location.protocol + '//' + location.host)}/live_chat_replay`
+    );
+  } catch (e) {
+    return false;
+  }
+};
 
 /*
  * Type predicates

diff --git a/src/ts/storage.ts b/src/ts/storage.ts
@@ -75,6 +75,7 @@ export const isDark = derived(theme, ($theme) => {
     $theme === Theme.YOUTUBE && window.location.search.includes('dark')
   );
 });
+export const ytDark = writable(false);
 export const currentProgress = writable(null as null | number);
 export const enableStickySuperchatBar = stores.addSyncStore('hc.enableStickySuperchatBar', true);
 export const enableHighlightedMentions = stores.addSyncStore('hc.enableHighlightedMentions', true);