Clean up the code

BandarHL · Jan 13, 2023 · dfe39b4 · dfe39b4
1 parent b5f284d
commit dfe39b4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/BHTwitter/BHTManager.h b/BHTwitter/BHTManager.h
@@ -51,5 +51,6 @@
 + (BOOL)hideViewCount;
 + (BOOL)showTweetSource;
 + (BOOL)forceTweetFullFrame;
++ (BOOL)stripTrackingParams;
 @end
 
diff --git a/BHTwitter/BHTManager.m b/BHTwitter/BHTManager.m
@@ -195,6 +195,9 @@ + (BOOL)showTweetSource {
 + (BOOL)forceTweetFullFrame {
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"force_tweet_full_frame"];
 }
++ (BOOL)stripTrackingParams {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"strip_tracking_params"];
+}
 
 + (UIViewController *)BHTSettingsWithAccount:(TFNTwitterAccount *)twAccount {
     SettingsViewController *pref = [[SettingsViewController alloc] initWithTwitterAccount:twAccount];

diff --git a/BHTwitter/BHTwitter.xm b/BHTwitter/BHTwitter.xm
@@ -1442,34 +1442,31 @@ static NSDictionary<NSString*, NSArray<NSString*>*> *trackingParams = @{@"twitte
 static NSString *_lastCopiedURL;
 
 %ctor {
-	NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-	NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
-	// Someone needs to hold reference the to Notification
-	_PasteboardChangeObserver = [center addObserverForName:UIPasteboardChangedNotification
-		object:nil
-		queue:mainQueue
-		usingBlock:^(NSNotification * _Nonnull note){
-            if ([[NSUserDefaults standardUserDefaults] boolForKey:@"strip_tracking_params"]){
-                if(UIPasteboard.generalPasteboard.hasURLs){
-                    NSURL *pasteboardURL = UIPasteboard.generalPasteboard.URL;
-                    NSArray<NSString*>* params = trackingParams[pasteboardURL.host];
-
-                    if([pasteboardURL.absoluteString isEqualToString:_lastCopiedURL] == NO && params != nil && pasteboardURL.query != nil){
-                        // to prevent endless copy loop
-                        _lastCopiedURL = pasteboardURL.absoluteString;
-                        NSURLComponents *cleanedURL = [NSURLComponents componentsWithURL:pasteboardURL resolvingAgainstBaseURL:NO];
-                        NSMutableArray<NSURLQueryItem*> *safeParams = [NSMutableArray arrayWithCapacity:0];
-
-                        for (NSURLQueryItem *item in cleanedURL.queryItems){
-                            if([params containsObject:item.name] == NO){
-                                [safeParams addObject:item];
-                            }
+    NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+    NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
+    // Someone needs to hold reference the to Notification
+    _PasteboardChangeObserver = [center addObserverForName:UIPasteboardChangedNotification object:nil queue:mainQueue usingBlock:^(NSNotification * _Nonnull note){
+        if ([BHTManager stripTrackingParams]) {
+            if (UIPasteboard.generalPasteboard.hasURLs) {
+                NSURL *pasteboardURL = UIPasteboard.generalPasteboard.URL;
+                NSArray<NSString*>* params = trackingParams[pasteboardURL.host];
+
+                if ([pasteboardURL.absoluteString isEqualToString:_lastCopiedURL] == NO && params != nil && pasteboardURL.query != nil) {
+                    // to prevent endless copy loop
+                    _lastCopiedURL = pasteboardURL.absoluteString;
+                    NSURLComponents *cleanedURL = [NSURLComponents componentsWithURL:pasteboardURL resolvingAgainstBaseURL:NO];
+                    NSMutableArray<NSURLQueryItem*> *safeParams = [NSMutableArray arrayWithCapacity:0];
+
+                    for (NSURLQueryItem *item in cleanedURL.queryItems) {
+                        if ([params containsObject:item.name] == NO) {
+                            [safeParams addObject:item];
                         }
-                        cleanedURL.queryItems = safeParams;
-                        UIPasteboard.generalPasteboard.URL = cleanedURL.URL;
                     }
+                    cleanedURL.queryItems = safeParams;
+                    UIPasteboard.generalPasteboard.URL = cleanedURL.URL;
                 }
             }
-		}];
-	%init;
+        }
+    }];
+    %init;
 }