XMPPRoster now automatically ties into MUC system to ignore presence …

…elements related to MUC rooms.

Extensions/Roster/XMPPRoster.h

@@ -9,7 +9,7 @@
 #import "XMPPResource.h"
 
 @protocol XMPPRosterStorage;
-
+@class DDList;
 
 /**
  * The XMPPRoster provides the scaffolding for a roster solution.
@@ -44,6 +44,8 @@
 	Byte flags;
 
 	NSMutableArray *earlyPresenceElements;
+
+	DDList *mucModules;
 }
 
 - (id)initWithRosterStorage:(id <XMPPRosterStorage>)storage;

Extensions/Roster/XMPPRoster.m

@@ -2,6 +2,7 @@
 #import "XMPP.h"
 #import "XMPPLogging.h"
 #import "XMPPFramework.h"
+#import "DDList.h"
 
 #if ! __has_feature(objc_arc)
 #warning This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
@@ -73,6 +74,8 @@ - (id)initWithRosterStorage:(id <XMPPRosterStorage>)storage dispatchQueue:(dispa
 		flags = 0;
 
 		earlyPresenceElements = [[NSMutableArray alloc] initWithCapacity:2];
+
+		mucModules = [[DDList alloc] init];
 	}
 	return self;
 }
@@ -86,7 +89,27 @@ - (BOOL)activate:(XMPPStream *)aXmppStream
 		XMPPLogVerbose(@"%@: Activated", THIS_FILE);
 
 		#ifdef _XMPP_VCARD_AVATAR_MODULE_H
-		[xmppStream autoAddDelegate:self delegateQueue:moduleQueue toModulesOfClass:[XMPPvCardAvatarModule class]];
+		{
+			// Automatically tie into the vCard system so we can store user photos.
+
+			[xmppStream autoAddDelegate:self
+			              delegateQueue:moduleQueue
+			           toModulesOfClass:[XMPPvCardAvatarModule class]];
+		}
+		#endif
+
+		#ifdef _XMPP_MUC_H
+		{
+			// Automatically tie into the MUC system so we can ignore non-roster presence stanzas.
+
+			[xmppStream enumerateModulesWithBlock:^(XMPPModule *module, NSUInteger idx, BOOL *stop) {
+
+				if ([module isKindOfClass:[XMPPMUC class]])
+				{
+					[mucModules add:(__bridge void *)module];
+				}
+			}];
+		}
 		#endif
 
 		return YES;
@@ -100,7 +123,9 @@ - (void)deactivate
 	XMPPLogTrace();
 
 	#ifdef _XMPP_VCARD_AVATAR_MODULE_H
-	[xmppStream removeAutoDelegate:self delegateQueue:moduleQueue fromModulesOfClass:[XMPPvCardAvatarModule class]];
+	{
+		[xmppStream removeAutoDelegate:self delegateQueue:moduleQueue fromModulesOfClass:[XMPPvCardAvatarModule class]];
+	}
 	#endif
 
 	[super deactivate];
@@ -676,6 +701,20 @@ - (void)xmppStream:(XMPPStream *)sender didReceivePresence:(XMPPPresence *)prese
 	}
 	else
 	{
+		#ifdef _XMPP_MUC_H
+
+		// Ignore MUC related presence items
+
+		for (XMPPMUC *muc in mucModules)
+		{
+			if ([muc isMUCRoomPresence:presence])
+			{
+				return;
+			}
+		}
+
+		#endif
+
 		[xmppRosterStorage handlePresence:presence xmppStream:xmppStream];
 	}
 }
@@ -718,6 +757,29 @@ - (void)xmppStreamDidDisconnect:(XMPPStream *)sender withError:(NSError *)error
 	[earlyPresenceElements removeAllObjects];
 }
 
+#ifdef _XMPP_MUC_H
+
+- (void)xmppStream:(XMPPStream *)sender didRegisterModule:(id)module
+{
+	if ([module isKindOfClass:[XMPPMUC class]])
+	{
+		if (![mucModules contains:(__bridge void *)module])
+		{
+			[mucModules add:(__bridge void *)module];
+		}
+	}
+}
+
+- (void)xmppStream:(XMPPStream *)sender willUnregisterModule:(id)module
+{
+	if ([module isKindOfClass:[XMPPMUC class]])
+	{
+		[mucModules remove:(__bridge void *)module];
+	}
+}
+
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark XMPPvCardAvatarDelegate
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Extensions/XEP-0045/XMPPMUC.m

@@ -81,19 +81,30 @@ - (void)xmppStream:(XMPPStream *)sender didRegisterModule:(id)module
 {
 	if ([module isKindOfClass:[XMPPRoom class]])
 	{
-		XMPPRoom *room = (XMPPRoom *)module;
+		XMPPJID *roomJID = [(XMPPRoom *)module roomJID];
 
-		[rooms addObject:room.roomJID];
+		[rooms addObject:roomJID];
 	}
 }
 
 - (void)xmppStream:(XMPPStream *)sender willUnregisterModule:(id)module
 {
 	if ([module isKindOfClass:[XMPPRoom class]])
 	{
-		XMPPRoom *room = (XMPPRoom *)module;
+		XMPPJID *roomJID = [(XMPPRoom *)module roomJID];
 
-		[rooms removeObject:room.roomJID];
+		// It's common for the room to get deactivated and deallocated before
+		// we've received the goodbye presence from the server.
+		// So we're going to postpone for a bit removing the roomJID from the list.
+		// This way the isMUCRoomElement will still remain accurate
+		// for presence elements that may arrive momentarily.
+
+		double delayInSeconds = 30.0;
+		dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, delayInSeconds * NSEC_PER_SEC);
+		dispatch_after(popTime, moduleQueue, ^{ @autoreleasepool {
+
+			[rooms removeObject:roomJID];
+		}});
 	}
 }
 

Utilities/DDList.h

@@ -33,6 +33,8 @@ typedef struct DDListNode DDListNode;
 - (void)removeAll:(void *)element;
 - (void)removeAllElements;
 
+- (BOOL)contains:(void *)element;
+
 - (NSUInteger)count;
 
 /**

Utilities/DDList.m

@@ -122,6 +122,20 @@ - (void)removeAllElements
 	listTail = NULL;
 }
 
+- (BOOL)contains:(void *)element
+{
+	DDListNode *node;
+	for (node = listHead; node != NULL; node = node->next)
+	{
+		if (node->element == element)
+		{
+			return YES;
+		}
+	}
+
+	return NO;
+}
+
 - (NSUInteger)count
 {
 	NSUInteger count = 0;