Merge branch 'dev'

jacobcxdev · Apr 7, 2020 · bbfe45e · bbfe45e
2 parents 59d9b73 + 5383c9d
commit bbfe45e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Media/1.png b/Media/1.png
diff --git a/Media/Preferences.png b/Media/Preferences.png
diff --git a/README.md b/README.md
@@ -13,4 +13,4 @@ A tweak for Facebook — written in Objective-C + Logos.
 
 ## Screenshots
 
-![Preferences](https://user-images.githubusercontent.com/27970288/78467318-5bfaed00-7703-11ea-8f0e-ce52c73640a7.png)
+![Preferences](https://user-images.githubusercontent.com/27970288/78624971-cbe3b180-7882-11ea-9b39-9ed710761b01.png)
diff --git a/control b/control
@@ -1,9 +1,9 @@
 Package: com.jacobcxdev.fbspnosor
 Name: FBSpNOsor
-Depends: mobilesubstrate, firmware (>= 11.0)
-Version: 1.2.4
+Depends: mobilesubstrate, preferenceloader, firmware (>= 11.0)
 Architecture: iphoneos-arm
-Description: A tweak to remove sponsored and suggested posts, videos, etc. from Facebook.
-Maintainer: JacobCXDev
-Author: JacobCXDev
+Description: Remove sponsored and suggested posts, videos, etc. from Facebook.
+Maintainer: JacobCXDev <[email protected]>
+Author: JacobCXDev <[email protected]>
 Section: Tweaks
+Version: 1.2.5
diff --git a/fbspnosorpreferences/FBPPackageInfo.m b/fbspnosorpreferences/FBPPackageInfo.m
@@ -27,8 +27,11 @@ + (void)setControlFromBundleID:(NSString *)bundleID {
     NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"(?<fieldName>.+):\\s*(?<fieldContent>.*)" options:0 error:&error];
     NSArray *matches = [regex matchesInString:output options:0 range:NSMakeRange(0, output.length)];
     _control = [[NSMutableDictionary alloc] init];
-    for (NSTextCheckingResult *match in matches)
-        _control[[output substringWithRange:[match rangeWithName:@"fieldName"]]] = [output substringWithRange:[match rangeWithName:@"fieldContent"]];
+    for (NSTextCheckingResult *match in matches) {
+        NSString *substring = [output substringWithRange:[match rangeWithName:@"fieldContent"]];
+        NSUInteger abLocation = [substring rangeOfString:@" <"].location;
+        _control[[output substringWithRange:[match rangeWithName:@"fieldName"]]] = abLocation == NSNotFound ? substring : [substring substringWithRange:NSMakeRange(0, abLocation)];;
+    }
 }
 + (void)retrieveControl {
     NSDictionary *info = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle bundleForClass:self.class] pathForResource:@"Info" ofType:@"plist"]];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@ A tweak for Facebook — written in Objective-C + Logos.

		## Screenshots

		![Preferences](https://user-images.githubusercontent.com/27970288/78467318-5bfaed00-7703-11ea-8f0e-ce52c73640a7.png)
		![Preferences](https://user-images.githubusercontent.com/27970288/78624971-cbe3b180-7882-11ea-9b39-9ed710761b01.png)