Merge pull request #412 from zapcannon87/master

Release v2.3.8

Author: zapcannon87

ChatKit-OC/Podfile.lock

@@ -9,7 +9,7 @@ PODS:
     - AVOSCloudIM/_NOARC (= 11.4.7)
   - AVOSCloudIM/_NOARC (11.4.7):
     - AVOSCloud (= 11.4.7)
-  - ChatKit (2.3.7):
+  - ChatKit (2.3.8):
     - AVOSCloud (~> 11.4.7)
     - AVOSCloudIM (~> 11.4.7)
     - CYLDeallocBlockExecutor (~> 1.1.2)
@@ -91,7 +91,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AVOSCloud: e1257f9a7c28e04ae8642d554a37654e8392d1b7
   AVOSCloudIM: 5456179b251be8dead13eebabcbbfa6931cc4e1b
-  ChatKit: e6b9beb9858165aaa92311e1661c986e069cd960
+  ChatKit: 3a59c6e3f259f1056f02d92d0c1d8e9cf6434fda
   CYLDeallocBlockExecutor: ecf39e45dcead9e120f460df5668b8f5093d178e
   CYLTabBarController: 8d99fccf22866fe18c978c5ff863dc6051da45ff
   DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71

ChatKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ChatKit"
-  s.version      = "2.3.7"
+  s.version      = "2.3.8"
   s.summary      = "An IM App Framework, support sending text, pictures, audio, video, location messaging, managing address book, more interesting features."
   s.homepage     = "https://github.com/LeanCloud/ChatKit-OC"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }

ChatKit/Class/Tool/Service/LCCKConversationService.m

@@ -80,20 +80,53 @@ - (void)fetchConversationWithConversationId:(NSString *)conversationId callback:
 }
 
 - (void)fetchConversationsWithConversationIds:(NSSet *)conversationIds
-                                     callback:(LCCKArrayResultBlock)callback {
-    AVIMConversationQuery *query = [[LCCKSessionService sharedInstance].client conversationQuery];
-    [query whereKey:@"objectId" containedIn:[conversationIds allObjects]];
-    query.limit = conversationIds.count;
-    query.option = AVIMConversationQueryOptionWithMessage;
-    query.cacheMaxAge = kAVIMCachePolicyIgnoreCache;
-    [query findConversationsWithCallback: ^(NSArray *objects, NSError *error) {
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
-            [objects makeObjectsPerformSelector:@selector(lastMessage)];
-            dispatch_async(dispatch_get_main_queue(),^{
-                !callback ?: callback(objects, error);
+                                     callback:(LCCKArrayResultBlock)callback
+{
+    [self fetchConversationsWithConversationIds:[[conversationIds allObjects] mutableCopy]
+                                        results:[NSMutableArray array]
+                                       callback:callback];
+}
+
+- (void)fetchConversationsWithConversationIds:(NSMutableArray<NSString *> *)conversationIds
+                                      results:(NSMutableArray<AVIMConversation *> *)results
+                                     callback:(LCCKArrayResultBlock)callback
+{
+    if (conversationIds.count <= 100) {
+        AVIMConversationQuery *query = [[LCCKSessionService sharedInstance].client conversationQuery];
+        [query whereKey:@"objectId" containedIn:conversationIds];
+        query.limit = conversationIds.count;
+        query.option = AVIMConversationQueryOptionWithMessage;
+        query.cacheMaxAge = kAVIMCachePolicyIgnoreCache;
+        [query findConversationsWithCallback: ^(NSArray *objects, NSError *error) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
+                [objects makeObjectsPerformSelector:@selector(lastMessage)];
+                if (objects) {
+                    [results addObjectsFromArray:objects];
+                }
+                dispatch_async(dispatch_get_main_queue(),^{
+                    !callback ?: callback(results, nil);
+                });
             });
-        });
-    }];
+        }];
+    } else {
+        NSRange range = NSMakeRange(0, 100);
+        NSArray<NSString *> *ids = [conversationIds subarrayWithRange:range];
+        [conversationIds removeObjectsInRange:range];
+        AVIMConversationQuery *query = [[LCCKSessionService sharedInstance].client conversationQuery];
+        [query whereKey:@"objectId" containedIn:ids];
+        query.limit = ids.count;
+        query.option = AVIMConversationQueryOptionWithMessage;
+        query.cacheMaxAge = kAVIMCachePolicyIgnoreCache;
+        [query findConversationsWithCallback: ^(NSArray *objects, NSError *error) {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
+                [objects makeObjectsPerformSelector:@selector(lastMessage)];
+                if (objects) {
+                    [results addObjectsFromArray:objects];
+                }
+                [self fetchConversationsWithConversationIds:conversationIds results:results callback:callback];
+            });
+        }];
+    }
 }
 
 - (void)fetchConversationWithPeerId:(NSString *)peerId callback:(AVIMConversationResultBlock)callback {