🔖 Release version 2.2.1

younesaassila · Oct 10, 2023 · 44e31a1 · 44e31a1
2 parents 65773c4 + 46a3d47
commit 44e31a1
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ttv-lol-pro",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "TTV LOL PRO removes most livestream ads from Twitch.",
   "@parcel/bundler-default": {
     "minBundles": 10000000,

diff --git a/src/manifest.chromium.json b/src/manifest.chromium.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "TTV LOL PRO",
   "description": "TTV LOL PRO removes most livestream ads from Twitch.",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "background": {
     "service_worker": "background/background.ts",
     "type": "module"

diff --git a/src/manifest.firefox.json b/src/manifest.firefox.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "TTV LOL PRO",
   "description": "TTV LOL PRO removes most livestream ads from Twitch.",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "background": {
     "scripts": ["background/background.ts"],
     "persistent": false

diff --git a/src/options/page.html b/src/options/page.html
@@ -92,6 +92,7 @@ <h2>Passport</h2>
               <label for="anonymous-mode-checkbox">
                 Redact my passport information
               </label>
+              <span class="tag">Recommended</span>
               <br />
               <small>
                 Watch streams as if you were logged out. This option removes

diff --git a/src/page/getFetch.ts b/src/page/getFetch.ts
@@ -28,7 +28,7 @@ export function getFetch(options: FetchOptions): typeof fetch {
   if (options.shouldWaitForStore) {
     setTimeout(() => {
       options.shouldWaitForStore = false;
-    }, 3000);
+    }, 5000);
   }
 
   return async function fetch(
@@ -87,15 +87,35 @@ export function getFetch(options: FetchOptions): typeof fetch {
         console.debug(
           "[TTV LOL PRO] 🥅 Caught GraphQL PlaybackAccessToken_Template request. Flagging…"
         );
+
         while (options.shouldWaitForStore) await sleep(100);
-        if (options.state?.anonymousMode) {
-          console.log("[TTV LOL PRO] ❓ Acting as anonymous user");
-          setHeaderToMap(headersMap, "Authorization", "undefined");
-          removeHeaderFromMap(headersMap, "Client-Session-Id");
-          removeHeaderFromMap(headersMap, "Client-Version");
-          setHeaderToMap(headersMap, "Device-ID", generateRandomString(32));
-          removeHeaderFromMap(headersMap, "Sec-GPC");
-          removeHeaderFromMap(headersMap, "X-Device-Id");
+        let graphQlBody = null;
+        try {
+          graphQlBody = JSON.parse(requestBody);
+        } catch {}
+        const channelName = graphQlBody?.variables?.login as string | undefined;
+        const whitelistedChannelsLower = options.state?.whitelistedChannels.map(
+          channel => channel.toLowerCase()
+        );
+        const isWhitelisted =
+          channelName != null &&
+          whitelistedChannelsLower != null &&
+          whitelistedChannelsLower.includes(channelName.toLowerCase());
+
+        if (options.state?.anonymousMode === true) {
+          if (!isWhitelisted) {
+            console.log("[TTV LOL PRO] 🕵️ Anonymous mode is enabled.");
+            setHeaderToMap(headersMap, "Authorization", "undefined");
+            removeHeaderFromMap(headersMap, "Client-Session-Id");
+            removeHeaderFromMap(headersMap, "Client-Version");
+            setHeaderToMap(headersMap, "Device-ID", generateRandomString(32));
+            removeHeaderFromMap(headersMap, "Sec-GPC");
+            removeHeaderFromMap(headersMap, "X-Device-Id");
+          } else {
+            console.log(
+              "[TTV LOL PRO] 🕵️✋ Anonymous mode is enabled but channel is whitelisted."
+            );
+          }
         }
         flagRequest(headersMap);
       } else if (