Merge pull request robbiehanson#943 from pwetrifork/muc-light-members-fetching-fix

MUC Light members list in-module storage

Author: chrisballinger

Extensions/XMPPMUCLight/XMPPRoomLight.h

@@ -24,6 +24,7 @@
 
 - (nonnull NSString *)roomname;
 - (nonnull NSString *)subject;
+- (nonnull NSArray<NSXMLElement*> *)knownMembersList;
 
 - (nonnull instancetype)initWithJID:(nonnull XMPPJID *)roomJID roomname:(nonnull NSString *) roomname;
 - (nonnull instancetype)initWithRoomLightStorage:(nullable id <XMPPRoomLightStorage>)storage jid:(nonnull XMPPJID *)aRoomJID roomname:(nonnull NSString *)aRoomname dispatchQueue:(nullable dispatch_queue_t)queue;
@@ -63,7 +64,7 @@
 - (void)xmppRoomLight:(nonnull XMPPRoomLight *)sender didAddUsers:(nonnull XMPPIQ*) iqResult;
 - (void)xmppRoomLight:(nonnull XMPPRoomLight *)sender didFailToAddUsers:(nonnull XMPPIQ*)iq;
 
-- (void)xmppRoomLight:(nonnull XMPPRoomLight *)sender didFetchMembersList:(nonnull NSArray<NSXMLElement*> *)items;
+- (void)xmppRoomLight:(nonnull XMPPRoomLight *)sender didFetchMembersList:(nonnull XMPPIQ *)iqResult;
 - (void)xmppRoomLight:(nonnull XMPPRoomLight *)sender didFailToFetchMembersList:(nonnull XMPPIQ *)iq;
 
 - (void)xmppRoomLight:(nonnull XMPPRoomLight *)sender didDestroyRoomLight:(nonnull XMPPIQ*) iqResult;

Extensions/XMPPMUCLight/XMPPRoomLight.m

@@ -16,6 +16,7 @@
 @interface XMPPRoomLight() {
 	NSString *roomname;
 	NSString *subject;
+    NSArray<NSXMLElement*> *knownMembersList;
 	NSString *configVersion;
 	NSString *memberListVersion;
 }
@@ -41,6 +42,7 @@ - (nonnull instancetype)initWithRoomLightStorage:(nullable id <XMPPRoomLightStor
 		_domain = aRoomJID.domain;
 		_roomJID = aRoomJID;
 		roomname = aRoomname;
+        knownMembersList = @[];
 		configVersion = @"";
 		memberListVersion = @"";
 	}
@@ -87,6 +89,20 @@ - (nonnull NSString *)subject {
 	}
 }
 
+- (NSArray<NSXMLElement *> *)knownMembersList {
+    __block NSArray<NSXMLElement *> *result;
+    dispatch_block_t block = ^{ @autoreleasepool {
+        result = knownMembersList;
+    }};
+    
+    if (dispatch_get_specific(moduleQueueTag))
+        block();
+    else
+        dispatch_sync(moduleQueue, block);
+    
+    return result;
+}
+
 - (nonnull NSString *)configVersion {
 	@synchronized(subject) {
 		return [configVersion copy];
@@ -131,6 +147,17 @@ - (void)setSubject:(NSString *)aSubject{
 		dispatch_async(moduleQueue, block);
 }
 
+- (void)setKnownMembersList:(NSArray<NSXMLElement *> *)aMembersList {
+    dispatch_block_t block = ^{ @autoreleasepool {
+        knownMembersList = [aMembersList copy];
+    }};
+    
+    if (dispatch_get_specific(moduleQueueTag))
+        block();
+    else
+        dispatch_async(moduleQueue, block);
+}
+
 - (void)setMemberListVersion:(NSString *)aVersion{
 	dispatch_block_t block = ^{ @autoreleasepool {
 		memberListVersion = aVersion;
@@ -368,9 +395,11 @@ - (void)handleFetchMembersListResponse:(XMPPIQ *)iq withInfo:(id <XMPPTrackingIn
 		}
 
 		NSArray *items = [query elementsForName:@"user"];
-		if (!items) { items = @[]; }
+        if (items) {
+            [self setKnownMembersList:items];
+        }
 
-		[multicastDelegate xmppRoomLight:self didFetchMembersList:items];
+		[multicastDelegate xmppRoomLight:self didFetchMembersList:iq];
 	}else{
 		[multicastDelegate xmppRoomLight:self didFailToFetchMembersList:iq];
 	}

Xcode/Testing-Shared/XMPPRoomLightTests.m

@@ -294,9 +294,9 @@ - (void)testFetchMemberList{
 	}];
 }
 
-- (void)xmppRoomLight:(XMPPRoomLight *)sender didFetchMembersList:(NSArray *)items {
-	NSXMLElement *user1 = [items firstObject];
-	NSXMLElement *user3 = [items lastObject];
+- (void)xmppRoomLight:(XMPPRoomLight *)sender didFetchMembersList:(XMPPIQ *)iqResult {
+	NSXMLElement *user1 = [[sender knownMembersList] firstObject];
+	NSXMLElement *user3 = [[sender knownMembersList] lastObject];
 	XCTAssertEqualObjects([user1 attributeForName:@"affiliation"].stringValue, @"owner");
 	XCTAssertEqualObjects(user1.stringValue, @"[email protected]");
 	XCTAssertEqualObjects([user3 attributeForName:@"affiliation"].stringValue, @"member");