Merge pull request #702 from matrix-org/riot_2591

Aggregations: Expose reaction history API
matrix-org · Jul 30, 2019 · 8531484 · 8531484
2 parents 31f1da7 + c938e21
commit 8531484
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,7 @@ Improvements:
  * Soft logout: Handle new CS API error code (vector-im/riot-ios/issues/2584).
  * MXRoomCreateContent - Update: Add missing fields `room_version` and `m.federate` (Note: `creator` field becomes optional (because of MSC2175)).
  * Logs: Remove MXJSONModelSet warnings for MXRoomMemberEventContent and MXGroupProfile.
+ * Aggregations: Expose reaction history API.
 
 Bug Fix:
  * Crypto: Fix a race condition that prevented message from being sent (vector-im/riot-ios/issues/2541).

diff --git a/MatrixSDK/Aggregations/MXAggregations.h b/MatrixSDK/Aggregations/MXAggregations.h
@@ -95,6 +95,25 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)removeListener:(id)listener;
 
+/**
+ Fetch reaction events for a given event.
+
+ @param eventId The id of the event.
+ @param roomId The id of the room.
+ @param from The `nextBatch` returned in the previous response.
+ @param limit (optional, use -1 to not defined this value) the maximum number of messages to return.
+ 
+ @param success A block object called when the operation succeeds. It provides a `MXAggregationPaginatedResponse` object.
+ @param failure A block object called when the operation fails.
+ 
+ @return a MXHTTPOperation instance.
+ */
+- (MXHTTPOperation*)reactionsEventsForEvent:(NSString*)eventId
+                                     inRoom:(NSString*)roomId
+                                       from:(nullable NSString*)from
+                                      limit:(NSUInteger)limit
+                                    success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
+                                    failure:(void (^)(NSError *error))failure;
 
 #pragma mark - Edits
 

diff --git a/MatrixSDK/Aggregations/MXAggregations.m b/MatrixSDK/Aggregations/MXAggregations.m
@@ -84,6 +84,23 @@ - (void)removeListener:(id)listener
     }
 }
 
+- (MXHTTPOperation*)reactionsEventsForEvent:(NSString*)eventId
+                                     inRoom:(NSString*)roomId
+                                       from:(nullable NSString*)from
+                                      limit:(NSUInteger)limit
+                                    success:(void (^)(MXAggregationPaginatedResponse *paginatedResponse))success
+                                    failure:(void (^)(NSError *error))failure
+{
+    return [self.mxSession.matrixRestClient relationsForEvent:eventId
+                                                       inRoom:roomId
+                                                 relationType:MXEventRelationTypeAnnotation
+                                                    eventType:kMXEventTypeStringReaction
+                                                         from:from                                                    
+                                                        limit:limit
+                                                      success:success
+                                                      failure:failure];
+}
+
 
 #pragma mark - Edits