Rename Blog.wordPressOrgRestApi to selfHostedSiteRestApi

Author: crazytonyli

WordPress/Classes/Models/Blog.h

@@ -208,7 +208,7 @@ typedef NS_ENUM(NSInteger, SiteVisibility) {
 @property (nonatomic,   weak,  readonly, nullable) NSArray *sortedConnections;
 @property (nonatomic, readonly, nullable) NSArray<Role *> *sortedRoles;
 @property (nonatomic, strong,  readonly, nullable) WordPressOrgXMLRPCApi *xmlrpcApi;
-@property (nonatomic, strong,  readonly, nullable) WordPressOrgRestApi *wordPressOrgRestApi;
+@property (nonatomic, strong,  readonly, nullable) WordPressOrgRestApi *selfHostedSiteRestApi;
 @property (nonatomic,   weak,  readonly, nullable) NSString       *version;
 @property (nonatomic, strong,  readonly, nullable) NSString       *authToken;
 @property (nonatomic, strong,  readonly, nullable) NSSet *allowedFileTypes;

WordPress/Classes/Models/Blog.m

@@ -34,7 +34,7 @@
 @interface Blog ()
 
 @property (nonatomic, strong, readwrite) WordPressOrgXMLRPCApi *xmlrpcApi;
-@property (nonatomic, strong, readwrite) WordPressOrgRestApi *wordPressOrgRestApi;
+@property (nonatomic, strong, readwrite) WordPressOrgRestApi *selfHostedSiteRestApi;
 
 @end
 
@@ -99,7 +99,7 @@ @implementation Blog
 @synthesize videoPressEnabled;
 @synthesize isSyncingMedia;
 @synthesize xmlrpcApi = _xmlrpcApi;
-@synthesize wordPressOrgRestApi = _wordPressOrgRestApi;
+@synthesize selfHostedSiteRestApi = _selfHostedSiteRestApi;
 
 #pragma mark - NSManagedObject subclass methods
 
@@ -113,7 +113,7 @@ - (void)prepareForDeletion
     }
 
     [_xmlrpcApi invalidateAndCancelTasks];
-    [_wordPressOrgRestApi invalidateAndCancelTasks];
+    [_selfHostedSiteRestApi invalidateAndCancelTasks];
 }
 
 - (void)didTurnIntoFault
@@ -122,7 +122,7 @@ - (void)didTurnIntoFault
 
     // Clean up instance variables
     self.xmlrpcApi = nil;
-    self.wordPressOrgRestApi = nil;
+    self.selfHostedSiteRestApi = nil;
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
@@ -701,7 +701,7 @@ - (BOOL)supportsPluginManagement
     // Reference: https://make.wordpress.org/core/2020/07/16/new-and-modified-rest-api-endpoints-in-wordpress-5-5/
     if(!supports && !self.account){
         supports = !self.isHostedAtWPcom
-        && self.wordPressOrgRestApi
+        && self.selfHostedSiteRestApi
         && [self hasRequiredWordPressVersion:@"5.5"];
     }
 
@@ -886,12 +886,12 @@ - (WordPressOrgXMLRPCApi *)xmlrpcApi
     return _xmlrpcApi;
 }
 
-- (WordPressOrgRestApi *)wordPressOrgRestApi
+- (WordPressOrgRestApi *)selfHostedSiteRestApi
 {
-    if (_wordPressOrgRestApi == nil) {
-        _wordPressOrgRestApi = self.account == nil ? [[WordPressOrgRestApi alloc] initWithBlog:self] : nil;
+    if (_selfHostedSiteRestApi == nil) {
+        _selfHostedSiteRestApi = self.account == nil ? [[WordPressOrgRestApi alloc] initWithBlog:self] : nil;
     }
-    return _wordPressOrgRestApi;
+    return _selfHostedSiteRestApi;
 }
 
 - (WordPressComRestApi *)wordPressComRestApi

WordPress/Classes/Stores/PluginStore.swift

@@ -803,7 +803,7 @@ private extension PluginStore {
     }
 
     private func selfHostedRemoteClient(site: JetpackSiteRef) -> PluginManagementClient? {
-        guard let remote = BlogService.blog(with: site)?.wordPressOrgRestApi else {
+        guard let remote = BlogService.blog(with: site)?.selfHostedSiteRestApi else {
             return nil
         }
 

WordPress/Classes/ViewRelated/Gutenberg/GutenbergNetworking.swift

@@ -65,7 +65,7 @@ struct GutenbergNetworkRequest {
     }
 
     private func performSelfHostedRequest(completion: @escaping CompletionHandler) {
-        guard let api = blog.wordPressOrgRestApi else {
+        guard let api = blog.selfHostedSiteRestApi else {
             completion(.failure(NSError(domain: NSURLErrorDomain, code: NSURLErrorUnknown, userInfo: nil)))
             return
         }

WordPress/Classes/ViewRelated/Jetpack/Install/Webview/JetpackConnectionWebViewController.swift

@@ -361,7 +361,7 @@ private extension JetpackConnectionWebViewController {
 ///
 private extension JetpackConnectionWebViewController {
     func startNativeConnectionFlow() {
-        guard let api = blog.wordPressOrgRestApi else {
+        guard let api = blog.selfHostedSiteRestApi else {
             DDLogInfo("WordPressOrgRestAPI not loaded to perform native Jetpack connection")
             startConnectionFlow()
             return