Add WIP implementation of #177

src/common/ts/wasChannelSubscriber.ts

@@ -0,0 +1,12 @@
+import store from "../../store";
+
+export default function wasChannelSubscriber(
+  channelName: string | null
+): boolean {
+  if (!channelName) return false;
+  const activeChannelSubscriptionsLower =
+    store.state.activeChannelSubscriptions.map(channel =>
+      channel.toLowerCase()
+    );
+  return activeChannelSubscriptionsLower.includes(channelName.toLowerCase());
+}

src/content/content.ts

@@ -2,8 +2,10 @@ import pageScriptURL from "url:../page/page.ts";
 import workerScriptURL from "url:../page/worker.ts";
 import browser, { Storage } from "webextension-polyfill";
 import findChannelFromTwitchTvUrl from "../common/ts/findChannelFromTwitchTvUrl";
+import isChannelWhitelisted from "../common/ts/isChannelWhitelisted";
 import isChromium from "../common/ts/isChromium";
 import { getStreamStatus, setStreamStatus } from "../common/ts/streamStatus";
+import wasChannelSubscriber from "../common/ts/wasChannelSubscriber";
 import store from "../store";
 import type { State } from "../store/types";
 import { MessageType } from "../types";
@@ -64,6 +66,7 @@ function onStoreChange(changes: Record<string, Storage.StorageChange>) {
   // This is mainly to reduce the amount of messages sent to the page script.
   // (Also to reduce the number of console logs.)
   const ignoredKeys: (keyof State)[] = [
+    "activeChannelSubscriptions",
     "adLog",
     "dnsResponses",
     "openedTwitchTabs",
@@ -102,8 +105,8 @@ function onPageMessage(event: MessageEvent) {
   const message = event.data?.message;
   if (!message) return;
 
-  switch (message.type) {
-    case MessageType.GetStoreState:
+  // GetStoreState
+  if (message.type === MessageType.GetStoreState) {
     const sendStoreState = () => {
       window.postMessage({
         type: MessageType.PageScriptMessage,
@@ -115,8 +118,9 @@ function onPageMessage(event: MessageEvent) {
     };
     if (store.readyState === "complete") sendStoreState();
     else store.addEventListener("load", sendStoreState);
-      break;
-    case MessageType.EnableFullMode:
+  }
+  // EnableFullMode
+  else if (message.type === MessageType.EnableFullMode) {
     try {
       browser.runtime.sendMessage(message);
     } catch (error) {
@@ -125,8 +129,9 @@ function onPageMessage(event: MessageEvent) {
         error
       );
     }
-      break;
-    case MessageType.DisableFullMode:
+  }
+  // DisableFullMode
+  else if (message.type === MessageType.DisableFullMode) {
     try {
       browser.runtime.sendMessage(message);
     } catch (error) {
@@ -135,8 +140,61 @@ function onPageMessage(event: MessageEvent) {
         error
       );
     }
-      break;
-    case MessageType.UsherResponse:
+  }
+  // ChannelSubscriptionStatus
+  else if (message.type === MessageType.ChannelSubscriptionStatus) {
+    const { channelName, isSubscribed, scope } = message;
+    const wasSubscribed = wasChannelSubscriber(channelName);
+    let isWhitelisted = isChannelWhitelisted(channelName);
+    console.log(
+      "[TTV LOL PRO] Received channel subscription status message. Current state:",
+      {
+        wasSubscribed,
+        isSubscribed,
+        isWhitelisted,
+      }
+    );
+    if (store.state.whitelistChannelSubscriptions && channelName != null) {
+      if (!wasSubscribed && isSubscribed) {
+        store.state.activeChannelSubscriptions.push(channelName);
+        // Add to whitelist.
+        if (!isWhitelisted) {
+          console.log(`[TTV LOL PRO] Adding '${channelName}' to whitelist.`);
+          store.state.whitelistedChannels.push(channelName);
+          isWhitelisted = true;
+        }
+      } else if (wasSubscribed && !isSubscribed) {
+        store.state.activeChannelSubscriptions =
+          store.state.activeChannelSubscriptions.filter(
+            c => c.toLowerCase() !== channelName.toLowerCase()
+          );
+        // Remove from whitelist.
+        if (isWhitelisted) {
+          console.log(
+            `[TTV LOL PRO] Removing '${channelName}' from whitelist.`
+          );
+          store.state.whitelistedChannels =
+            store.state.whitelistedChannels.filter(
+              c => c.toLowerCase() !== channelName.toLowerCase()
+            );
+          isWhitelisted = false;
+        }
+      }
+    }
+    console.log("[TTV LOL PRO] Sending channel subscription status response.");
+    window.postMessage({
+      type:
+        scope === "page" // TODO: Is this necessary? Isn't the scope always "worker"?
+          ? MessageType.PageScriptMessage
+          : MessageType.WorkerScriptMessage,
+      message: {
+        type: MessageType.ChannelSubscriptionStatusResponse,
+        isWhitelisted: isWhitelisted,
+      },
+    });
+  }
+  // UsherResponse
+  else if (message.type === MessageType.UsherResponse) {
     try {
       browser.runtime.sendMessage(message);
     } catch (error) {
@@ -145,18 +203,19 @@ function onPageMessage(event: MessageEvent) {
         error
       );
     }
-      break;
-    case MessageType.MultipleAdBlockersInUse:
+  }
+  // MultipleAdBlockersInUse
+  else if (message.type === MessageType.MultipleAdBlockersInUse) {
     const channelName = findChannelFromTwitchTvUrl(location.href);
-      if (!channelName) break;
+    if (!channelName) return;
     const streamStatus = getStreamStatus(channelName);
     setStreamStatus(channelName, {
       ...(streamStatus ?? { proxied: false }),
       reason: "Another Twitch ad blocker is in use",
     });
-      break;
-    case MessageType.ClearStats:
+  }
+  // ClearStats
+  else if (message.type === MessageType.ClearStats) {
     clearStats(message.channelName);
-      break;
   }
 }

src/options/options.ts

@@ -75,6 +75,9 @@ const passportLevelProxyUsageWwwElement = $(
 const whitelistedChannelsListElement = $(
   "#whitelisted-channels-list"
 ) as HTMLUListElement;
+const whitelistSubscriptionsCheckboxElement = $(
+  "#whitelist-subscriptions-checkbox"
+) as HTMLInputElement;
 // Proxies
 const optimizedProxiesInputElement = $("#optimized") as HTMLInputElement;
 const optimizedProxiesListElement = $(
@@ -163,6 +166,12 @@ function main() {
       return [true];
     },
   });
+  whitelistSubscriptionsCheckboxElement.checked =
+    store.state.whitelistChannelSubscriptions;
+  whitelistSubscriptionsCheckboxElement.addEventListener("change", () => {
+    store.state.whitelistChannelSubscriptions =
+      whitelistSubscriptionsCheckboxElement.checked;
+  });
   // Proxies
   if (store.state.optimizedProxiesEnabled)
     optimizedProxiesInputElement.checked = true;
@@ -548,6 +557,7 @@ exportButtonElement.addEventListener("click", () => {
     optimizedProxies: store.state.optimizedProxies,
     optimizedProxiesEnabled: store.state.optimizedProxiesEnabled,
     passportLevel: store.state.passportLevel,
+    whitelistChannelSubscriptions: store.state.whitelistChannelSubscriptions,
     whitelistedChannels: store.state.whitelistedChannels,
   };
   saveFile(

src/options/page.html

@@ -138,6 +138,23 @@
             Twitch tabs are whitelisted channels.
           </small>
           <ul id="whitelisted-channels-list" class="store-list"></ul>
+          <ul class="options-list">
+            <li>
+              <input
+                type="checkbox"
+                name="whitelist-subscriptions-checkbox"
+                id="whitelist-subscriptions-checkbox"
+              />
+              <label for="whitelist-subscriptions-checkbox">
+                Automatically whitelist channels you're subscribed to
+              </label>
+              <br />
+              <small>
+                This option will automatically add or remove channels from the
+                whitelist based on your subscriptions.
+              </small>
+            </li>
+          </ul>
         </section>
 
         <!-- Proxies -->

src/page/getFetch.ts

@@ -265,7 +265,42 @@ export function getFetch(pageState: PageState): typeof fetch {
         encodeURIComponent('"player_type":"frontpage"')
       );
       const channelName = findChannelFromUsherUrl(url);
-      const isWhitelisted = isChannelWhitelisted(channelName, pageState);
+      let isWhitelisted = isChannelWhitelisted(channelName, pageState);
+      if (
+        pageState.state?.whitelistChannelSubscriptions &&
+        channelName != null
+      ) {
+        const wasSubscribed = wasChannelSubscriber(channelName, pageState);
+        const isSubscribed = url.includes(
+          encodeURIComponent('"subscriber":true')
+        );
+        // const isSubscribed = url.includes(
+        //   encodeURIComponent("aminematue")
+        // );
+        const hasSubStatusChanged =
+          (wasSubscribed && !isSubscribed) || (!wasSubscribed && isSubscribed);
+        if (hasSubStatusChanged) {
+          console.log(
+            "[TTV LOL PRO] Channel subscription status changed. Sending message…"
+          );
+          try {
+            const response =
+              await pageState.sendMessageToContentScriptAndWaitForResponse(
+                pageState.scope,
+                {
+                  type: MessageType.ChannelSubscriptionStatus,
+                  scope: pageState.scope,
+                  channelName,
+                  isSubscribed,
+                },
+                MessageType.ChannelSubscriptionStatusResponse
+              );
+            if (typeof response.isWhitelisted === "boolean") {
+              isWhitelisted = response.isWhitelisted;
+            }
+          } catch {}
+        }
+      }
       if (!isLivestream || isFrontpage || isWhitelisted) {
         console.log(
           "[TTV LOL PRO] Not flagging Usher request: not a livestream, is frontpage, or is whitelisted."
@@ -623,6 +658,18 @@ function isChannelWhitelisted(
   return whitelistedChannelsLower.includes(channelName.toLowerCase());
 }
 
+function wasChannelSubscriber(
+  channelName: string | null | undefined,
+  pageState: PageState
+): boolean {
+  if (!channelName) return false;
+  const activeChannelSubscriptionsLower =
+    pageState.state?.activeChannelSubscriptions.map(channel =>
+      channel.toLowerCase()
+    ) ?? [];
+  return activeChannelSubscriptionsLower.includes(channelName.toLowerCase());
+}
+
 async function flagRequest(
   request: Request,
   requestType: ProxyRequestType,

src/store/getDefaultState.ts

@@ -3,6 +3,7 @@ import type { State } from "./types";
 
 export default function getDefaultState() {
   const state: State = {
+    activeChannelSubscriptions: [],
     adLog: [],
     adLogEnabled: true,
     adLogLastSent: 0,
@@ -18,6 +19,7 @@ export default function getDefaultState() {
     passportLevel: 0,
     streamStatuses: {},
     videoWeaverUrlsByChannel: {},
+    whitelistChannelSubscriptions: true,
     whitelistedChannels: [],
   };
   return state;

src/store/types.ts

@@ -6,6 +6,7 @@ export type ReadyState = "loading" | "complete";
 export type StorageAreaName = "local" | "managed" | "sync";
 
 export interface State {
+  activeChannelSubscriptions: string[];
   adLog: AdLogEntry[];
   adLogEnabled: boolean;
   adLogLastSent: number;
@@ -19,6 +20,7 @@ export interface State {
   passportLevel: number;
   streamStatuses: Record<string, StreamStatus>;
   videoWeaverUrlsByChannel: Record<string, string[]>;
+  whitelistChannelSubscriptions: boolean;
   whitelistedChannels: string[];
 }
 

src/types.ts

@@ -79,6 +79,8 @@ export const enum MessageType {
   EnableFullMode = "TLP_EnableFullMode",
   EnableFullModeResponse = "TLP_EnableFullModeResponse",
   DisableFullMode = "TLP_DisableFullMode",
+  ChannelSubscriptionStatus = "TLP_ChannelSubscriptionStatus",
+  ChannelSubscriptionStatusResponse = "TLP_ChannelSubscriptionStatusResponse",
   UsherResponse = "TLP_UsherResponse",
   NewPlaybackAccessToken = "TLP_NewPlaybackAccessToken",
   NewPlaybackAccessTokenResponse = "TLP_NewPlaybackAccessTokenResponse",