v1.2.3

Author: Tonwalter888

Files/Ads.x

@@ -102,15 +102,11 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
 %end
 
 %hook YTAdsInnerTubeContextDecorator
-- (void)decorateContext:(id)context {}
+- (void)decorateContext:(id)context { %orig(nil); }
 %end
 
 %hook YTAccountScopedAdsInnerTubeContextDecorator
-- (void)decorateContext:(id)context {}
-%end
-
-%hook YTIPlayerResponse
-- (BOOL)isMonetized { return NO; }
+- (void)decorateContext:(id)context { %orig(nil); }
 %end
 
 %hook YTLocalPlaybackController
@@ -191,17 +187,6 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
 }
 %end
 
-// Premium
-%hook YTColdConfig
-- (BOOL)cxClientDisableMementoPromotions { return YES; }
-%end
-
-%hook YTHotConfig
-- (BOOL)iosPlayerClientSharedConfigShowPipClingPromo { return NO; }
-- (BOOL)liveChatEnableEngagementPanelPromo { return NO; }
-- (BOOL)livestreamClientConfigEnableCreationModesPromosTriggered { return NO; }
-%end
-
 // NoYTPremium - @PoomSmart https://github.com/PoomSmart/NoYTPremium
 // Alert
 %hook YTCommerceEventGroupHandler
@@ -245,126 +230,4 @@ static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItem
 // Survey
 %hook YTSurveyController
 - (void)showSurveyWithRenderer:(id)arg1 surveyParentResponder:(id)arg2 {}
-%end
-
-// Hide AI things
-%hook YTShortsSharedGalleryPresentationView
-- (BOOL)shouldShowAiMontageButton { return NO; }
-%end
-
-%hook YTShortsSharedGalleryPresentationViewController
-- (BOOL)shouldShowAiMontageButton { return NO; }
-%end
-
-%hook YTVideoSubtitleView
-- (BOOL)shouldShowAdBadge { return NO; }
-%end
-
-%hook YTIPlayerCompanionAdsSupportedRenderers
-- (BOOL)hasAppPromoCompanionAdRenderer { return NO; }
-%end
-
-%hook YTIRenderer
-- (id)appPromoAdCtaRenderer { return nil; }
-- (BOOL)hasAppPromoAdCtaRenderer { return NO; }
-%end
-
-%hook YTIInStreamPlayerCtaAdsSupportedRenderers
-- (BOOL)hasAppPromoAdCtaRenderer { return NO; }
-%end
-
-%hook YTInterstitialPromoViewController
-- (void)showInterstitialPromo:(id)arg1 enableClientImpressionThrottling:(BOOL)arg2 interstitialParentResponder:(id)arg3 {}
-- (void)showInterstitialPromo:(id)arg1 interstitialParentResponder:(id)arg2 {}
-%end
-
-%hook YTMealbarPromoController
-- (id)promoRenderer { return nil; }
-- (void)showMealbarPromoWithEvent:(id)arg {}
-%end
-
-%hook YTOfflineButtonPromoController
-- (void)showOfflinePromoWithRenderer:(id)arg1 endpoint:(id)arg2 parentResponder:(id)arg3 {}
-%end
-
-%hook YTOfflineButtonPromoView
-- (id)initWithFrame:(CGRect)arg1 renderer:(id)arg2 attributedView:(id)arg3 formattedStringLabelDelegate:(id)arg4 offlineButtonPromoDelegate:(id)arg5 { return nil; }
-%end
-
-%hook YTWatchMiniBarControlsView
-- (void)setTitle:(id)arg1 byline:(id)arg2 showingPaidPromotion:(BOOL)arg3 showingPremiumBadge:(BOOL)arg4 {}
-%end
-
-%hook MDXFeatureFlags
-- (BOOL)areMementoPromotionsEnabled { return NO; }
-%end
-
-%hook YTUserDefaults
-- (BOOL)enablePromoDebugToast { return NO; }
-- (BOOL)isPromoForced { return NO; }
-%end
-
-%hook YTAppMealbarPromoController
-- (id)mealbarPromoController { return nil; }
-%end
-
-%hook YTAppMealbarPromoControllerImpl
-- (id)mealbarPromoController { return nil; }
-%end
-
-%hook YTSurveyPromosheet
-- (id)expandablePromosheetDelegate { return nil; }
-- (void)setExpandablePromosheetDelegate:(id)arg {}
-%end
-
-%hook YTSPromotionServiceBlockImpl
-- (BOOL)createPromotion:(id)arg1 writer:(id)arg2 error:(NSError **)arg3 { return NO; }
-%end
-
-%hook YTSPromotionServiceBlock
-- (BOOL)createPromotion:(id)arg1 writer:(id)arg2 error:(NSError **)arg3 { return NO; }
-%end
-
-%hook YTPromosheetController
-- (BOOL)canPresentPromosheetWithGlobalThrottling:(BOOL)arg1 customizedThrottling:(id)arg2 shouldReplacePromosheet:(BOOL)arg3 { return NO; }
-- (void)setCurrentPromosheet:(id)arg {}
-%end
-
-%hook YTWatchSurveyTriggerController
-- (id)initWithParentResponder:(id)arg1 promosheetController:(id)arg2 { return nil; }
-%end
-
-%hook YTShareMainView
-- (BOOL)shouldShowPromo { return NO; }
-- (void)setPromoView:(id)arg {}
-%end
-
-%hook YCHLiveChatActionPanelView
-- (BOOL)shouldShowUpsellButton { return NO; }
-%end
-
-%hook YTPromosheetContainerView
-- (BOOL)shouldShowExpandButton { return NO; }
-- (void)setPromosheet:(id)arg {}
-- (void)setPromosheetDisplayed:(BOOL)arg {}
-- (void)setPromosheet:(id)arg1 animated:(BOOL)arg2 completion:(id)arg3 {}
-%end
-
-%hook ELMPBShowBottomSheetCommand
-- (void)showMealbarPromoWithContainerView:(id)arg1 handler:(id)arg2 {}
-%end
-
-%hook YTIElementRenderer
-- (NSData *)elementData {
-    NSString *description = [self description];
-    NSString *adString = getAdString(description);
-    if (adString) return [NSData data];
-    // NSArray *shortsToRemove = @[@"shorts_shelf.eml", @"shorts_video_cell.eml", @"6Shorts", @"eml.shorts-shelf"];
-    // for (NSString *shorts in shortsToRemove) {
-    //     if (IS_ENABLED(HideShortsShelf) && [description containsString:shorts] && ![description containsString:@"history*"]) {
-    //         return nil;
-    //     }
-    // }
-    return %orig;
-}
 %end

Files/Feed.x

@@ -1,5 +1,49 @@
 #import "Headers.h"
 
+// YTUnShorts (https://github.com/PoomSmart/YTUnShorts)
+static NSMutableArray <YTIItemSectionRenderer *> *filteredArray(NSArray <YTIItemSectionRenderer *> *array) {
+    NSMutableArray <YTIItemSectionRenderer *> *newArray = [array mutableCopy];
+    NSIndexSet *removeIndexes = [newArray indexesOfObjectsPassingTest:^BOOL(YTIItemSectionRenderer *sectionRenderer, NSUInteger idx, BOOL *stop) {
+        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;
+                NSString *description = [elementRenderer description];
+                BOOL hasShorts = [description containsString:@"shorts_video_cell"];
+                if (hasShorts) *stop2 = YES;
+                return hasShorts;
+            }];
+            return removeItemsArrayIndexes.count > 0;
+        }
+        if ([sectionRenderer isKindOfClass:%c(YTIItemSectionRenderer)]) {
+            NSString *description = [sectionRenderer description];
+            if ([description containsString:@"shorts_shelf.eml"])
+                return YES;
+        }
+        return NO;
+    }];
+    [newArray removeObjectsAtIndexes:removeIndexes];
+    return newArray;
+}
+
+%group Shorts
+%hook YTInnerTubeCollectionViewController
+
+- (void)displaySectionsWithReloadingSectionControllerByRenderer:(id)renderer {
+    NSMutableArray *sectionRenderers = [self valueForKey:@"_sectionRenderers"];
+    [self setValue:filteredArray(sectionRenderers) forKey:@"_sectionRenderers"];
+    %orig;
+}
+
+- (void)addSectionsFromArray:(NSArray <YTIItemSectionRenderer *> *)array {
+    %orig(filteredArray(array));
+}
+
+%end
+%end
+
 // Hide Subbar
 %hook YTMySubsFilterHeaderView
 - (void)setChipFilterView:(id)arg1 { if (!IS_ENABLED(HideSubbar)) %orig; }
@@ -32,4 +76,11 @@
 // Hide search history and suggestions
 %hook YTPersonalizedSuggestionsCacheProvider
 - (id)activeCache { return IS_ENABLED(HideSearchHis) ? nil : %orig; }
-%end
+%end
+
+%ctor {
+    %init;
+    if (IS_ENABLED(HideShortsShelf)) {
+        %init(Shorts);
+    }
+}

Files/Headers.h

@@ -67,7 +67,7 @@
 #define HideSubbar @"YouModHideSubbar"
 #define HideGenMusicShelf @"YouModHideGenMusicShelf"
 #define HideFeedPost @"YouModHideFeedPost"
-// #define HideShortsShelf @"YouModHideShortsShelf"
+#define HideShortsShelf @"YouModHideShortsShelf"
 #define HideSearchHis @"YouModHideSearchHistoryAndSuggestions"
 #define HideSubButton @"YouModHideSubscribeButton"
 #define HideShoppingButton @"YouModHideShoppingButton"
@@ -78,6 +78,7 @@
 #define HideCastButtonPlayer @"YouModHideCastButtonPlayer"
 #define HidePrevButton @"YouModHidePrevButton"
 #define HideNextButton @"YouModHideNextButton"
+#define ReplacePrevNextButtons @"YouModReplacePrevNextButtons"
 #define RemoveDarkOverlay @"YouModRemoveDarkOverlay"
 #define RemoveAmbiant @"YouModRemoveAmbiantColors"
 #define HideEndScreenCards @"YouModHideEndScreenCards"
@@ -104,6 +105,9 @@
 #define PortFull @"YouModPortraitFullscreen"
 #define OldQualityPicker @"YouModUseOldQualityPicker"
 #define ExtraSpeed @"YouModAddExtraSpeed"
+#define DisableHints @"YouModDisableHints"
+#define ForceMiniPlayer @"YouModForceMiniPlayer"
+#define AlwaysShowSeekbar @"YouModAlwaysShowSeekbar"
 #define HideLikeButton @"YouModHideLikeButton"
 #define HideDisLikeButton @"YouModHideDisLikeButton"
 #define HideShareButton @"YouModHideShareButton"

Files/Player.x

@@ -176,28 +176,41 @@ static void YouModAddEndTime(YTPlayerViewController *self, YTSingleVideoControll
 - (void)showConfirmAlert { IS_ENABLED(HideContentWarning) ? [self confirmAlertDidPressConfirm] : %orig; }
 %end
 
-/*
+// Always show seekbar
 %hook YTInlinePlayerBarContainerView
-- (void)setPlayerBarAlpha:(CGFloat)alpha { %orig(1.0); } // Force seek bar i guess
+- (void)setPlayerBarAlpha:(CGFloat)alpha { IS_ENABLED(AlwaysShowSeekbar) ? %orig(1.0) : %orig; }
 %end
-*/
 
 // Portrait Fullscreen
 %hook YTWatchViewController
 - (unsigned long long)allowedFullScreenOrientations { return IS_ENABLED(PortFull) ? UIInterfaceOrientationMaskAllButUpsideDown : %orig; }
 %end
 
-// Disable Snap To Chapter (https://github.com/qnblackcat/uYouPlus/blob/main/uYouPlus.xm#L457-464) - GOT REMOVED
-// %hook YTSegmentableInlinePlayerBarView
-// - (void)didMoveToWindow { %orig; if (ytlBool(@"dontSnapToChapter")) self.enableSnapToChapter = NO; }
-// %end
+/* Disable Snap To Chapter (https://github.com/qnblackcat/uYouPlus/blob/main/uYouPlus.xm#L457-464) - GOT REMOVED
+%hook YTSegmentableInlinePlayerBarView
+- (void)didMoveToWindow { %orig; if (ytlBool(@"dontSnapToChapter")) self.enableSnapToChapter = NO; }
+%end
 
-/*
 %hook YTModularPlayerBarController
 - (void)setEnableSnapToChapter:(BOOL)arg { %orig(NO); } // idk this works or not
 %end
 */
 
+// Replace previous/next buttons with back and forward
+%hook YTColdConfig
+- (BOOL)replaceNextPaddleWithFastForwardButtonForSingletonVods { return IS_ENABLED(ReplacePrevNextButtons) ? YES : %orig; }
+- (BOOL)replacePreviousPaddleWithRewindButtonForSingletonVods { return IS_ENABLED(ReplacePrevNextButtons) ? YES : %orig; }
+%end
+
+%group ForceMiniPlayer
+%hook YTIMiniplayerRenderer
+%new
+- (BOOL)hasMinimizedEndpoint { return NO; }
+%new
+- (BOOL)hasPlaybackMode { return NO; }
+%end
+%end
+
 // Extra speed - adapted from YouSpeed
 %group Speed
 
@@ -279,6 +292,22 @@ static void YouModAddEndTime(YTPlayerViewController *self, YTSingleVideoControll
 %end
 %end
 
+// Disable Hints
+%hook YTSettings
+- (BOOL)areHintsDisabled { return IS_ENABLED(DisableHints) ? YES : %orig; }
+- (void)setHintsDisabled:(BOOL)arg1 { IS_ENABLED(DisableHints) ? %orig(YES) : %orig; }
+%end
+
+%hook YTSettingsImpl
+- (BOOL)areHintsDisabled { return IS_ENABLED(DisableHints) ? YES : %orig; }
+- (void)setHintsDisabled:(BOOL)arg1 { IS_ENABLED(DisableHints) ? %orig(YES) : %orig; }
+%end
+
+%hook YTUserDefaults
+- (BOOL)areHintsDisabled { return IS_ENABLED(DisableHints) ? YES : %orig; }
+- (void)setHintsDisabled:(BOOL)arg1 { IS_ENABLED(DisableHints) ? %orig(YES) : %orig; }
+%end
+
 %hook YTPlayerViewController
 - (void)loadWithPlayerTransition:(id)arg1 playbackConfig:(id)arg2 {
     %orig;
@@ -632,4 +661,7 @@ static void YouModAddEndTime(YTPlayerViewController *self, YTSingleVideoControll
     if (IS_ENABLED(GestureControls)) {
         %init(Gestures);
     }
+    if (IS_ENABLED(ForceMiniPlayer)) {
+        %init(ForceMiniPlayer);
+    }
 }