Remove fetchPostAtURL

Author: kean

Modules/Sources/WordPressKitObjC/ReaderPostServiceRemote.m

@@ -98,46 +98,6 @@ - (void)fetchPost:(NSUInteger)postID
               }];
 }
 
-/**
- Fetches a specific post from the specified URL
-
- @param postURL The URL of the post to fetch
- @param success block called on a successful fetch.
- @param failure block called if there is any error. `error` can be any underlying network error.
- */
-- (void)fetchPostAtURL:(NSURL *)postURL
-               success:(void (^)(RemoteReaderPost *post))success
-               failure:(void (^)(NSError *error))failure
-{
-    NSString *path = [self apiPathForPostAtURL:postURL];
-
-    if (!path) {
-        failure(nil);
-        return;
-    }
-
-    [self.wordPressComRESTAPI get:path
-                       parameters:nil
-                          success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
-                              if (!success) {
-                                  return;
-                              }
-                              dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
-                                  // Do all of this work on a background thread, then call success on the main thread.
-                                  // Do this to avoid any chance of blocking the UI while parsing.
-                                  RemoteReaderPost *post = [[RemoteReaderPost alloc] initWithDictionary:(NSDictionary *)responseObject];
-                                  dispatch_async(dispatch_get_main_queue(), ^{
-                                      success(post);
-                                  });
-                              });
-
-                          } failure:^(NSError *error, NSHTTPURLResponse *httpResponse) {
-                              if (failure) {
-                                  failure(error);
-                              }
-                          }];
-}
-
 - (void)likePost:(NSUInteger)postID
          forSite:(NSUInteger)siteID
          success:(void (^)(void))success
@@ -260,23 +220,4 @@ - (RemoteReaderPost *)formatPostDictionary:(NSDictionary *)dict offset:(CGFloat)
     return post;
 }
 
-- (nullable NSString *)apiPathForPostAtURL:(NSURL *)url
-{
-    NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
-
-    NSString *hostname = components.host;
-    NSArray *pathComponents = [[components.path pathComponents] filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF != '/'"] ];
-    NSString *slug = [components.path lastPathComponent];
-
-    // We expect 4 path components for a post – year, month, day, slug, plus a '/' on either end
-    if (hostname == nil || pathComponents.count != 4 || slug == nil) {
-        return nil;
-    }
-
-    NSString *path = [NSString stringWithFormat:@"sites/%@/posts/slug:%@?meta=site,likes", hostname, slug];
-
-    return [self pathForEndpoint:path
-                     withVersion:WordPressComRESTAPIVersion_1_1];
-}
-
 @end

Modules/Sources/WordPressKitObjC/include/ReaderPostServiceRemote.h

@@ -51,17 +51,6 @@
           success:(void (^)(RemoteReaderPost *post))success
           failure:(void (^)(NSError *error))failure;
 
-/**
- Fetches a specific post from the specified URL
-
- @param postURL The URL of the post to fetch
- @param success block called on a successful fetch.
- @param failure block called if there is any error. `error` can be any underlying network error.
- */
-- (void)fetchPostAtURL:(NSURL *)postURL
-               success:(void (^)(RemoteReaderPost *post))success
-               failure:(void (^)(NSError *error))failure;
-
 /**
  Mark a post as liked by the user.
 

Tests/KeystoneTests/Tests/Reader/ReaderDetailCoordinatorTests.swift

@@ -202,7 +202,6 @@ private class ReaderPostServiceMock: ReaderPostService {
     var didCallFetchPostWithPostID: UInt?
     var didCallFetchPostWithSiteID: UInt?
     var didCallFetchPostWithIsFeed: Bool?
-    var didCallFetchWithURL: URL?
 
     /// The post that should be returned by the mock
     var returnPost: ReaderPost?
@@ -230,15 +229,6 @@ private class ReaderPostServiceMock: ReaderPostService {
 
         success(returnPost)
     }
-
-    override func fetchPost(at postURL: URL!, success: ((ReaderPost?) -> Void)!, failure: ((Error?) -> Void)!) {
-        didCallFetchWithURL = postURL
-
-        guard !forceError else {
-            failure(nil)
-            return
-        }
-    }
 }
 
 private class ReaderDetailViewMock: UIViewController, ReaderDetailView {

WordPress/Classes/Services/Reader Post/ReaderPostService.h

@@ -77,17 +77,6 @@ extern NSString * const ReaderPostServiceToggleSiteFollowingState;
           success:(void (^)(ReaderPost *post))success
           failure:(void (^)(NSError *error))failure;
 
-/**
- Fetches a specific post from the specified URL
-
- @param postURL The URL of the post to fetch
- @param success block called on a successful fetch.
- @param failure block called if there is any error. `error` can be any underlying network error.
- */
-- (void)fetchPostAtURL:(NSURL *)postURL
-          success:(void (^)(ReaderPost *post))success
-          failure:(void (^)(NSError *error))failure;
-
 /**
  Silently refresh posts for the followed sites topic.
  Note that calling this method creates a new service instance that performs

WordPress/Classes/Services/Reader Post/ReaderPostService.m

@@ -156,33 +156,6 @@ - (void)fetchPost:(NSUInteger)postID forSite:(NSUInteger)siteID isFeed:(BOOL)isF
     } failure:failure];
 }
 
-- (void)fetchPostAtURL:(NSURL *)postURL
-               success:(void (^)(ReaderPost *post))success
-               failure:(void (^)(NSError *error))failure
-{
-    ReaderPostServiceRemote *remoteService = [[ReaderPostServiceRemote alloc] initWithWordPressComRestApi:[self apiForRequest]];
-    [remoteService fetchPostAtURL:postURL
-                          success:^(RemoteReaderPost *remotePost) {
-        if (!success) {
-            return;
-        }
-
-        NSManagedObjectID * __block postObjectID = nil;
-        [self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) {
-            ReaderPost *post = [self createOrReplaceFromRemotePost:remotePost forTopic:nil inContext:context];
-
-            NSError *error;
-            BOOL obtainedID = [context obtainPermanentIDsForObjects:@[post] error:&error];
-            if (!obtainedID) {
-                DDLogError(@"Error obtaining a permanent ID for post. %@, %@", post, error);
-            }
-            postObjectID = post.objectID;
-        } completion:^{
-            success([self.coreDataStack.mainContext existingObjectWithID:postObjectID error:nil]);
-        } onQueue:dispatch_get_main_queue()];
-    } failure:failure];
-}
-
 - (void)refreshPostsForFollowedTopic
 {
     [self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) {

WordPress/Classes/Services/ReaderTopicService.h

@@ -37,12 +37,6 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  */
 - (void)deleteAllSearchTopics;
 
-/**
- Deletes all topics that do not appear in the menu from core data and saves the context.
- Use to clean-up previewed topics that are lingering in core data.
- */
-- (void)deleteNonMenuTopics;
-
 /**
  Globally sets the `inUse` flag to fall for all posts.
  */
@@ -53,14 +47,9 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  */
 - (void)deleteAllTopics;
 
-/**
- Deletes a specific topic from core data and saves the context. Use to clean up previewed topics.
- */
-- (void)deleteTopic:(ReaderAbstractTopic *)topic;
-
 /**
  Creates a ReaderSearchTopic from the specified search phrase.
- 
+
  @param phrase: The search phrase.
  @param completion: A completion callback to receive the created ReaderSearchTopic instance.
  */

WordPress/Classes/Services/ReaderTopicService.m

@@ -136,31 +136,6 @@ - (void)deleteAllSearchTopics
     }];
 }
 
-- (void)deleteNonMenuTopics
-{
-    [self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) {
-        NSFetchRequest *request = [NSFetchRequest fetchRequestWithEntityName:[ReaderAbstractTopic classNameWithoutNamespaces]];
-        request.predicate = [NSPredicate predicateWithFormat:@"showInMenu = false AND inUse = false"];
-
-        NSError *error;
-        NSArray *results = [context executeFetchRequest:request error:&error];
-        if (error) {
-            DDLogError(@"%@ error executing fetch request: %@", NSStringFromSelector(_cmd), error);
-            return;
-        }
-
-        for (ReaderAbstractTopic *topic in results) {
-            // Do not purge site topics that are followed. We want these to stay so they appear immediately when managing followed sites.
-            if ([topic isKindOfClass:[ReaderSiteTopic class]] && topic.following) {
-                continue;
-            }
-            DDLogInfo(@"Deleting topic: %@", topic.title);
-            [self preserveSavedPostsFromTopic:topic];
-            [context deleteObject:topic];
-        }
-    }];
-}
-
 - (void)clearInUseFlags
 {
     [self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) {
@@ -192,21 +167,6 @@ - (void)deleteAllTopics
     }];
 }
 
-- (void)deleteTopic:(ReaderAbstractTopic *)topic
-{
-    if (!topic) {
-        return;
-    }
-    [self.coreDataStack performAndSaveUsingBlock:^(NSManagedObjectContext *context) {
-        ReaderAbstractTopic *topicInContext = [context existingObjectWithID:topic.objectID error:nil];
-        if (topicInContext == nil) {
-            return;
-        }
-        [self preserveSavedPostsFromTopic:topicInContext];
-        [context deleteObject:topicInContext];
-    }];
-}
-
 - (void)preserveSavedPostsFromTopic:(ReaderAbstractTopic *)topic
 {
     // Copy posts so that `post.topic = nil` doesn't mutate `topic.posts` collection.