Merge pull request robbiehanson#927 from pwetrifork/mam-targeted-queries

Allow targeted MAM queries

Author: chrisballinger

Extensions/XEP-0313/XMPPMessageArchiveManagement.h

@@ -17,6 +17,7 @@
 }
 
 - (void)retrieveMessageArchiveWithFields:(NSArray *)fields withResultSet:(XMPPResultSet *)resultSet;
+- (void)retrieveMessageArchiveAt:(XMPPJID *)archiveJID withFields:(NSArray *)fields withResultSet:(XMPPResultSet *)resultSet;
 - (void)retrieveFormFields;
 + (NSXMLElement *)fieldWithVar:(NSString *)var type:(NSString *)type andValue:(NSString *)value;
 

Extensions/XEP-0313/XMPPMessageArchiveManagement.m

@@ -20,10 +20,18 @@ @interface XMPPMessageArchiveManagement()
 @implementation XMPPMessageArchiveManagement
 
 - (void)retrieveMessageArchiveWithFields:(NSArray *)fields withResultSet:(XMPPResultSet *)resultSet {
+	[self retrieveMessageArchiveAt:nil withFields:fields withResultSet:resultSet];
+}
+
+- (void)retrieveMessageArchiveAt:(XMPPJID *)archiveJID withFields:(NSArray *)fields withResultSet:(XMPPResultSet *)resultSet {
 	dispatch_block_t block = ^{
 
 		XMPPIQ *iq = [XMPPIQ iqWithType:@"set"];
 		[iq addAttributeWithName:@"id" stringValue:[XMPPStream generateUUID]];
+		
+		if (archiveJID) {
+			[iq addAttributeWithName:@"to" stringValue:[archiveJID full]];
+		}
 
 		self.queryID = [XMPPStream generateUUID];
 

Xcode/Testing-Shared/XMPPMessageArchiveManagementTests.m

@@ -92,6 +92,30 @@ - (void)testRetriveMessageArchiveWithFields {
 	}];
 }
 
+- (void)testRetrieveTargetedMessageArchive {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Handler IQ with \"to\""];
+    
+    XMPPJID *archiveJID = [XMPPJID jidWithString:@"[email protected]"];
+    
+    XMPPMockStream *streamTest = [[XMPPMockStream alloc] init];
+    streamTest.elementReceived = ^void(NSXMLElement *element) {
+        XMPPIQ *iq = [XMPPIQ iqFromElement:element];
+        XCTAssertEqualObjects([iq to], archiveJID);
+        
+        [expectation fulfill];
+    };
+    
+    XMPPMessageArchiveManagement *messageArchiveManagement = [[XMPPMessageArchiveManagement alloc] init];
+    [messageArchiveManagement activate:streamTest];
+    [messageArchiveManagement retrieveMessageArchiveAt:archiveJID withFields:nil withResultSet:nil];
+    
+    [self waitForExpectationsWithTimeout:1 handler:^(NSError * _Nullable error) {
+        if(error){
+            XCTFail(@"Expectation Failed with error: %@", error);
+        }
+    }];
+}
+
 - (void)testDelegateDidReceiveMAMMessage {
 	self.delegateExpectation = [self expectationWithDescription:@"Delegate"];