support conversation query for systemConversation and transientConver…

…sation
tang3w · Dec 7, 2016 · 4ad411f · 4ad411f
1 parent aa1dc0e
commit 4ad411f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/ChatKit.podspec b/ChatKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ChatKit"
-  s.version      = "0.8.6"
+  s.version      = "0.8.7"
   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' }

diff --git a/ChatKit/Class/Tool/Service/LCCKConversationService.m b/ChatKit/Class/Tool/Service/LCCKConversationService.m
@@ -81,11 +81,20 @@ - (void)fecthConversationWithConversationId:(NSString *)conversationId callback:
 
 - (void)fetchConversationsWithConversationIds:(NSSet *)conversationIds
                                      callback:(LCCKArrayResultBlock)callback {
-    AVIMConversationQuery *query = [[LCCKSessionService sharedInstance].client conversationQuery];
-    [query whereKey:@"objectId" containedIn:[conversationIds allObjects]];
-    query.cachePolicy = kAVCachePolicyNetworkElseCache;
-    query.limit = 1000;  // default limit:10
-    [query findConversationsWithCallback: ^(NSArray *objects, NSError *error) {
+    AVIMClient *client = [LCCKSessionService sharedInstance].client;
+    AVIMConversationQuery *queryForNormalConversation = [client conversationQuery];
+    [queryForNormalConversation whereKey:@"objectId" containedIn:[conversationIds allObjects]];
+
+    AVIMConversationQuery *queryForSystemConversation = [client conversationQuery];
+    [queryForSystemConversation whereKey:@"sys" equalTo:@(YES)];
+
+    AVIMConversationQuery *queryForTransientConversation = [client conversationQuery];
+    [queryForSystemConversation whereKey:@"tr" equalTo:@(YES)];
+
+    AVIMConversationQuery *queryForAll = [AVIMConversationQuery orQueryWithSubqueries:@[ queryForNormalConversation, queryForSystemConversation, queryForTransientConversation ]];
+    queryForAll.limit = conversationIds.count;
+
+    [queryForAll findConversationsWithCallback: ^(NSArray *objects, NSError *error) {
         if (error) {
             !callback ?: callback(nil, error);
         } else {