feat: enhance video blocking logic

castdrian · Dec 27, 2024 · f905b9e · f905b9e
1 parent 510c696
commit f905b9e
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 29 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,7 +7,7 @@
 			"command": "zsh",
 			"args": [
 				"-c",
-				"rm -rf packages && make clean && make package FINALPACKAGE=1 THEOS_PACKAGE_SCHEME=rootless && cp ./packages/*arm64.deb ~/Library/Mobile\\ Documents/com~apple~CloudDocs/ && cp ./.theos/obj/Gonerino.dylib ~/Library/Mobile\\ Documents/com~apple~CloudDocs/"
+				"rm -rf packages && make clean && make package"
 			],
 			"problemMatcher": {
 				"owner": "cpp",

diff --git a/Makefile b/Makefile
@@ -2,6 +2,7 @@ TARGET := iphone:clang:latest:14.0
 ARCHS = arm64
 INSTALL_TARGET_PROCESSES = YouTube
 THEOS_PACKAGE_SCHEME = rootless
+FINALPACKAGE = 1
 
 include $(THEOS)/makefiles/common.mk
 

diff --git a/Tweak.x b/Tweak.x
@@ -4,10 +4,14 @@
 
 - (void)layoutSubviews {
     %orig;
+    [self removeOffendingCells];
+}
 
+%new
+- (void)removeOffendingCells {
     __weak typeof(self) weakSelf = self;
 
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_async(dispatch_get_main_queue(), ^{
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if (!strongSelf)
             return;
@@ -50,31 +54,6 @@
     });
 }
 
-%new
-- (void)removeOffendingCells {
-    NSArray *visibleCells              = [self visibleCells];
-    NSMutableArray *indexPathsToRemove = [NSMutableArray array];
-
-    for (UICollectionViewCell *cell in visibleCells) {
-        if ([cell isKindOfClass:NSClassFromString(@"_ASCollectionViewCell")]) {
-            _ASCollectionViewCell *asCell = (_ASCollectionViewCell *)cell;
-            if ([asCell respondsToSelector:@selector(node)]) {
-                id node = [asCell node];
-                if ([Util nodeContainsBlockedVideo:node]) {
-                    NSIndexPath *indexPath = [self indexPathForCell:cell];
-                    if (indexPath) {
-                        [indexPathsToRemove addObject:indexPath];
-                    }
-                }
-            }
-        }
-    }
-
-    if (indexPathsToRemove.count > 0) {
-        [self performBatchUpdates:^{ [self deleteItemsAtIndexPaths:indexPathsToRemove]; } completion:nil];
-    }
-}
-
 %end
 
 %hook YTDefaultSheetController

diff --git a/Util.m b/Util.m
@@ -79,11 +79,58 @@ + (void)extractVideoInfoFromNode:(id)node
 }
 
 + (BOOL)nodeContainsBlockedVideo:(id)node {
+    if ([node respondsToSelector:@selector(accessibilityLabel)]) {
+        NSString *accessibilityLabel = [node accessibilityLabel];
+        if (accessibilityLabel) {
+            if ([[WordManager sharedInstance] isWordBlocked:accessibilityLabel]) {
+                NSLog(@"[Gonerino] Blocking video because of blocked word: %@", accessibilityLabel);
+                return YES;
+            }
+        }
+    }
+
+    if ([node isKindOfClass:NSClassFromString(@"ASTextNode")]) {
+        NSAttributedString *attributedText = [(ASTextNode *)node attributedText];
+        NSString *text                     = [attributedText string];
+
+        if ([[WordManager sharedInstance] isWordBlocked:text]) {
+            NSLog(@"[Gonerino] Blocking content with blocked word: %@", text);
+            return YES;
+        }
+
+        if ([text containsString:@" · "]) {
+            NSArray *components = [text componentsSeparatedByString:@" · "];
+            if (components.count >= 1) {
+                NSString *potentialChannelName = components[0];
+                if ([[ChannelManager sharedInstance] isChannelBlocked:potentialChannelName]) {
+                    NSLog(@"[Gonerino] Blocking content from blocked channel: %@", potentialChannelName);
+                    return YES;
+                }
+            }
+        }
+    }
+
+    if ([node respondsToSelector:@selector(channelName)]) {
+        NSString *nodeChannelName = [node channelName];
+        if ([[ChannelManager sharedInstance] isChannelBlocked:nodeChannelName]) {
+            NSLog(@"[Gonerino] Blocking content from blocked channel: %@", nodeChannelName);
+            return YES;
+        }
+    }
+
+    if ([node respondsToSelector:@selector(ownerName)]) {
+        NSString *nodeOwnerName = [node ownerName];
+        if ([[ChannelManager sharedInstance] isChannelBlocked:nodeOwnerName]) {
+            NSLog(@"[Gonerino] Blocking content from blocked channel: %@", nodeOwnerName);
+            return YES;
+        }
+    }
+
     __block BOOL isBlocked = NO;
 
     if ([node isKindOfClass:NSClassFromString(@"ASTextNode")]) {
         NSAttributedString *attributedText = [(ASTextNode *)node attributedText];
-        NSString *text = [attributedText string];
+        NSString *text                     = [attributedText string];
 
         if ([[NSUserDefaults standardUserDefaults] boolForKey:@"GonerinoPeopleWatched"] &&
             [text isEqualToString:@"People also watched this video"]) {

diff --git a/control b/control
@@ -1,6 +1,6 @@
 Package: dev.adrian.gonerino
 Name: Gonerino
-Version: 1.0.1
+Version: 1.1.0
 Architecture: iphoneos-arm
 Description: Remove videos uploaded by specific channels
 Maintainer: Adrian Castro