Add native SponsorBlock integration

.github/workflows/ipa.yml

@@ -86,18 +86,6 @@ on:
         required: false
         type: boolean
 
-      ytholdspeed:
-        description: "Integrate YTHoldForSpeed"
-        default: true
-        required: false
-        type: boolean
-
-      youchoose:
-        description: "Integrate YouChooseQuality"
-        default: true
-        required: false
-        type: boolean
-
       youshare:
         description: "Integrate YouShare"
         default: true
@@ -148,12 +136,14 @@ jobs:
       - name: Install MEGA downloader
         if: ${{ startsWith(inputs.ipa_url, 'https://mega.nz/') }}
         run: brew install megatools
+
       - name: Download IPA from Mega share link
         if: ${{ startsWith(inputs.ipa_url, 'https://mega.nz/') }}
         env:
           IPA_URL: ${{ inputs.ipa_url }}
         run: |
           megadl --no-progress --path youtube.ipa "$IPA_URL"
+
       - name: Download IPA from direct URL
         if: ${{ !startsWith(inputs.ipa_url, 'https://mega.nz/') }}
         env:
@@ -287,6 +277,10 @@ jobs:
         if: ${{ inputs.youspeed }}
         run: git clone --quiet --depth=1 https://github.com/PoomSmart/YouSpeed.git
 
+      - name: Clone UncappedAVPlayer
+        if: ${{ inputs.youspeed }}
+        run: git clone --quiet --depth=1 https://github.com/PoomSmart/UncappedAVPlayer.git
+
       - name: Clone DontEatMyContent
         if: ${{ inputs.demc }}
         run: git clone --quiet --depth=1 https://github.com/therealFoxster/DontEatMyContent.git
@@ -315,14 +309,6 @@ jobs:
         if: ${{ inputs.youslider && steps.cache-alderis.outputs.cache-hit != 'true' }}
         run: git clone --quiet --depth=1 https://github.com/hbang/Alderis.git
 
-      - name: Clone YTHoldForSpeed
-        if: ${{ inputs.ytholdspeed }}
-        run: git clone --quiet --depth=1 https://github.com/joshuaseltzer/YTHoldForSpeed.git
-
-      - name: Clone YouChooseQuality
-        if: ${{ inputs.youchoose }}
-        run: git clone --quiet https://github.com/PoomSmart/YouChooseQuality.git
-
       - name: Clone YouShare
         if: ${{ inputs.youshare }}
         run: git clone --quiet --depth=1 https://github.com/Tonwalter888/YouShare.git
@@ -409,6 +395,13 @@ jobs:
           make clean package DEBUG=0 FINALPACKAGE=1 THEOS_PACKAGE_SCHEME=rootless
           mv packages/*.deb ${{ github.workspace }}/youspeed.deb
 
+      - name: Build UncappedAVPlayer
+        if: ${{ inputs.youspeed }}
+        run: |
+          cd UncappedAVPlayer
+          make clean package DEBUG=0 FINALPACKAGE=1 THEOS_PACKAGE_SCHEME=rootless
+          mv packages/*.deb ${{ github.workspace }}/uncapavplayer.deb
+
       - name: Build DontEatMyContent
         if: ${{ inputs.demc }}
         run: |
@@ -444,21 +437,6 @@ jobs:
           make clean package DEBUG=0 FINALPACKAGE=1 ARCHS=arm64
           mv packages/*.deb ${{ github.workspace }}/alderis.deb
 
-      - name: Build YTHoldForSpeed
-        if: ${{ inputs.ytholdspeed }}
-        run: |
-          cd YTHoldForSpeed
-          make clean package DEBUG=0 FINALPACKAGE=1 THEOS_PACKAGE_SCHEME=rootless TARGET=iphone:clang:latest:15.0 ARCHS=arm64
-          mv packages/*.deb ${{ github.workspace }}/ytholdspeed.deb
-
-      - name: Build YouChooseQuality
-        if: ${{ inputs.youchoose }}
-        run: |
-          cd YouChooseQuality
-          git checkout 1585a3691b2ef0b59d42c40c31639fd8b79e2cd4
-          make clean package DEBUG=0 FINALPACKAGE=1 THEOS_PACKAGE_SCHEME=rootless
-          mv packages/*.deb ${{ github.workspace }}/youchoose.deb
-
       - name: Build YouShare
         if: ${{ inputs.youshare }}
         run: |

Files/Ads.x

@@ -12,6 +12,7 @@ static BOOL isProductList(YTICommand *command) {
 NSString *getAdString(NSString *description) {
     for (NSString *str in @[
         @"brand_promo",
+        @"brand_video_singleton",
         @"carousel_footered_layout",
         @"carousel_headered_layout",
         @"eml.expandable_metadata",
@@ -31,6 +32,7 @@ NSString *getAdString(NSString *description) {
         @"text_search_ad",
         @"video_display_full_layout",
         @"video_display_full_buttoned_layout"
+        // @"video_display_button_group_layout"
     ])
         if ([description containsString:str]) return str;
     return nil;
@@ -51,18 +53,70 @@ static BOOL isAdRenderer(YTIElementRenderer *elementRenderer, int kind) {
 static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItemSectionRenderer *> *array) {
     NSMutableArray <YTIItemSectionRenderer *> *newArray = [array mutableCopy];
     NSIndexSet *removeIndexes = [newArray indexesOfObjectsPassingTest:^BOOL(YTIItemSectionRenderer *sectionRenderer, NSUInteger idx, BOOL *stop) {
+        // Filter shelf renderer items (ads and shorts)
         if ([sectionRenderer isKindOfClass:%c(YTIShelfRenderer)]) {
             YTIShelfSupportedRenderers *content = ((YTIShelfRenderer *)sectionRenderer).content;
             YTIHorizontalListRenderer *horizontalListRenderer = content.horizontalListRenderer;
             NSMutableArray <YTIHorizontalListSupportedRenderers *> *itemsArray = horizontalListRenderer.itemsArray;
             NSIndexSet *removeItemsArrayIndexes = [itemsArray indexesOfObjectsPassingTest:^BOOL(YTIHorizontalListSupportedRenderers *horizontalListSupportedRenderers, NSUInteger idx2, BOOL *stop2) {
                 YTIElementRenderer *elementRenderer = horizontalListSupportedRenderers.elementRenderer;
-                return isAdRenderer(elementRenderer, 4);
+                // Filter ads
+                if (isAdRenderer(elementRenderer, 4)) return YES;
+                NSString *description = [elementRenderer description];
+                // Filter shorts
+                if (IS_ENABLED(HideShortsShelf)) {
+                    if (IS_ENABLED(KeepShortsSubscript)) {
+                        if ([description containsString:@"shorts_video_cell.eml"] && ![description containsString:@"subscriptions-shorts-shelf-item"]) return YES;
+                    } else {
+                        if ([description containsString:@"shorts_video_cell.eml"]) return YES;
+                    }
+                    if ([description containsString:@"shorts_grid_shelf_footer.eml"] || ([description containsString:@"shelf_header.eml"] && [description containsString:@"youtube_shorts"])) return YES;
+                }
+                // Filter feed posts
+                if (IS_ENABLED(HideFeedPost) && ([description containsString:@"poll_post_root.eml"] || [description containsString:@"options_post_root.eml"] || [description containsString:@"images_post_root_slim.eml"] || [description containsString:@"options_post_responsive_root.eml"] || [description containsString:@"post_base_wrapper_slim.eml"])) {
+                    return YES;
+                }
+                return NO;
             }];
             [itemsArray removeObjectsAtIndexes:removeItemsArrayIndexes];
         }
-        if (![sectionRenderer isKindOfClass:%c(YTIItemSectionRenderer)])
-            return NO;
+
+        // Filter item section renderers
+        if (![sectionRenderer isKindOfClass:%c(YTIItemSectionRenderer)]) return NO;
+
+        NSString *description = [sectionRenderer description];
+
+        // Filter shorts shelf
+        BOOL isShortsShelf = [description containsString:@"shorts_shelf.eml"];
+        BOOL isHistory = [description containsString:@"history-shorts-shelf-item"];
+        if (IS_ENABLED(HideShortsShelf) && IS_ENABLED(KeepShortsSubscript)) {
+            if (isShortsShelf && ![description containsString:@"subscriptions-shorts-shelf-item"] && !isHistory) {
+                return YES;
+            }
+        } else if (IS_ENABLED(HideShortsShelf)) {
+            if (isShortsShelf && !isHistory) {
+                return YES;
+            }
+        }
+
+        // Filter horizontal shelf
+        if (IS_ENABLED(HideHoriShelf) && [description containsString:@"horizontal_shelf.eml"] && 
+            ![description containsString:@"UCYfdidRxbB8Qhf0Nx7ioOYw"] && 
+            ![description containsString:@"FElibrary"] && 
+            ![description containsString:@"mini_game_card.eml"] &&
+            ![description containsString:@"FEplaylist_aggregation"]) {
+            return YES;
+        }
+
+        // Filter feed posts
+        if (IS_ENABLED(HideFeedPost) && ([description containsString:@"poll_post_root.eml"] || [description containsString:@"options_post_root.eml"] || [description containsString:@"images_post_root_slim.eml"] || [description containsString:@"options_post_responsive_root.eml"] || [description containsString:@"post_base_wrapper_slim.eml"])) {
+            return YES;
+        }
+
+        if (IS_ENABLED(HideGenMusicShelf) && [description containsString:@"feed_nudge.eml"]) {
+            return YES;
+        }
+
         NSMutableArray <YTIItemSectionSupportedRenderers *> *contentsArray = sectionRenderer.contentsArray;
         if (contentsArray.count > 1) {
             NSIndexSet *removeContentsArrayIndexes = [contentsArray indexesOfObjectsPassingTest:^BOOL(YTIItemSectionSupportedRenderers *sectionSupportedRenderers, NSUInteger idx2, BOOL *stop2) {
@@ -73,7 +127,10 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
         }
         YTIItemSectionSupportedRenderers *firstObject = [contentsArray firstObject];
         YTIElementRenderer *elementRenderer = firstObject.elementRenderer;
-        return isAdRenderer(elementRenderer, 2);
+        if (isAdRenderer(elementRenderer, 2)) {
+            return YES;
+        }
+        return NO;
     }];
     [newArray removeObjectsAtIndexes:removeIndexes];
     return newArray;
@@ -121,25 +178,40 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
 - (void)adPlaying:(id)ad {}
 %end
 
+// Live video type = 4 and Live preview = 7
 %hook YTReelDataSource
 - (YTReelModel *)makeContentModelForEntry:(id)entry {
     YTReelModel *model = %orig;
+    YTReelPlayerResponder *responder = [model valueForKey:@"_reelPlayerResponder"];
     if ([model respondsToSelector:@selector(videoType)] && model.videoType == 3)
         return nil;
+    if ([responder.parentResponder isKindOfClass:%c(YTShortsAdsPlayerViewController)])
+        return nil;
+    if ([model respondsToSelector:@selector(videoType)] && (model.videoType == 4 || model.videoType == 7) && IS_ENABLED(RemoveShortsLive))
+        return nil;
     return model;
 }
 %end
 
 %hook YTReelInfinitePlaybackDataSource
 - (YTReelModel *)makeContentModelForEntry:(id)entry {
     YTReelModel *model = %orig;
+    YTReelPlayerResponder *responder = [model valueForKey:@"_reelPlayerResponder"];
     if ([model respondsToSelector:@selector(videoType)] && model.videoType == 3)
         return nil;
+    if ([responder.parentResponder isKindOfClass:%c(YTShortsAdsPlayerViewController)])
+        return nil;
+    if ([model respondsToSelector:@selector(videoType)] && (model.videoType == 4 || model.videoType == 7) && IS_ENABLED(RemoveShortsLive))
+        return nil;
     return model;
 }
 - (void)setReels:(NSMutableOrderedSet <YTReelModel *> *)reels {
     [reels removeObjectsAtIndexes:[reels indexesOfObjectsPassingTest:^BOOL(YTReelModel *obj, NSUInteger idx, BOOL *stop) {
-        return [obj respondsToSelector:@selector(videoType)] ? obj.videoType == 3 : NO;
+        YTReelPlayerResponder *responder = [obj valueForKey:@"_reelPlayerResponder"];
+        if ([obj respondsToSelector:@selector(videoType)] && obj.videoType == 3) return YES;
+        if ([responder.parentResponder isKindOfClass:%c(YTShortsAdsPlayerViewController)]) return YES;
+        if ([obj respondsToSelector:@selector(videoType)] && (obj.videoType == 4 || obj.videoType == 7) && IS_ENABLED(RemoveShortsLive)) return YES;
+        return NO;
     }]];
     %orig;
 }
@@ -164,6 +236,7 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
 %hook YTMainAppVideoPlayerOverlayViewController
 - (void)playerOverlayProvider:(YTPlayerOverlayProvider *)provider didInsertPlayerOverlay:(YTPlayerOverlay *)overlay {
     if ([[overlay overlayIdentifier] isEqualToString:@"player_overlay_product_in_video"]) return;
+    if ([[overlay overlayIdentifier] isEqualToString:@"player_overlay_paid_content"] && IS_ENABLED(HidePaidPromoOverlay)) return;
     %orig;
 }
 %end
@@ -183,7 +256,6 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
 - (void)didMoveToWindow {
     %orig;
     if ([self.accessibilityIdentifier isEqualToString:@"eml.expandable_metadata.vpp"]) [self removeFromSuperview];
-    if ([self.accessibilityIdentifier isEqualToString:@"eml.ad_layout.full_width_square_image_layout"]) self.hidden = YES;
 }
 %end
 
@@ -230,4 +302,4 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
 // Survey
 %hook YTSurveyController
 - (void)showSurveyWithRenderer:(id)arg1 surveyParentResponder:(id)arg2 {}
-%end
+%end