Block ads in video feed view, get video playback item better, fix hide stories for who has room chat on news feed

Author: haoict

README.md

@@ -37,6 +37,10 @@ make do
 
 Contributions of any kind welcome!
 
+## Copyright Notice
+
+The "Remove Ads" function is based on [FBSpNOsor](https://github.com/jacobcxdev/FBSpNOsor) by [jacobcxdev](https://github.com/jacobcxdev).  
+
 ## License
 
 Licensed under the [GPLv3 License](./LICENSE), Copyright © 2020-present Hao Nguyen <hao.ict56@gmail.com>

Tweak.h

@@ -4,6 +4,18 @@
 #define PLIST_PATH "/var/mobile/Library/Preferences/com.haoict.facebooknoadspref.plist"
 #define PREF_CHANGED_NOTIF "com.haoict.facebooknoadspref/PrefChanged"
 
+@interface FBMemNewsFeedEdge : NSObject
+- (id)category;
+@end;
+
+@interface FBMemFeedStory : NSObject
+- (id)sponsoredData;
+@end
+
+@interface FBVideoChannelPlaylistItem : NSObject
+- (BOOL)isSponsored;
+@end
+
 @interface CKDataSourceState : NSObject
 @property(readonly, copy, nonatomic) NSArray *sections;
 @end

Tweak.xm

@@ -6,7 +6,6 @@
 BOOL noads;
 BOOL canSaveVideo;
 BOOL hideNewsFeedComposer;
-BOOL hideNewsFeedRoom;
 BOOL hideNewsFeedStories;
 
 static void reloadPrefs() {
@@ -15,14 +14,29 @@ static void reloadPrefs() {
   noads = [[settings objectForKey:@"noads"] ?: @(YES) boolValue];
   canSaveVideo = [[settings objectForKey:@"canSaveVideo"] ?: @(YES) boolValue];
   hideNewsFeedComposer = [[settings objectForKey:@"hideNewsFeedComposer"] ?: @(NO) boolValue];
-  hideNewsFeedRoom = [[settings objectForKey:@"hideNewsFeedRoom"] ?: @(NO) boolValue];
   hideNewsFeedStories = [[settings objectForKey:@"hideNewsFeedStories"] ?: @(NO) boolValue];
 }
 
 %group NoAds
-  %hook FBMemSponsoredData
+  %hook FBMemNewsFeedEdge
     - (id)initWithFBTree:(void *)arg1 {
-      return nil;
+      id orig = %orig;
+      id category = [orig category];
+      return category ? [category isEqualToString:@"ORGANIC"] ? orig : nil : orig;
+    }
+  %end
+
+  %hook FBMemFeedStory
+    - (id)initWithFBTree:(void *)arg1 {
+      id orig = %orig;
+      return [orig sponsoredData] == nil ? orig : nil;
+    }
+  %end
+
+  %hook FBVideoChannelPlaylistItem
+    - (id)Bi:(id)arg1 :(id)arg2 :(id)arg3 :(id)arg4 :(id)arg5 :(id)arg6 :(id)arg7 {
+      id orig = %orig;
+      return [orig isSponsored] ? nil : orig;
     }
   %end
 %end
@@ -67,11 +81,11 @@ static void reloadPrefs() {
     %new
     - (BOOL)shouldHideSectionNumber:(int)sectionNumber {
       if (hideNewsFeedComposer) {
-        if (sectionNumber == 0) {
+        if (([self dataSourceState].sections.count == 3 && sectionNumber == 0) || ([self dataSourceState].sections.count == 4 && sectionNumber == 1)) {
           return TRUE;
         }
       } else {
-        if (sectionNumber == 1) {
+        if (([self dataSourceState].sections.count == 4 && sectionNumber == 1) || ([self dataSourceState].sections.count == 5 && sectionNumber == 2)) {
           return TRUE;
         }
       }
@@ -98,11 +112,17 @@ static void reloadPrefs() {
     %new
     - (void)handleLongPress:(UILongPressGestureRecognizer *)sender {
       if (sender.state == UIGestureRecognizerStateBegan) {
+        FBVideoPlaybackItem *videoPlaybackItem = [self.controller currentVideoPlaybackItem];
+        if (!videoPlaybackItem) {
+          [HCommon showAlertMessage:@"Can't find Video source, please report to developer" withTitle:@"Error" viewController:nil];
+          return;
+        }
+
         UIAlertController* alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? UIAlertControllerStyleAlert : UIAlertControllerStyleActionSheet];
         [alert addAction:[UIAlertAction actionWithTitle:@"Download Video" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-          NSURL *videoURL = [self.controller currentVideoPlaybackItem].HDPlaybackURL;
+          NSURL *videoURL = videoPlaybackItem.HDPlaybackURL;
           if (!videoURL) {
-            videoURL = [self.controller currentVideoPlaybackItem].SDPlaybackURL;
+            videoURL = videoPlaybackItem.SDPlaybackURL;
           }
           NSString *videoURLString = videoURL.absoluteString;
           [HCommon showToastMessage:@"Downloading in background..." withTitle:@"Please wait" timeout:1.0 viewController:nil];
@@ -133,15 +153,36 @@ static void reloadPrefs() {
       if (sender.state == UIGestureRecognizerStateBegan) {
         UIView *view = self.superview.superview.superview.superview;
         if (![view isKindOfClass:%c(VideoContainerView)]) {
-          view = self.superview.subviews[1].subviews[0].subviews[0];
+          @try {
+            view = self.superview.subviews[1].subviews[0].subviews[0];
+          } @catch (NSException *exception) { }
+        }
+        if (![view isKindOfClass:%c(VideoContainerView)]) {
+          @try {
+            view = self.superview.subviews[2].subviews[0].subviews[0];
+          } @catch (NSException *exception) { }
+        }
+        if (![view isKindOfClass:%c(VideoContainerView)]) {
+          @try {
+            view = self.superview.subviews[3].subviews[0].subviews[0];
+          } @catch (NSException *exception) { }
+        }
+        if (![view isKindOfClass:%c(VideoContainerView)]) {
+          [HCommon showAlertMessage:@"Can't find Video container, please report to developer" withTitle:@"Error" viewController:nil];
+          return;
         }
         VideoContainerView *videoContainerView = (VideoContainerView *)view;
+        FBVideoPlaybackItem *videoPlaybackItem = [videoContainerView.controller currentVideoPlaybackItem];
+        if (!videoPlaybackItem) {
+          [HCommon showAlertMessage:@"Can't find Video source, please report to developer" withTitle:@"Error" viewController:nil];
+          return;
+        }
 
         UIAlertController* alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? UIAlertControllerStyleAlert : UIAlertControllerStyleActionSheet];
         [alert addAction:[UIAlertAction actionWithTitle:@"Download Video" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-          NSURL *videoURL = [videoContainerView.controller currentVideoPlaybackItem].HDPlaybackURL;
+          NSURL *videoURL = videoPlaybackItem.HDPlaybackURL;
           if (!videoURL) {
-            videoURL = [videoContainerView.controller currentVideoPlaybackItem].SDPlaybackURL;
+            videoURL = videoPlaybackItem.SDPlaybackURL;
           }
           NSString *videoURLString = videoURL.absoluteString;
           [HCommon showToastMessage:@"Downloading in background..." withTitle:@"Please wait" timeout:1.0 viewController:nil];
@@ -170,7 +211,7 @@ static void reloadPrefs() {
     %init(HideNewsFeedComposer);
   }
 
-  if (hideNewsFeedRoom || hideNewsFeedStories) {
+  if (hideNewsFeedStories) {
     %init(HideNewsFeedChatRoomStories);
   }
 }

control

@@ -1,7 +1,7 @@
 Package: com.haoict.facebooknoads
 Name: Facebook No Ads
 Depends: mobilesubstrate, preferenceloader, com.haoict.libhdev (>= 2.0.0), firmware (>= 10)
-Version: 1.0.0
+Version: 1.0.2
 Architecture: iphoneos-arm
 Description: Free & Open Source Tweak for Facebook
  Free & Open Source Tweak for Facebook
@@ -15,6 +15,8 @@ Description: Free & Open Source Tweak for Facebook
  - Support iOS 10 (not tested) - 11 (tested) - 12 (tested) - 13 (tested)
  - Support latest Facebook version (If it doesn't work, you should update the app to latest version >= 260.0)
  . 
+ I collect uuid for better support and statistic purpose
+ . 
  I work very hard to make good, free and open source tweaks for everyone
  If you want to support, you can buy me a coffee at https://www.paypal.me/haoict
  . 

pref/Resources/base.lproj/Root.strings

@@ -11,7 +11,7 @@
   "LONG_PRESS_ON_VIDEO_TO_SAVE" = "Long press on video to save";
   "HIDE_COMPOSER" = "Hide Composer";
   "HIDE_COMPOSER_ON_NEWS_FEED" = "Hide Composer on News Feed";
-  "HIDE_STORIES" = "Hide Stories";
+  "HIDE_STORIES" = "Hide Stories (beta)";
   "HIDE_STORIES_ON_NEWS_FEED" = "Hide Stories on News Feed";
   "OTHER_PREFERENCES" = "Other Preferences";
   "RESET_SETTINGS" = "Reset Settings";

pref/Resources/en.lproj/Root.strings

@@ -11,7 +11,7 @@
   "LONG_PRESS_ON_VIDEO_TO_SAVE" = "Long press on video to save";
   "HIDE_COMPOSER" = "Hide Composer";
   "HIDE_COMPOSER_ON_NEWS_FEED" = "Hide Composer on News Feed";
-  "HIDE_STORIES" = "Hide Stories";
+  "HIDE_STORIES" = "Hide Stories (beta)";
   "HIDE_STORIES_ON_NEWS_FEED" = "Hide Stories on News Feed";
   "OTHER_PREFERENCES" = "Other Preferences";
   "RESET_SETTINGS" = "Reset Settings";

pref/Resources/vi.lproj/Root.strings

@@ -11,7 +11,7 @@
   "LONG_PRESS_ON_VIDEO_TO_SAVE" = "Ấn và giữ video để lưu";
   "HIDE_COMPOSER" = "Ẩn Bạn đang nghĩ gì";
   "HIDE_COMPOSER_ON_NEWS_FEED" = "Ẩn Bạn đang nghĩ gì ở Bảng tin";
-  "HIDE_STORIES" = "Ẩn Story";
+  "HIDE_STORIES" = "Ẩn Story (beta)";
   "HIDE_STORIES_ON_NEWS_FEED" = "Ẩn Story ở Bảng tin";
   "OTHER_PREFERENCES" = "Tùy chỉnh phụ";
   "RESET_SETTINGS" = "Đặt lại tùy chỉnh";