MXRestClient: Update CS API call to support event ids hashes in room …

…version 3 element-hq/element-ios#2194
matrix-org · Feb 12, 2019 · 62baa74 · 62baa74
1 parent 05a4376
commit 62baa74
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,6 +2,7 @@ Changes in Matrix iOS SDK in 0.12.2 (2019-xx-)
 ===============================================
 
 Improvements:
+ * MXRestClient: Update CS API call to support event ids hashes in room version 3 (vector-im/riot-ios#2194).
  * MXRoom: Add a sendAudioFile API to send file using msgType "m.audio", thanks to N-Pex (PR #616).
  * MXCrypto: Add key backup passphrase support (vector-im/riot-ios#2127).
  * MXCrypto: Key backup: Ignore all whitespaces in recovery key (vector-im/riot-ios#2194).

diff --git a/MatrixSDK/MXRestClient.m b/MatrixSDK/MXRestClient.m
@@ -2262,7 +2262,10 @@ - (MXHTTPOperation*)redactEvent:(NSString*)eventId
                         success:(void (^)(void))success
                         failure:(void (^)(NSError *error))failure
 {
-    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/redact/%@", apiPathPrefix, roomId, eventId];
+    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/redact/%@",
+                      apiPathPrefix,
+                      roomId,
+                      [eventId mx_escapedStringForPathComponent]];
 
     // All query parameters are optional. Fill the request parameters on demand
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
@@ -2292,7 +2295,10 @@ -(MXHTTPOperation *)reportEvent:(NSString *)eventId
                         success:(void (^)(void))success
                         failure:(void (^)(NSError *))failure
 {
-    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/report/%@", apiPathPrefix, roomId, eventId];
+    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/report/%@",
+                      apiPathPrefix,
+                      roomId,
+                      [eventId mx_escapedStringForPathComponent]];
 
     NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithDictionary:@{
                                                                                       @"score": @(score)
@@ -2353,7 +2359,9 @@ - (MXHTTPOperation*)eventWithEventId:(NSString*)eventId
                              success:(void (^)(MXEvent *event))success
                              failure:(void (^)(NSError *error))failure
 {
-    NSString *path = [NSString stringWithFormat:@"%@/events/%@", apiPathPrefix, eventId];
+    NSString *path = [NSString stringWithFormat:@"%@/events/%@",
+                      apiPathPrefix,
+                      [eventId mx_escapedStringForPathComponent]];
 
     MXHTTPOperation *operation;
     MXWeakify(self);
@@ -2385,7 +2393,10 @@ - (MXHTTPOperation*)eventWithEventId:(NSString*)eventId
                              success:(void (^)(MXEvent *event))success
                              failure:(void (^)(NSError *error))failure
 {
-    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/event/%@", apiPathPrefix, roomId, eventId];
+    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/event/%@",
+                      apiPathPrefix,
+                      roomId,
+                      [eventId mx_escapedStringForPathComponent]];
 
     MXHTTPOperation *operation;
     MXWeakify(self);
@@ -2440,7 +2451,10 @@ - (MXHTTPOperation*)contextOfEvent:(NSString*)eventId
                            success:(void (^)(MXEventContext *eventContext))success
                            failure:(void (^)(NSError *error))failure
 {
-    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/context/%@", apiPathPrefix, roomId, eventId];
+    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/context/%@",
+                      apiPathPrefix,
+                      roomId,
+                      [eventId mx_escapedStringForPathComponent]];
 
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
     parameters[@"limit"] = @(limit);
@@ -3015,9 +3029,14 @@ - (MXHTTPOperation*)sendReadReceipt:(NSString*)roomId
                             success:(void (^)(void))success
                             failure:(void (^)(NSError *error))failure
 {
+    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/receipt/m.read/%@",
+                      apiPathPrefix,
+                      roomId,
+                      [eventId mx_escapedStringForPathComponent]];
+
     MXWeakify(self);
     return [httpClient requestWithMethod:@"POST"
-                                    path: [NSString stringWithFormat:@"%@/rooms/%@/receipt/m.read/%@", apiPathPrefix, roomId, eventId]
+                                    path:path
                               parameters:[[NSDictionary alloc] init]
                                  success:^(NSDictionary *JSONResponse) {
                                      MXStrongifyAndReturnIfNil(self);