fix client side ad blocking, block feed ads

Tweak.h

@@ -2,7 +2,12 @@
 #import <Twitch/FollowingViewController.h>
 #import <Twitch/HeadlinerFollowingAdManager.h>
 #import <Twitch/LiveHLSURLProvider.h>
+#import <Twitch/TheaterViewController.h>
 #import <TwitchCoreUI/TWDefaultThemeManager.h>
 #import <TwitchKit/TKGraphQL.h>
 
+@interface _TtC6Twitch21TheaterViewController ()
+- (void)removeAdControllers;
+@end
+
 static NSMutableDictionary<NSString *, TWHLSProvider *> *providers;

Tweak.xm

@@ -48,12 +48,24 @@ static NSData *TWAdBlockData(NSURLRequest *request, NSData *data) {
 }
 %end
 
-%hook _TtC6Twitch14VASTAdProvider
-- (instancetype)init {
-  if ((self = %orig)) {
-    MSHookIvar<NSInteger>(self, "adLoadingTimeout") = -1;
-  }
-  return self;
+%hook _TtC6Twitch21TheaterViewController
+%new
+- (void)removeAdControllers {
+  _TtC6Twitch19TheaterAdController *theaterAdController =
+      MSHookIvar<_TtC6Twitch19TheaterAdController *>(self, "theaterAdController");
+  [@[ @"displayAdController", @"streamDisplayAdStateManager", @"vastAdController" ]
+      enumerateObjectsUsingBlock:^(NSString *name, NSUInteger idx, BOOL *stop) {
+        if (class_getInstanceVariable(object_getClass(theaterAdController), name.UTF8String))
+          MSHookIvar<id>(theaterAdController, name.UTF8String) = NULL;
+      }];
+}
+- (void)viewDidLoad {
+  %orig;
+  [NSTimer scheduledTimerWithTimeInterval:1
+                                   target:self
+                                 selector:@selector(removeAdControllers)
+                                 userInfo:nil
+                                  repeats:YES];
 }
 %end
 
@@ -117,6 +129,29 @@ static NSData *TWAdBlockData(NSURLRequest *request, NSData *data) {
 }
 %end
 
+%hook _TtC9TwitchKit18TKURLSessionClient
+- (void)URLSession:(NSURLSession *)session
+          dataTask:(NSURLSessionDataTask *)dataTask
+    didReceiveData:(NSData *)data {
+  if (![NSUserDefaults.standardUserDefaults boolForKey:@"TWAdBlockEnabled"] || !data)
+    return %orig;
+  NSError *error;
+  NSMutableArray *json = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&error];
+  if (!json || error) return %orig;
+  if ([json isKindOfClass:NSArray.class]) {
+    for (NSDictionary *operation in json) {
+      NSMutableDictionary *feedItems = operation[@"data"][@"feedItems"];
+      if (feedItems)
+        feedItems[@"edges"] = [feedItems[@"edges"] filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"self.node.__typename != 'FeedAd'"]];
+    }
+  }
+  NSData *modifiedData = [NSJSONSerialization dataWithJSONObject:json options:0 error:&error];
+  if (error) return %orig;
+  data = modifiedData;
+  %orig;
+}
+%end
+
 %hook _TtC6Twitch18LiveHLSURLProvider
 - (NSURL *)manifestURLWithToken:(NSString *)token
                 tokenDictionary:(NSDictionary *)tokenDictionary

include/Twitch/TheaterAdController.h

@@ -0,0 +1,4 @@
+#import <Foundation/Foundation.h>
+
+@interface _TtC6Twitch19TheaterAdController
+@end

include/Twitch/TheaterViewController.h

@@ -0,0 +1,7 @@
+#import <UIKit/UIKit.h>
+#import "TheaterAdController.h"
+
+@interface _TtC6Twitch21TheaterViewController : UIViewController {
+  _TtC6Twitch19TheaterAdController *theaterAdController;
+}
+@end