fix: just don't do anything anymore

Nerixyz · Nov 29, 2022 · 22b9097 · 22b9097
1 parent 88379ed
commit 22b9097
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ videos
 .idea
 .code
 .vscode
+ak
+as
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "TTV-Tools",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "Common helpers when watching twitch",
   "background": {
     "scripts": [

diff --git a/src/background/background.ts b/src/background/background.ts
@@ -6,10 +6,6 @@ import { onAdPod, StreamTabs } from './ad.replacement';
 import { TWITCH_USER_PAGE } from './utilities/request.utilities';
 import { eventHandler } from './utilities/messaging';
 import { TwitchStitchedAdData } from './twitch-m3u8.types';
-import { parseMediaPlaylist } from './hls/hls-parser';
-import { writePlaylist } from './hls/hls-writer';
-import { mergePlayer } from './player-merging';
-
 function onRequest(request: _OnBeforeRequestDetails) {
   if (!request.url.includes('video-weaver')) return;
 
@@ -33,7 +29,7 @@ function onRequest(request: _OnBeforeRequestDetails) {
     };
 
     extractAdData(text, request.documentUrl ?? '', request.tabId);
-    finalWrite(await mergePlayer(request.tabId, text));
+    finalWrite(cleanupAllAdStuff(text));
   };
 
   filter.onstop = () => {
@@ -94,8 +90,7 @@ function cleanupAllAdStuff(data: string) {
       'X-TV-TWITCH-AD-CLICK-TRACKING-URL="javascript:alert(\'pogo\')"'
     )
     .replace(/X-TV-TWITCH-AD-ADVERIFICATIONS="[^"]+"/g, `X-TV-TWITCH-AD-ADVERIFICATIONS="${btoa('{}')}"`)
-    .replace(/#EXT-X-DATERANGE.+CLASS=".*ad.*".+\n/g, '')
-    .replace(/\n#EXTINF.+(?<!live)\nhttps:.+/g, '');
+    .replace(/#EXT-X-DATERANGE.+CLASS=".*ad.*".+\n/g, '');
 }
 
 function extractAdData(data: string, doc: string, tabId: number) {