Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 7d0757c

Browse files
mokagiomokagio
authored
Use WordPressComRESTAPIInterfacing in the Objective-C consumers (#761)
2 parents 97140f0 + 534cd93 commit 7d0757c

18 files changed

+135
-133
lines changed

‎WordPressKit/BlogServiceRemoteREST.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ - (void)getAllAuthorsWithRemoteUsers:(NSMutableArray <RemoteUser *>*)remoteUsers
106106
NSString *requestUrl = [self pathForEndpoint:path
107107
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
108108

109-
[self.wordPressComRestApi GET:requestUrl
109+
[self.wordPressComRESTAPI get:requestUrl
110110
parameters:parameters
111111
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
112112
if (success) {
@@ -138,7 +138,7 @@ - (void)syncPostTypesWithSuccess:(PostTypesHandler)success
138138
NSString *requestUrl = [self pathForEndpoint:path
139139
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
140140
NSDictionary *parameters = @{@"context": @"edit"};
141-
[self.wordPressComRestApi GET:requestUrl
141+
[self.wordPressComRESTAPI get:requestUrl
142142
parameters:parameters
143143
success:^(NSDictionary *responseObject, NSHTTPURLResponse *httpResponse) {
144144

@@ -168,7 +168,7 @@ - (void)syncPostFormatsWithSuccess:(PostFormatsHandler)success
168168
NSString *requestUrl = [self pathForEndpoint:path
169169
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
170170

171-
[self.wordPressComRestApi GET:requestUrl
171+
[self.wordPressComRESTAPI get:requestUrl
172172
parameters:nil
173173
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
174174
NSDictionary *formats = [self mapPostFormatsFromResponse:responseObject[@"formats"]];
@@ -189,7 +189,7 @@ - (void)syncBlogWithSuccess:(BlogDetailsHandler)success
189189
NSString *requestUrl = [self pathForEndpoint:path
190190
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
191191

192-
[self.wordPressComRestApi GET:requestUrl
192+
[self.wordPressComRESTAPI get:requestUrl
193193
parameters:nil
194194
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
195195
NSDictionary *responseDict = (NSDictionary *)responseObject;
@@ -210,7 +210,7 @@ - (void)syncBlogSettingsWithSuccess:(SettingsHandler)success
210210
NSString *path = [self pathForSettings];
211211
NSString *requestUrl = [self pathForEndpoint:path withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
212212

213-
[self.wordPressComRestApi GET:requestUrl
213+
[self.wordPressComRESTAPI get:requestUrl
214214
parameters:nil
215215
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
216216
if (![responseObject isKindOfClass:[NSDictionary class]]){
@@ -240,7 +240,7 @@ - (void)updateBlogSettings:(RemoteBlogSettings *)settings
240240
NSString *path = [NSString stringWithFormat:@"sites/%@/settings?context=edit", self.siteID];
241241
NSString *requestUrl = [self pathForEndpoint:path withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
242242

243-
[self.wordPressComRestApi POST:requestUrl
243+
[self.wordPressComRESTAPI post:requestUrl
244244
parameters:parameters
245245
success:^(NSDictionary *responseDict, NSHTTPURLResponse *httpResponse) {
246246
if (![responseDict isKindOfClass:[NSDictionary class]]) {
@@ -272,7 +272,7 @@ - (void)fetchSiteInfoForAddress:(NSString *)siteAddress
272272
NSString *requestUrl = [self pathForEndpoint:path
273273
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
274274

275-
[self.wordPressComRestApi GET:requestUrl
275+
[self.wordPressComRESTAPI get:requestUrl
276276
parameters:nil
277277
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
278278
if (success) {
@@ -293,7 +293,7 @@ - (void)fetchUnauthenticatedSiteInfoForAddress:(NSString *)siteAddress
293293
NSString *path = [self pathForEndpoint:@"connect/site-info" withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
294294
NSURL *siteURL = [NSURL URLWithString:siteAddress];
295295

296-
[self.wordPressComRestApi GET:path
296+
[self.wordPressComRESTAPI get:path
297297
parameters:@{ @"url": siteURL.absoluteString }
298298
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
299299
if (success) {

‎WordPressKit/CommentServiceRemoteREST.m‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ - (void)getCommentsWithMaximumCount:(NSInteger)maximumComments
4141
[parameters removeObjectForKey:@"status"];
4242
parameters[@"status"] = [self parameterForCommentStatus:statusFilter];
4343

44-
[self.wordPressComRestApi GET:requestUrl
44+
[self.wordPressComRESTAPI get:requestUrl
4545
parameters:parameters
4646
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
4747
if (success) {
@@ -84,7 +84,7 @@ - (void)getCommentWithID:(NSNumber *)commentID
8484
NSString *requestUrl = [self pathForEndpoint:path
8585
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
8686

87-
[self.wordPressComRestApi GET:requestUrl
87+
[self.wordPressComRESTAPI get:requestUrl
8888
parameters:nil
8989
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
9090
RemoteComment *comment = [self remoteCommentFromJSONDictionary:responseObject];
@@ -116,7 +116,7 @@ - (void)createComment:(RemoteComment *)comment
116116
@"content": comment.content,
117117
@"context": @"edit",
118118
};
119-
[self.wordPressComRestApi POST:requestUrl
119+
[self.wordPressComRESTAPI post:requestUrl
120120
parameters:parameters
121121
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
122122
// TODO: validate response
@@ -147,7 +147,7 @@ - (void)updateComment:(RemoteComment *)comment
147147
@"context": @"edit",
148148
};
149149

150-
[self.wordPressComRestApi POST:requestUrl
150+
[self.wordPressComRESTAPI post:requestUrl
151151
parameters:parameters
152152
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
153153
// TODO: validate response
@@ -174,7 +174,7 @@ - (void)moderateComment:(RemoteComment *)comment
174174
@"status": [self remoteStatusWithStatus:comment.status],
175175
@"context": @"edit",
176176
};
177-
[self.wordPressComRestApi POST:requestUrl
177+
[self.wordPressComRESTAPI post:requestUrl
178178
parameters:parameters
179179
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
180180
// TODO: validate response
@@ -197,7 +197,7 @@ - (void)trashComment:(RemoteComment *)comment
197197
NSString *requestUrl = [self pathForEndpoint:path
198198
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
199199

200-
[self.wordPressComRestApi POST:requestUrl
200+
[self.wordPressComRESTAPI post:requestUrl
201201
parameters:nil
202202
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
203203
if (success) {
@@ -226,7 +226,7 @@ - (void)syncHierarchicalCommentsForPost:(NSNumber *)postID
226226
NSDictionary *parameters = @{
227227
@"force": @"wpcom" // Force fetching data from shadow site on Jetpack sites
228228
};
229-
[self.wordPressComRestApi GET:requestUrl
229+
[self.wordPressComRESTAPI get:requestUrl
230230
parameters:parameters
231231
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
232232
if (success) {
@@ -258,7 +258,7 @@ - (void)updateCommentWithID:(NSNumber *)commentID
258258
@"content": content,
259259
@"context": @"edit",
260260
};
261-
[self.wordPressComRestApi POST:requestUrl
261+
[self.wordPressComRESTAPI post:requestUrl
262262
parameters:parameters
263263
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
264264
if (success) {
@@ -282,7 +282,7 @@ - (void)replyToPostWithID:(NSNumber *)postID
282282

283283
NSDictionary *parameters = @{@"content": content};
284284

285-
[self.wordPressComRestApi POST:requestUrl
285+
[self.wordPressComRESTAPI post:requestUrl
286286
parameters:parameters
287287
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
288288
if (success) {
@@ -310,7 +310,7 @@ - (void)replyToCommentWithID:(NSNumber *)commentID
310310
@"content": content,
311311
@"context": @"edit",
312312
};
313-
[self.wordPressComRestApi POST:requestUrl
313+
[self.wordPressComRESTAPI post:requestUrl
314314
parameters:parameters
315315
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
316316
if (success) {
@@ -339,7 +339,7 @@ - (void)moderateCommentWithID:(NSNumber *)commentID
339339
@"context" : @"edit",
340340
};
341341

342-
[self.wordPressComRestApi POST:requestUrl
342+
[self.wordPressComRESTAPI post:requestUrl
343343
parameters:parameters
344344
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
345345
if (success) {
@@ -360,7 +360,7 @@ - (void)trashCommentWithID:(NSNumber *)commentID
360360
NSString *requestUrl = [self pathForEndpoint:path
361361
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
362362

363-
[self.wordPressComRestApi POST:requestUrl
363+
[self.wordPressComRESTAPI post:requestUrl
364364
parameters:nil
365365
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
366366
if (success) {
@@ -381,7 +381,7 @@ - (void)likeCommentWithID:(NSNumber *)commentID
381381
NSString *requestUrl = [self pathForEndpoint:path
382382
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
383383

384-
[self.wordPressComRestApi POST:requestUrl
384+
[self.wordPressComRESTAPI post:requestUrl
385385
parameters:nil
386386
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
387387
if (success) {
@@ -402,7 +402,7 @@ - (void)unlikeCommentWithID:(NSNumber *)commentID
402402
NSString *requestUrl = [self pathForEndpoint:path
403403
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
404404

405-
[self.wordPressComRestApi POST:requestUrl
405+
[self.wordPressComRESTAPI post:requestUrl
406406
parameters:nil
407407
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
408408
if (success) {
@@ -444,7 +444,7 @@ - (void)getLikesForCommentID:(NSNumber *)commentID
444444
parameters[@"exclude"] = excludeUserIDs;
445445
}
446446

447-
[self.wordPressComRestApi GET:requestUrl
447+
[self.wordPressComRESTAPI get:requestUrl
448448
parameters:parameters
449449
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
450450
if (success) {

‎WordPressKit/MediaServiceRemoteREST.m‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ - (void)getMediaWithID:(NSNumber *)mediaID
1818

1919
NSDictionary * parameters = @{};
2020

21-
[self.wordPressComRestApi GET:requestUrl parameters:parameters success:^(id responseObject, NSHTTPURLResponse *response) {
21+
[self.wordPressComRESTAPI get:requestUrl parameters:parameters success:^(id responseObject, NSHTTPURLResponse *response) {
2222
if (success) {
2323
NSDictionary *response = (NSDictionary *)responseObject;
2424
success([MediaServiceRemoteREST remoteMediaFromJSONDictionary:response]);
@@ -60,7 +60,7 @@ - (void)getMediaLibraryPage:(NSString *)pageHandle
6060
NSString *requestUrl = [self pathForEndpoint:path
6161
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
6262

63-
[self.wordPressComRestApi GET:requestUrl
63+
[self.wordPressComRESTAPI get:requestUrl
6464
parameters:[NSDictionary dictionaryWithDictionary:parameters]
6565
success:^(id responseObject, NSHTTPURLResponse *response) {
6666
NSArray *mediaItems = responseObject[@"media"];
@@ -104,7 +104,7 @@ - (void)getMediaLibraryCountForType:(NSString *)mediaType
104104
parameters[@"mime_type"] = mediaType;
105105
}
106106

107-
[self.wordPressComRestApi GET:requestUrl
107+
[self.wordPressComRESTAPI get:requestUrl
108108
parameters:[NSDictionary dictionaryWithDictionary:parameters]
109109
success:^(id responseObject, NSHTTPURLResponse *response) {
110110
NSDictionary *jsonDictionary = (NSDictionary *)responseObject;
@@ -261,7 +261,7 @@ - (void)updateMedia:(RemoteMedia *)media
261261

262262
NSDictionary *parameters = [self parametersFromRemoteMedia:media];
263263

264-
[self.wordPressComRestApi POST:requestUrl
264+
[self.wordPressComRESTAPI post:requestUrl
265265
parameters:parameters
266266
success:^(id responseObject, NSHTTPURLResponse *response) {
267267
RemoteMedia *media = [MediaServiceRemoteREST remoteMediaFromJSONDictionary:responseObject];
@@ -285,7 +285,7 @@ - (void)deleteMedia:(RemoteMedia *)media
285285
NSString *requestUrl = [self pathForEndpoint:path
286286
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
287287

288-
[self.wordPressComRestApi POST:requestUrl
288+
[self.wordPressComRESTAPI post:requestUrl
289289
parameters:nil
290290
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
291291
NSDictionary *response = (NSDictionary *)responseObject;
@@ -318,7 +318,7 @@ -(void)getMetadataFromVideoPressID:(NSString *)videoPressID
318318
NSString *requestUrl = [self pathForEndpoint:path
319319
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
320320

321-
[self.wordPressComRestApi GET:requestUrl
321+
[self.wordPressComRESTAPI get:requestUrl
322322
parameters:nil
323323
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
324324
NSDictionary *response = (NSDictionary *)responseObject;
@@ -358,7 +358,7 @@ -(void)getVideoPressToken:(NSString *)videoPressID
358358
NSString *requestUrl = [self pathForEndpoint:path
359359
withVersion:ServiceRemoteWordPressComRESTApiVersion_2_0];
360360

361-
[self.wordPressComRestApi POST:requestUrl
361+
[self.wordPressComRESTAPI post:requestUrl
362362
parameters:nil
363363
success:^(id responseObject, NSHTTPURLResponse *httpResponse) {
364364
NSDictionary *response = (NSDictionary *)responseObject;

‎WordPressKit/MenusServiceRemote.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ - (void)createMenuWithName:(NSString *)menuName
3939
NSString *requestURL = [self pathForEndpoint:path
4040
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
4141

42-
[self.wordPressComRestApi POST:requestURL
42+
[self.wordPressComRESTAPI post:requestURL
4343
parameters:@{MenusRemoteKeyName: menuName}
4444
success:^(id _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
4545
void(^responseFailure)(void) = ^() {
@@ -94,7 +94,7 @@ - (void)updateMenuForID:(NSNumber *)menuID
9494
// Brent Coursey - 10/1/2015
9595
[params setObject:menuID forKey:MenusRemoteKeyID];
9696

97-
[self.wordPressComRestApi POST:requestURL
97+
[self.wordPressComRESTAPI post:requestURL
9898
parameters:params
9999
success:^(id _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
100100
void(^responseFailure)(void) = ^() {
@@ -131,7 +131,7 @@ - (void)deleteMenuForID:(NSNumber *)menuID
131131
NSString *path = [NSString stringWithFormat:@"sites/%@/menus/%@/delete", siteID, menuID];
132132
NSString *requestURL = [self pathForEndpoint:path
133133
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
134-
[self.wordPressComRestApi POST:requestURL
134+
[self.wordPressComRESTAPI post:requestURL
135135
parameters:nil
136136
success:^(id _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
137137
void(^responseFailure)(void) = ^() {
@@ -169,7 +169,7 @@ - (void)getMenusForSiteID:(NSNumber *)siteID
169169
NSString *requestURL = [self pathForEndpoint:path
170170
withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
171171

172-
[self.wordPressComRestApi GET:requestURL
172+
[self.wordPressComRESTAPI get:requestURL
173173
parameters:nil
174174
success:^(id _Nonnull responseObject, NSHTTPURLResponse *httpResponse) {
175175
if (![responseObject isKindOfClass:[NSDictionary class]]) {

0 commit comments

Comments
 (0)